root
10 years ago
parent
47d2b1dda3
commit
09b4711f18
@ -1,39 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b26952c..e914e5a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,26 +4,26 @@ mandir=$(prefix)/man
|
||||
rpmdumpheader=$(bindir)/rpmdumpheader
|
||||
zlibdir=zlib-1.2.2.f-rsyncable
|
||||
CFLAGS = -O2 -Wall -g
|
||||
-CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
|
||||
-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
|
||||
+CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\"
|
||||
+LDLIBS = -lbz2 -lz -llzma
|
||||
LDFLAGS =
|
||||
|
||||
all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
|
||||
|
||||
-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
|
||||
+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o
|
||||
|
||||
-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
|
||||
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o
|
||||
|
||||
-combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
|
||||
+combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o
|
||||
|
||||
rpmdumpheader: rpmdumpheader.o
|
||||
$(CC) $(LDFLAGS) $^ -lrpm -o $@
|
||||
|
||||
-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
|
||||
+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o
|
||||
|
||||
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
|
||||
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o
|
||||
|
||||
-fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
|
||||
+fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o
|
||||
|
||||
$(zlibdir)/libz.a:
|
||||
cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
|
||||
@ -1,87 +0,0 @@
|
||||
diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop
|
||||
index 9010fbd..b965fa6 100644
|
||||
--- a/GUI/kde/p7zip_compress.desktop
|
||||
+++ b/GUI/kde/p7zip_compress.desktop
|
||||
@@ -1,6 +1,8 @@
|
||||
[Desktop Entry]
|
||||
-ServiceTypes=inode/directory
|
||||
-Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark
|
||||
+Type=Service
|
||||
+ServiceTypes=KonqPopupMenu/Plugin
|
||||
+MimeType=all/all;
|
||||
+Actions=CompressDialog;Compress7z;CompressZip;Benchmark
|
||||
X-KDE-Priority=TopLevel
|
||||
X-KDE-Submenu=7-Zip
|
||||
X-KDE-Icon=p7zip
|
||||
diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop
|
||||
index 9038c76..a7dca4d 100644
|
||||
--- a/GUI/kde/p7zip_extract.desktop
|
||||
+++ b/GUI/kde/p7zip_extract.desktop
|
||||
@@ -1,10 +1,30 @@
|
||||
[Desktop Entry]
|
||||
X-SuSE-translate=true
|
||||
-Encoding=UTF-8
|
||||
-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
|
||||
-Actions=extractHere
|
||||
+Type=Service
|
||||
+ServiceTypes=KonqPopupMenu/Plugin
|
||||
+MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-arc;application/x-arj;application/x-compress;application/x-zip-compressed;application/x-cpio;application/x-pak;
|
||||
+#MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-rar-compressed;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;
|
||||
+Actions=extractHere;ExtractSubdir;ExtractTo;test;
|
||||
+X-KDE-Priority=TopLevel
|
||||
+X-KDE-Submenu=7-Zip
|
||||
+X-KDE-Icon=p7zip
|
||||
|
||||
[Desktop Action extractHere]
|
||||
-Name=Extract Here with 7-zip
|
||||
+Name=Extract Here
|
||||
Exec=p7zipForFilemanager x %U
|
||||
Icon=p7zip
|
||||
+
|
||||
+[Desktop Action ExtractSubdir]
|
||||
+Name=Extract to subdirectory
|
||||
+Icon=p7zip
|
||||
+Exec=p7zipForFilemanager xs %U
|
||||
+
|
||||
+[Desktop Action ExtractTo]
|
||||
+Name=Extract to ...
|
||||
+Icon=p7zip
|
||||
+Exec=p7zipForFilemanager xd %U
|
||||
+
|
||||
+[Desktop Action test]
|
||||
+Name=Test Archive
|
||||
+Exec=p7zipForFilemanager t %U
|
||||
+Icon=p7zip
|
||||
diff --git a/GUI/kde/p7zip_extract_subdir.desktop b/GUI/kde/p7zip_extract_subdir.desktop
|
||||
index 1800fa0..a711f3c 100644
|
||||
--- a/GUI/kde/p7zip_extract_subdir.desktop
|
||||
+++ b/GUI/kde/p7zip_extract_subdir.desktop
|
||||
@@ -1,6 +1,5 @@
|
||||
[Desktop Entry]
|
||||
X-SuSE-translate=true
|
||||
-Encoding=UTF-8
|
||||
ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
|
||||
Actions=ExtractSubdir
|
||||
|
||||
diff --git a/GUI/kde/p7zip_extract_to.desktop b/GUI/kde/p7zip_extract_to.desktop
|
||||
index bf13ec0..18d2b74 100644
|
||||
--- a/GUI/kde/p7zip_extract_to.desktop
|
||||
+++ b/GUI/kde/p7zip_extract_to.desktop
|
||||
@@ -1,6 +1,5 @@
|
||||
[Desktop Entry]
|
||||
X-SuSE-translate=true
|
||||
-Encoding=UTF-8
|
||||
ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
|
||||
Actions=ExtractTo
|
||||
|
||||
diff --git a/GUI/kde/p7zip_test.desktop b/GUI/kde/p7zip_test.desktop
|
||||
index 2c17acb..5212bb2 100644
|
||||
--- a/GUI/kde/p7zip_test.desktop
|
||||
+++ b/GUI/kde/p7zip_test.desktop
|
||||
@@ -1,6 +1,5 @@
|
||||
[Desktop Entry]
|
||||
X-SuSE-translate=true
|
||||
-Encoding=UTF-8
|
||||
ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
|
||||
Actions=test
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Thu Jun 7 14:29:51 UTC 2012
|
||||
Subject: fix QA warnings
|
||||
|
||||
https://sourceforge.net/tracker/?func=detail&atid=660493&aid=3532590&group_id=111810
|
||||
|
||||
--- CPP/7zip/Archive/NtfsHandler.cpp
|
||||
+++ CPP/7zip/Archive/NtfsHandler.cpp
|
||||
@@ -1250,7 +1250,7 @@
|
||||
if (recSizeLog < Header.SectorSizeLog)
|
||||
return false;
|
||||
numSectorsInRec = 1 << (recSizeLog - Header.SectorSizeLog);
|
||||
- if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, NULL, 0))
|
||||
+ if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, 0, NULL))
|
||||
return S_FALSE;
|
||||
if (!mftRec.IsFILE())
|
||||
return S_FALSE;
|
||||
@ -1,26 +0,0 @@
|
||||
--- sharutils-4.6.3.orig/lib/inttostr.h
|
||||
+++ sharutils-4.6.3/lib/inttostr.h
|
||||
@@ -26,6 +26,10 @@
|
||||
# include <inttypes.h>
|
||||
#endif
|
||||
|
||||
+#if HAVE_STDINT_H
|
||||
+# include <stdint.h>
|
||||
+#endif
|
||||
+
|
||||
#if HAVE_LIMITS_H
|
||||
# include <limits.h>
|
||||
#endif
|
||||
--- sharutils-4.6.3.orig/lib/system.h
|
||||
+++ sharutils-4.6.3/lib/system.h
|
||||
@@ -24,6 +24,10 @@
|
||||
# include <inttypes.h>
|
||||
#endif
|
||||
|
||||
+#if HAVE_STDINT_H
|
||||
+# include <stdint.h>
|
||||
+#endif
|
||||
+
|
||||
#ifndef HAVE_INTMAX_T
|
||||
#define HAVE_INTMAX_T
|
||||
typedef long intmax_t;
|
||||
@ -1,12 +0,0 @@
|
||||
http://bugs.gentoo.org/328755
|
||||
|
||||
--- man/Makefile.am
|
||||
+++ man/Makefile.am
|
||||
@@ -31,7 +31,6 @@
|
||||
amverifyrun.8 \
|
||||
amserverconfig.8 \
|
||||
amaddclient.8 \
|
||||
- amcheckdump.8 \
|
||||
amcrypt.8 \
|
||||
amaespipe.8 \
|
||||
amgpgcrypt.8 \
|
||||
@ -1,19 +0,0 @@
|
||||
We should check /sbin and /usr/sbin earlier in the configure process.
|
||||
If there is a binary named 'dump' that is not a filesystem dump command (which
|
||||
is normally found in /usr/sbin) that occurs in the /usr/bin, then configure can
|
||||
hang.
|
||||
|
||||
Gentoo-bug: 248838
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
diff -Nuar --exclude '*~' amanda-2.6.0p2.orig/config/amanda/progs.m4 amanda-2.6.0p2/config/amanda/progs.m4
|
||||
--- amanda-2.6.0p2.orig/config/amanda/progs.m4 2008-02-15 13:35:57.000000000 -0800
|
||||
+++ amanda-2.6.0p2/config/amanda/progs.m4 2008-11-25 17:46:56.879917150 -0800
|
||||
@@ -24,7 +24,7 @@
|
||||
#
|
||||
AC_DEFUN([AMANDA_INIT_PROGS],
|
||||
[
|
||||
- SYSPATH="/bin:/usr/bin:/sbin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/bsd:/etc:/usr/etc"
|
||||
+ SYSPATH="/sbin:/bin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/bsd:/etc:/usr/etc"
|
||||
# expand prefix or exec_prefix in LOCPATH
|
||||
LOCPATH=`(
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
@ -1,75 +0,0 @@
|
||||
There is a race condition inside the client-side sendbackup. The short version
|
||||
is that any output from the compression or encryption pipes that gets send
|
||||
before the "sendbackup:" headers gets discarded by the server on receipt.
|
||||
|
||||
For any pipe command that outputs headers, a sufficiently fast machine will
|
||||
allow this to happen.
|
||||
|
||||
As a solution, we buffer the header from amcrypt-ossl-asym, and only output it
|
||||
after we have started receiving real data. At the time of writing this patch,
|
||||
amaespipe looks to suffer from the same problem.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
(Forward ported from the 2.5.2p1 patch)
|
||||
|
||||
diff -Nuar --exclude '*~' --exclude '*.orig' --exclude '*.rej' amanda-2.6.0p2.orig/common-src/amcrypt-ossl-asym.sh amanda-2.6.0p2/common-src/amcrypt-ossl-asym.sh
|
||||
--- amanda-2.6.0p2.orig/common-src/amcrypt-ossl-asym.sh 2008-01-17 16:31:41.000000000 -0800
|
||||
+++ amanda-2.6.0p2/common-src/amcrypt-ossl-asym.sh 2008-09-21 22:32:21.265609630 -0700
|
||||
@@ -95,7 +95,7 @@
|
||||
perl -pe 'BEGIN { $bs = 96; $/ = \8192 } $nbytes = ($nbytes + length) % $bs; END { print "\0" x ($bs - $nbytes) }'
|
||||
}
|
||||
|
||||
-encrypt() {
|
||||
+encrypt_setup() {
|
||||
# generate a random printable cipher key (on one line)
|
||||
echo `"${OPENSSL}" rand -base64 80` >"${WORKDIR}/pass"
|
||||
|
||||
@@ -105,11 +105,20 @@
|
||||
|
||||
# print magic
|
||||
printf "%s" "${MAGIC}"
|
||||
+ [ $? -eq 0 ] || return 1
|
||||
|
||||
# print the encrypted cipher key, preceded by size
|
||||
ls -l "${WORKDIR}/pass.ciphertext" | awk '{ printf("%-10d", $5) }'
|
||||
+ [ $? -eq 0 ] || return 1
|
||||
cat "${WORKDIR}/pass.ciphertext"
|
||||
+ [ $? -eq 0 ] || return 1
|
||||
|
||||
+ # Do a test encryption to see that it will work and we will not lose data
|
||||
+ echo "foo" | encrypt >/dev/null
|
||||
+ [ $? -eq 0 ] || return 1
|
||||
+}
|
||||
+
|
||||
+encrypt() {
|
||||
# encrypt data using the cipher key and print
|
||||
pad | "${OPENSSL}" enc "-${CIPHER}" -nopad -e -pass "file:${WORKDIR}/pass" -nosalt
|
||||
[ $? -eq 0 ] || return 1
|
||||
@@ -180,7 +189,26 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- encrypt
|
||||
+ # we must perform the encryption setup, but not produce any output until we start getting input
|
||||
+ encrypt_setup >"${WORKDIR}/encryption-header"
|
||||
+ if [ $? -ne 0 ]; then
|
||||
+ echo "${ME}: encryption setup failed" >&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+ # block until the first of the input
|
||||
+ dd of="${WORKDIR}/data.buffer" bs=4 count=1 2>/dev/null
|
||||
+ if [ $? -ne 0 ]; then
|
||||
+ echo "${ME}: encryption failed to get input data" >&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+ # now spit out the encryption header
|
||||
+ cat "${WORKDIR}/encryption-header"
|
||||
+ if [ $? -ne 0 ]; then
|
||||
+ echo "${ME}: encryption failed to output encryption header" >&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+ # followed by our first bit of input, then the rest
|
||||
+ cat "${WORKDIR}/data.buffer" - | encrypt
|
||||
if [ $? -ne 0 ]; then
|
||||
echo `_ '%s: encryption failed' "${ME}"` >&2
|
||||
exit 1
|
||||
@ -1,44 +0,0 @@
|
||||
#Index: ChangeLog
|
||||
#===================================================================
|
||||
#--- ChangeLog (revision 4592)
|
||||
#+++ ChangeLog (revision 4593)
|
||||
#@@ -1,3 +1,7 @@
|
||||
#+2012-03-10 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
#+ * common-src/glib-util.c, common-src/glib-util.h: Remove
|
||||
#+ g_queue_free_full.
|
||||
#+
|
||||
# 2012-03-09 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
# * client-src/client_util.c, common-src/Makefile.am, common-src/am_sl.c,
|
||||
# common-src/amxml.c: typo.
|
||||
Index: common-src/glib-util.c
|
||||
===================================================================
|
||||
--- common-src/glib-util.c (revision 4592)
|
||||
+++ common-src/glib-util.c (revision 4593)
|
||||
@@ -120,15 +120,6 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
-void g_queue_free_full(GQueue * queue) {
|
||||
- while (!g_queue_is_empty(queue)) {
|
||||
- gpointer data;
|
||||
- data = g_queue_pop_head(queue);
|
||||
- amfree(data);
|
||||
- }
|
||||
- g_queue_free(queue);
|
||||
-}
|
||||
-
|
||||
void g_ptr_array_free_full(GPtrArray * array) {
|
||||
size_t i;
|
||||
|
||||
Index: common-src/glib-util.h
|
||||
===================================================================
|
||||
--- common-src/glib-util.h (revision 4592)
|
||||
+++ common-src/glib-util.h (revision 4593)
|
||||
@@ -72,7 +72,6 @@
|
||||
|
||||
/* These functions all take a GLib container, and call free() on all the
|
||||
* pointers in the container before free()ing the container itself. */
|
||||
-void g_queue_free_full(GQueue * queue);
|
||||
void g_ptr_array_free_full(GPtrArray * array);
|
||||
|
||||
/* g_value_compare() does what you expect. It returns TRUE if and
|
||||
@ -1,26 +0,0 @@
|
||||
#Index: ChangeLog
|
||||
#===================================================================
|
||||
#--- ChangeLog (revision 4594)
|
||||
#+++ ChangeLog (revision 4595)
|
||||
#@@ -1,3 +1,7 @@
|
||||
#+2012-03-11 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
#+ * common-src/glib-util.c: g_thread_supported always return TRUE on
|
||||
#+ newer version.
|
||||
#+
|
||||
# 2012-03-10 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
# * common-src/glib-util.c, common-src/glib-util.h: Remove
|
||||
# g_queue_free_full.
|
||||
Index: common-src/glib-util.c
|
||||
===================================================================
|
||||
--- common-src/glib-util.c (revision 4594)
|
||||
+++ common-src/glib-util.c (revision 4595)
|
||||
@@ -42,7 +42,9 @@
|
||||
* is initialized) */
|
||||
#ifdef HAVE_LIBCURL
|
||||
# ifdef G_THREADS_ENABLED
|
||||
+# if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31))
|
||||
g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
|
||||
+# endif
|
||||
# endif
|
||||
g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
|
||||
#endif
|
||||
@ -1,91 +0,0 @@
|
||||
Index: device-src/s3.c
|
||||
===================================================================
|
||||
--- device-src/s3.c (revision 4697)
|
||||
+++ device-src/s3.c (revision 4698)
|
||||
@@ -1905,7 +1905,14 @@
|
||||
|
||||
gboolean s3_init(void)
|
||||
{
|
||||
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||
+//# pragma GCC diagnostic push
|
||||
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||
+//# pragma GCC diagnostic pop
|
||||
+#else
|
||||
+ static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||
+#endif
|
||||
static gboolean init = FALSE, ret;
|
||||
|
||||
/* n.b. curl_global_init is called in common-src/glib-util.c:glib_init() */
|
||||
#Index: ChangeLog
|
||||
#===================================================================
|
||||
#--- ChangeLog (revision 4697)
|
||||
#+++ ChangeLog (revision 4698)
|
||||
#@@ -1,4 +1,8 @@
|
||||
# 2012-05-08 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
#+ * common-src/amflock.c, common-src/match.c, common-src/util.c,
|
||||
#+ device-src/s3.c: Fix for deprecated G_STATIC_MUTEX_INIT.
|
||||
#+
|
||||
#+2012-05-08 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
# * installcheck/Amanda_Device.pl: Fix indirect tcp.
|
||||
#
|
||||
# 2012-05-08 Jean-Louis Martineau <martineau@zmanda.com>
|
||||
Index: common-src/util.c
|
||||
===================================================================
|
||||
--- common-src/util.c (revision 4697)
|
||||
+++ common-src/util.c (revision 4698)
|
||||
@@ -1147,7 +1147,14 @@
|
||||
struct dirent *entry_p;
|
||||
#endif
|
||||
|
||||
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||
+//# pragma GCC diagnostic push
|
||||
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||
+//# pragma GCC diagnostic pop
|
||||
+#else
|
||||
+ static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||
+#endif
|
||||
|
||||
g_static_mutex_lock(&mutex);
|
||||
|
||||
Index: common-src/match.c
|
||||
===================================================================
|
||||
--- common-src/match.c (revision 4697)
|
||||
+++ common-src/match.c (revision 4698)
|
||||
@@ -153,7 +153,14 @@
|
||||
* be called from within threads, so play it safe.
|
||||
*/
|
||||
|
||||
-static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
|
||||
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||
+//# pragma GCC diagnostic push
|
||||
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
+ static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
|
||||
+//# pragma GCC diagnostic pop
|
||||
+#else
|
||||
+ static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
|
||||
+#endif
|
||||
static GHashTable *regex_cache = NULL, *regex_cache_newline = NULL;
|
||||
|
||||
/*
|
||||
Index: common-src/amflock.c
|
||||
===================================================================
|
||||
--- common-src/amflock.c (revision 4697)
|
||||
+++ common-src/amflock.c (revision 4698)
|
||||
@@ -36,7 +36,14 @@
|
||||
* New Implementation
|
||||
*/
|
||||
|
||||
-static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
|
||||
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||
+//# pragma GCC diagnostic push
|
||||
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
+ static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
|
||||
+//# pragma GCC diagnostic pop
|
||||
+#else
|
||||
+ static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
|
||||
+#endif
|
||||
static GHashTable *locally_locked_files = NULL;
|
||||
static int lock_rw_rd(file_lock *lock, short l_type);
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
# These are the services needed for amanda.
|
||||
# Default is to talk to localhost only unless
|
||||
# AMANDA_SERVER was specified at build time.
|
||||
|
||||
service amanda
|
||||
{
|
||||
socket_type = dgram
|
||||
protocol = udp
|
||||
wait = yes
|
||||
user = __AMANDA_USER_NAME__
|
||||
group = __AMANDA_GROUP_NAME__
|
||||
groups = yes
|
||||
server = /usr/libexec/amanda/amandad
|
||||
# You need to ensure this points to your Amanda server!
|
||||
# Don't just remove it!
|
||||
only_from = __AMANDA_SERVER__
|
||||
disable = yes
|
||||
}
|
||||
|
||||
service amandaidx
|
||||
{
|
||||
socket_type = stream
|
||||
protocol = tcp
|
||||
wait = no
|
||||
user = __AMANDA_USER_NAME__
|
||||
group = __AMANDA_GROUP_NAME__
|
||||
groups = yes
|
||||
server = /usr/libexec/amanda/amindexd
|
||||
# You need to ensure this points to your Amanda server!
|
||||
# Don't just remove it!
|
||||
only_from = __AMANDA_SERVER__
|
||||
disable = yes
|
||||
}
|
||||
|
||||
service amidxtape
|
||||
{
|
||||
socket_type = stream
|
||||
protocol = tcp
|
||||
wait = no
|
||||
user = __AMANDA_USER_NAME__
|
||||
group = __AMANDA_GROUP_NAME__
|
||||
groups = yes
|
||||
server = /usr/libexec/amanda/amidxtaped
|
||||
# You need to ensure this points to your Amanda server!
|
||||
# Don't just remove it!
|
||||
only_from = __AMANDA_SERVER__
|
||||
disable = yes
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
diff --git a/device-src/s3.c b/device-src/s3.c
|
||||
index dfd29dc..7a3b7d3 100644
|
||||
--- a/device-src/s3.c
|
||||
+++ b/device-src/s3.c
|
||||
@@ -605,8 +605,10 @@ buffer_writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
|
||||
guint bytes_needed = data->buffer_pos + new_bytes;
|
||||
|
||||
/* error out if the new size is greater than the maximum allowed */
|
||||
- if (data->max_buffer_size && bytes_needed > data->max_buffer_size)
|
||||
- return 0;
|
||||
+ if (data->max_buffer_size && bytes_needed > data->max_buffer_size) {
|
||||
+ g_warning("S3 request exceeded %d bytes; CURL error follows.", data->max_buffer_size);
|
||||
+ return 0; /* returning zero signals an error to libcurl */
|
||||
+ }
|
||||
|
||||
/* reallocate if necessary. We use exponential sizing to make this
|
||||
* happen less often. */
|
||||
@@ -618,7 +620,7 @@ buffer_writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
|
||||
data->buffer = g_realloc(data->buffer, new_size);
|
||||
data->buffer_len = new_size;
|
||||
}
|
||||
- g_return_val_if_fail(data->buffer, 0); /* returning zero signals an error to libcurl */
|
||||
+ g_return_val_if_fail(data->buffer, 0);
|
||||
|
||||
/* actually copy the data to the buffer */
|
||||
memcpy(data->buffer + data->buffer_pos, ptr, new_bytes);
|
||||
@@ -1186,8 +1188,7 @@ list_fetch(S3Handle *hdl,
|
||||
const char *resource,
|
||||
const char *prefix,
|
||||
const char *delimiter,
|
||||
- const char *marker,
|
||||
- const char *max_keys)
|
||||
+ const char *marker)
|
||||
{
|
||||
char *urldelim = "?";
|
||||
char *uri = g_strdup(resource);
|
||||
@@ -1212,13 +1213,13 @@ list_fetch(S3Handle *hdl,
|
||||
urldelim = "&";
|
||||
}
|
||||
if (max_keys) {
|
||||
- if (!list_build_url_component(&uri, urldelim, "max-keys", max_keys)) goto cleanup;
|
||||
+ if (!list_build_url_component(&uri, urldelim, "max-keys", "1024")) goto cleanup;
|
||||
urldelim = "&";
|
||||
}
|
||||
|
||||
/* and perform the request on that URI */
|
||||
result = perform_request(hdl, resource, uri, "GET", NULL,
|
||||
- 0, MAX_ERROR_RESPONSE_LEN, 0, result_handling);
|
||||
+ 0, 0, 0, result_handling);
|
||||
|
||||
cleanup:
|
||||
if (uri) g_free(uri);
|
||||
@@ -1251,7 +1252,7 @@ s3_list_keys(S3Handle *hdl,
|
||||
/* Loop until S3 has given us the entire picture */
|
||||
do {
|
||||
/* get some data from S3 */
|
||||
- result = list_fetch(hdl, resource, prefix, delimiter, thunk.next_marker, NULL);
|
||||
+ result = list_fetch(hdl, resource, prefix, delimiter, thunk.next_marker);
|
||||
if (result != S3_RESULT_OK) goto cleanup;
|
||||
|
||||
/* run the parser over it */
|
||||
@ -1,15 +0,0 @@
|
||||
--- s3.c.orig 2008-09-12 13:20:26.000000000 -0400
|
||||
+++ s3.c 2008-09-12 13:20:36.000000000 -0400
|
||||
@@ -1212,10 +1212,10 @@
|
||||
if (!list_build_url_component(&uri, urldelim, "marker", marker)) goto cleanup;
|
||||
urldelim = "&";
|
||||
}
|
||||
- if (max_keys) {
|
||||
+ // if (max_keys) {
|
||||
if (!list_build_url_component(&uri, urldelim, "max-keys", "1024")) goto cleanup;
|
||||
urldelim = "&";
|
||||
- }
|
||||
+ // }
|
||||
|
||||
/* and perform the request on that URI */
|
||||
result = perform_request(hdl, resource, uri, "GET", NULL,
|
||||
@ -1,11 +0,0 @@
|
||||
diff -udr a/deja-dup/Makefile.am b/deja-dup/Makefile.am
|
||||
--- a/deja-dup/Makefile.am 2012-06-05 22:01:48.000000000 +0200
|
||||
+++ b/deja-dup/Makefile.am 2012-06-10 21:19:50.888004476 +0200
|
||||
@@ -55,6 +55,7 @@
|
||||
$(UNITY_VALAFLAGS) \
|
||||
--pkg @GTK_MODULE@ \
|
||||
--pkg gio-2.0 \
|
||||
+ --pkg gio-unix-2.0 \
|
||||
--pkg gnome-keyring-1 \
|
||||
--pkg libpeas-1.0 \
|
||||
--pkg libnotify \
|
||||
@ -1,27 +0,0 @@
|
||||
data/deja-dup-monitor.desktop.in.in | 2 +-
|
||||
data/deja-dup-preferences.desktop.in.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/data/deja-dup-monitor.desktop.in.in b/data/deja-dup-monitor.desktop.in.in
|
||||
index c137b79..1f8e720 100644
|
||||
--- a/data/deja-dup-monitor.desktop.in.in
|
||||
+++ b/data/deja-dup-monitor.desktop.in.in
|
||||
@@ -14,4 +14,4 @@ StartupNotify=false
|
||||
NoDisplay=true
|
||||
|
||||
Type=Application
|
||||
-Categories=System;Utility;Archiving;
|
||||
+Categories=Utility;Archiving;
|
||||
diff --git a/data/deja-dup-preferences.desktop.in.in b/data/deja-dup-preferences.desktop.in.in
|
||||
index 0c3a906..fed53ef 100644
|
||||
--- a/data/deja-dup-preferences.desktop.in.in
|
||||
+++ b/data/deja-dup-preferences.desktop.in.in
|
||||
@@ -11,7 +11,7 @@ Exec=deja-dup-preferences
|
||||
StartupNotify=true
|
||||
|
||||
Type=Application
|
||||
-Categories=GNOME;GTK;System;Archiving;Utility;Settings;X-GNOME-SystemSettings;
|
||||
+Categories=GNOME;GTK;Archiving;Utility;X-GNOME-SystemSettings;
|
||||
|
||||
# Translators: Add whatever keywords you want in your language, separated by semicolons
|
||||
# These keywords are used when searching for applications in dashes, etc.
|
||||
@ -1,21 +0,0 @@
|
||||
--- flexbackup.~1~ 2010-10-09 13:19:27.633694860 +0200
|
||||
+++ flexbackup 2010-10-09 13:21:52.396818511 +0200
|
||||
@@ -133,6 +133,9 @@
|
||||
# tar has a limit of this many chars in its volume label
|
||||
$::tar_max_label = 99;
|
||||
|
||||
+# Define the prune hash to avoid warnings with perl 5.12
|
||||
+use vars qw( %prune );
|
||||
+
|
||||
# Get commandline flags
|
||||
%::opt = ();
|
||||
if (! &::GetOptions(\%::opt,
|
||||
@@ -1050,7 +1053,7 @@
|
||||
} else {
|
||||
$prunekey = $dir;
|
||||
}
|
||||
- if (defined(%{$::prune{$prunekey}})) {
|
||||
+ if (defined($prune{$prunekey})) {
|
||||
&log("| NOTE: \$prune is ignored for type=dump");
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
diff -Naur usr/bin/SpiderOak usr/bin/SpiderOak
|
||||
--- usr/bin/SpiderOak 2012-01-21 19:32:02.000000000 -0500
|
||||
+++ usr/bin/SpiderOak 2012-01-21 19:32:57.000000000 -0500
|
||||
@@ -3,4 +3,4 @@
|
||||
LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
|
||||
export LD_LIBRARY_PATH
|
||||
QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
|
||||
-exec "/opt/SpiderOak/SpiderOak" "$@"
|
||||
+exec "/opt/SpiderOak/SpiderOak" --headless "$@"
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur a/usr/bin/SpiderOak b/usr/bin/SpiderOak
|
||||
--- a/usr/bin/SpiderOak 2011-12-26 16:27:35.000000000 -0500
|
||||
+++ b/usr/bin/SpiderOak 2012-01-09 10:04:03.000000000 -0500
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
-LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH"
|
||||
+LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH"
|
||||
export LD_LIBRARY_PATH
|
||||
QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
|
||||
-exec "/usr/lib/SpiderOak/SpiderOak" "$@"
|
||||
+exec "/opt/SpiderOak/SpiderOak" "$@"
|
||||
@ -1,3 +1,3 @@
|
||||
DIST openscap-0.9.12.tar.gz 12777461 SHA256 8af595087fcf8b6a5076e3755b7a838fcaca899b398537c44c0fe3ff20d90cc8 SHA512 e4a2944a5f4b7adb3df98cfa575f3befbf7418b8ba8e4648016b00026ea9a811cb189f50453f6ac99e3d5e0b5993598b019c33d1c363477a5b1d80349ddf6e7b WHIRLPOOL d86cc85d7b03f6ba1245015310fb6d2a4bc7abf14c7475e3dea1f07333b3c6e71654e89ac25ad80d205b70b8bb7034608e2ab2279ea020ee8dc4f94f897315d3
|
||||
DIST openscap-0.9.4.1.tar.gz 12012752 SHA256 9f80ba69482eb9a5ec0f08491fde3d5963c84441576fa5ede4fcc707d6166059 SHA512 8a91e5249c52a7174e03faa8bf347b6e39cb7330ec9aec5c6413d22b654a964c2f6861bc781e1e358bd62eafbd56562bbe980b18bf472b9645003f17fdc39c99 WHIRLPOOL b4b6beae40d60e8852b9a68ab2421a837d3139c6ea598c7e5b6355690178f1f85d88bece9cfd81d2a09fe177361ddd529d83ba1aced67bc87ad4e19d08cbae98
|
||||
DIST openscap-0.9.8.tar.gz 12688640 SHA256 977fd8a0196c3dce727b9b166777385565a7c5001ca4ef20bb024d12dcb53af2 SHA512 35a221cde33d3295a0dfb59422aa276a6d307621d45920fa70d6ad056ab84ad94953f060b22c6e0dc0738e2e0694ec66f514c36b8cb178ffd5ca3639ffd8ab94 WHIRLPOOL ec952d10dab5cada7f01cf82224be7858c730a66545c05ad7148c20e2e62f6ac8d5aaaeac67d67038df8a6ab3a0290e1e9c76ee53748e485de0bbd41b5c281fc
|
||||
DIST openscap-1.0.1.tar.gz 13166679 SHA256 17fe190e35c68aaaaf0890daaed07ab65521c6879217ae30cfc68a66b743f0bb SHA512 ac497e5bcf06ef570ee2b3e022310797a9ac16585115cd09bdf81777bad9ef09f4536970c1f00bc9b93c227ecd95403c81c06886adab0155aabac07a65e9c7ea WHIRLPOOL a9913141d9ae67173e5a992396cb029a69b67abfc3ea30adbefa89e67d97257c11d131333ad46449f1d95660e6c6d41224328239c15ccb47b76cac634ca10f8b
|
||||
|
||||
@ -0,0 +1,111 @@
|
||||
From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
|
||||
From: Priit Laes <plaes@plaes.org>
|
||||
Date: Thu, 28 Feb 2013 08:28:01 +0200
|
||||
Subject: [PATCH 3/4] Split out gdbus codegen
|
||||
|
||||
---
|
||||
configure.ac | 17 ++++++++---------
|
||||
docs/reference/gio/Makefile.am | 3 +--
|
||||
gio/Makefile.am | 2 +-
|
||||
gio/tests/Makefile.am | 6 ++----
|
||||
gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
|
||||
5 files changed, 14 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 797cb92..907c534 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
|
||||
# option to specify python interpreter to use; this just sets $PYTHON, so that
|
||||
# we will fallback to reading $PYTHON if --with-python is not given, and
|
||||
# python.m4 will get the expected input
|
||||
-AC_ARG_WITH(python,
|
||||
- AS_HELP_STRING([--with-python=PATH],
|
||||
- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
|
||||
- [PYTHON="$withval"], [])
|
||||
-if test x"$PYTHON" = xyes; then
|
||||
- AC_MSG_ERROR([--with-python option requires a path or program argument])
|
||||
-fi
|
||||
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
|
||||
+# AC_ARG_WITH(python,
|
||||
+# AS_HELP_STRING([--with-python=PATH],
|
||||
+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
|
||||
+# [PYTHON="$withval"], [])
|
||||
+# if test x"$PYTHON" = xyes; then
|
||||
+# AC_MSG_ERROR([--with-python option requires a path or program argument])
|
||||
+# fi
|
||||
+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
|
||||
|
||||
|
||||
dnl ***********************
|
||||
@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
|
||||
gobject/tests/Makefile
|
||||
gthread/Makefile
|
||||
gio/Makefile
|
||||
-gio/gdbus-2.0/codegen/Makefile
|
||||
gio/gdbus-2.0/codegen/config.py
|
||||
gio/gnetworking.h
|
||||
gio/xdgmime/Makefile
|
||||
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
|
||||
index 112626b..8ddcdbc 100644
|
||||
--- a/docs/reference/gio/Makefile.am
|
||||
+++ b/docs/reference/gio/Makefile.am
|
||||
@@ -151,8 +151,7 @@ man_MANS += \
|
||||
glib-compile-resources.1 \
|
||||
gsettings.1 \
|
||||
gresource.1 \
|
||||
- gdbus.1 \
|
||||
- gdbus-codegen.1
|
||||
+ gdbus.1
|
||||
|
||||
XSLTPROC_FLAGS = \
|
||||
--nonet \
|
||||
diff --git a/gio/Makefile.am b/gio/Makefile.am
|
||||
index 717419f..808b5dd 100644
|
||||
--- a/gio/Makefile.am
|
||||
+++ b/gio/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/glib.mk
|
||||
|
||||
-SUBDIRS = gdbus-2.0/codegen
|
||||
+SUBDIRS =
|
||||
|
||||
if OS_UNIX
|
||||
SUBDIRS += xdgmime
|
||||
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
|
||||
index 7224124..5c8baaa 100644
|
||||
--- a/gio/tests/Makefile.am
|
||||
+++ b/gio/tests/Makefile.am
|
||||
@@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
|
||||
nodist_gdbus_test_codegen_SOURCES = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
|
||||
|
||||
gdbus-test-codegen.o: gdbus-test-codegen-generated.h
|
||||
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
|
||||
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
|
||||
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
|
||||
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
|
||||
+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile
|
||||
+ $(AM_V_GEN) gdbus-codegen \
|
||||
--interface-prefix org.project. \
|
||||
--generate-c-code gdbus-test-codegen-generated \
|
||||
--c-generate-object-manager \
|
||||
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
index d6d1412..62ef706 100644
|
||||
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
|
||||
gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
|
||||
$(NULL)
|
||||
|
||||
-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
|
||||
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
|
||||
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
|
||||
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
|
||||
+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
|
||||
+ $(AM_V_GEN) gdbus-codegen \
|
||||
--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
|
||||
--c-namespace Example \
|
||||
--c-generate-object-manager \
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -0,0 +1,269 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2.ebuild,v 1.1 2013/12/23 22:38:07 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python2_{6,7} )
|
||||
# Avoid runtime dependency on python when USE=test
|
||||
|
||||
inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="2"
|
||||
IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
|
||||
# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
|
||||
RDEPEND="
|
||||
virtual/libiconv[${MULTILIB_USEDEP}]
|
||||
virtual/libffi[${MULTILIB_USEDEP}]
|
||||
sys-libs/zlib[${MULTILIB_USEDEP}]
|
||||
|| (
|
||||
>=dev-libs/elfutils-0.142
|
||||
>=dev-libs/libelf-0.8.12
|
||||
>=sys-freebsd/freebsd-lib-9.2_rc1
|
||||
)
|
||||
selinux? ( sys-libs/libselinux )
|
||||
xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
|
||||
fam? ( virtual/fam[${MULTILIB_USEDEP}] )
|
||||
utils? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=sys-devel/gettext-0.11
|
||||
>=dev-util/gtk-doc-am-1.15
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
test? (
|
||||
sys-devel/gdb
|
||||
${PYTHON_DEPS}
|
||||
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
|
||||
>=sys-apps/dbus-1.2.14 )
|
||||
!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
|
||||
!<dev-util/gtk-doc-1.15-r2
|
||||
"
|
||||
# gobject-introspection blocker to ensure people don't mix
|
||||
# different g-i and glib major versions
|
||||
|
||||
PDEPEND="x11-misc/shared-mime-info
|
||||
!<gnome-base/gvfs-1.6.4-r990"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# Earlier versions of gvfs do not work with glib
|
||||
|
||||
DOCS="AUTHORS ChangeLog* NEWS* README"
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
export IPV6_DISABLED="yes"
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
|
||||
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
if use test; then
|
||||
# Do not try to remove files on live filesystem, upstream bug #619274
|
||||
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
|
||||
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
|
||||
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
|
||||
sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
|
||||
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
ewarn "Some tests will be skipped due to missing terminal program"
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
fi
|
||||
|
||||
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
|
||||
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
|
||||
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
|
||||
ewarn "not being present on your system, think on installing them to get these tests run."
|
||||
sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
|
||||
sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
|
||||
sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
|
||||
sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
|
||||
sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
|
||||
sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
|
||||
# needed to prevent gdbus-threading from asserting
|
||||
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
|
||||
fi
|
||||
|
||||
# Some tests need ipv6, upstream bug #667468
|
||||
if [[ -n "${IPV6_DISABLED}" ]]; then
|
||||
sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
|
||||
sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
|
||||
sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
|
||||
fi
|
||||
|
||||
# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
|
||||
sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# thread test fails, upstream bug #679306
|
||||
epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
epatch "${FILESDIR}/${PN}-2.37.x-external-gdbus-codegen.patch"
|
||||
|
||||
# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
|
||||
epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
|
||||
|
||||
# leave python shebang alone
|
||||
sed -e '/${PYTHON}/d' \
|
||||
-i glib/Makefile.{am,in} || die
|
||||
|
||||
# Gentoo handles completions in a different directory
|
||||
sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
|
||||
gio/Makefile.am || die
|
||||
|
||||
# Support compilation in clang until upstream solves this, upstream bug #691608
|
||||
append-flags -Wno-format-nonliteral
|
||||
|
||||
epatch_user
|
||||
|
||||
# Needed for the punt-python-check patch, disabling timeout test
|
||||
# Also needed to prevent cross-compile failures, see bug #267603
|
||||
# Also needed for the no-gdbus-codegen patch
|
||||
eautoreconf
|
||||
|
||||
# FIXME: Really needed when running eautoreconf before? bug#????
|
||||
#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
|
||||
epunt_cxx
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Avoid circular depend with dev-util/pkgconfig and
|
||||
# native builds (cross-compiles won't need pkg-config
|
||||
# in the target ROOT to work here)
|
||||
if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
|
||||
if has_version sys-apps/dbus; then
|
||||
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
|
||||
export DBUS1_LIBS="-ldbus-1"
|
||||
fi
|
||||
export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
|
||||
export LIBFFI_LIBS="-lffi"
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
case "${CHOST}" in
|
||||
*-mingw*) myconf="${myconf} --with-threads=win32" ;;
|
||||
*) myconf="${myconf} --with-threads=posix" ;;
|
||||
esac
|
||||
|
||||
# Building with --disable-debug highly unrecommended. It will build glib in
|
||||
# an unusable form as it disables some commonly used API. Please do not
|
||||
# convert this to the use_enable form, as it results in a broken build.
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Only used by the gresource bin
|
||||
multilib_is_native_abi || myconf="${myconf} --disable-libelf"
|
||||
|
||||
# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
|
||||
if multilib_is_native_abi; then
|
||||
myconf="${myconf} $(use_enable selinux)"
|
||||
else
|
||||
myconf="${myconf} --disable-selinux"
|
||||
fi
|
||||
|
||||
# Always use internal libpcre, bug #254659
|
||||
ECONF_SOURCE="${S}" econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable systemtap dtrace) \
|
||||
$(use_enable systemtap systemtap) \
|
||||
--disable-compile-warnings \
|
||||
--enable-man \
|
||||
--with-pcre=internal \
|
||||
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if use utils ; then
|
||||
python_replicate_script "${ED}"/usr/bin/gtester-report
|
||||
else
|
||||
rm "${ED}usr/bin/gtester-report"
|
||||
rm "${ED}usr/share/man/man1/gtester-report.1"
|
||||
fi
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${ED}/usr/lib/charset.alias"
|
||||
|
||||
# Don't install gdb python macros, bug 291328
|
||||
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
|
||||
|
||||
# Completely useless with or without USE static-libs, people need to use
|
||||
# pkg-config
|
||||
prune_libtool_files --modules
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
gnome2_environment_reset
|
||||
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
unset GSETTINGS_BACKEND # bug 352451
|
||||
export LC_TIME=C # bug #411967
|
||||
python_export_best
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
# Hardened: gdb needs this, bug #338891
|
||||
if host-is-pax ; then
|
||||
pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
|
||||
|| die "Hardened adjustment failed"
|
||||
fi
|
||||
|
||||
# Need X for dbus-launch session X11 initialization
|
||||
Xemake check
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if has_version '<x11-libs/gtk+-3.0.12:3'; then
|
||||
# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
|
||||
# a warning instead of a blocker
|
||||
ewarn
|
||||
ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
|
||||
ewarn "You should upgrade to a newer version of gtk+:3 immediately."
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST gobject-introspection-1.32.1.tar.xz 1120996 SHA256 44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858 SHA512 115d317890e1a66a64760baebad5c9a0b50600f4cf8ba805fed8fcf047413be51603a3dbd83f552609e7a30dba303ebe9e6bfaa0bb3d6e2f95ad9f98d2c4a02c WHIRLPOOL 7a04b5db51ddbf555e251788334c1976874ab847f89577a0d1e94bbabc9c8bd9ecba7dbe9b85b1e92a63cb942df626a3934b959331e118750f8f4f5520961a64
|
||||
DIST gobject-introspection-1.34.2.tar.xz 1088768 SHA256 bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429 SHA512 e57839f9354aacded057911914de94d6357c323cb57cbd2934e668f2d149e779d1aca818e18b13d67fd359afe75dbe9e3525d8f7544a7ced0bbe8f7397526330 WHIRLPOOL 01b5b0662886bd708dad0d60eb06ba18af8c5f50895268bc618ddfa988789621d086b754afe48d7002ba8c8163d92318ff34d564605f406f92ef4cb9ad4659b5
|
||||
DIST gobject-introspection-1.36.0.tar.xz 1201108 SHA256 e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 SHA512 5c6d17851ac7d1372abdc6a9ced44d1c2313b098e6fdfbe7cba78bff66032923fccddb58913753f46e1d7fea09536bb057ea2ff7203d5f4f7540badd830eaa83 WHIRLPOOL 1f31a314a9056f2f452e59808ba143f5e387f1c7c82ddb0e3f20295592850995f602a2a82b36602b7089cddb192896d918db02190e411710d8806dbdebc77f4c
|
||||
DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild,v 1.1 2013/12/23 22:46:30 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
GNOME_ORG_MODULE="gobject-introspection"
|
||||
|
||||
inherit gnome.org
|
||||
|
||||
DESCRIPTION="Build infrastructure for GObject Introspection"
|
||||
HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
|
||||
# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
|
||||
# http://forums.gentoo.org/viewtopic-p-7421930.html
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/aclocal
|
||||
insinto /usr/share/aclocal
|
||||
doins m4/introspection.m4
|
||||
|
||||
dodir /usr/share/gobject-introspection-1.0
|
||||
insinto /usr/share/gobject-introspection-1.0
|
||||
doins Makefile.introspection
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST gobject-introspection-1.32.1.tar.xz 1120996 SHA256 44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858 SHA512 115d317890e1a66a64760baebad5c9a0b50600f4cf8ba805fed8fcf047413be51603a3dbd83f552609e7a30dba303ebe9e6bfaa0bb3d6e2f95ad9f98d2c4a02c WHIRLPOOL 7a04b5db51ddbf555e251788334c1976874ab847f89577a0d1e94bbabc9c8bd9ecba7dbe9b85b1e92a63cb942df626a3934b959331e118750f8f4f5520961a64
|
||||
DIST gobject-introspection-1.34.2.tar.xz 1088768 SHA256 bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429 SHA512 e57839f9354aacded057911914de94d6357c323cb57cbd2934e668f2d149e779d1aca818e18b13d67fd359afe75dbe9e3525d8f7544a7ced0bbe8f7397526330 WHIRLPOOL 01b5b0662886bd708dad0d60eb06ba18af8c5f50895268bc618ddfa988789621d086b754afe48d7002ba8c8163d92318ff34d564605f406f92ef4cb9ad4659b5
|
||||
DIST gobject-introspection-1.36.0.tar.xz 1201108 SHA256 e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 SHA512 5c6d17851ac7d1372abdc6a9ced44d1c2313b098e6fdfbe7cba78bff66032923fccddb58913753f46e1d7fea09536bb057ea2ff7203d5f4f7540badd830eaa83 WHIRLPOOL 1f31a314a9056f2f452e59808ba143f5e387f1c7c82ddb0e3f20295592850995f602a2a82b36602b7089cddb192896d918db02190e411710d8806dbdebc77f4c
|
||||
DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild,v 1.1 2013/12/23 22:54:05 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit gnome2 python-single-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
|
||||
HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
|
||||
|
||||
LICENSE="LGPL-2+ GPL-2+"
|
||||
SLOT="0"
|
||||
IUSE="cairo doctool test"
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
test? ( cairo )
|
||||
"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/gobject-introspection-common-${PV}
|
||||
>=dev-libs/glib-2.36:2
|
||||
doctool? ( dev-python/mako )
|
||||
virtual/libffi:=
|
||||
!<dev-lang/vala-0.20.0
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
# Wants real bison, not virtual/yacc
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/gtk-doc-am-1.15
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# PDEPEND to avoid circular dependencies, bug #391213
|
||||
PDEPEND="cairo? ( x11-libs/cairo[glib] )"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if ! has_version "x11-libs/cairo[glib]"; then
|
||||
# Bug #391213: enable cairo-gobject support even if it's not installed
|
||||
# We only PDEPEND on cairo to avoid circular dependencies
|
||||
export CAIRO_LIBS="-lcairo -lcairo-gobject"
|
||||
export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
|
||||
fi
|
||||
|
||||
# To prevent crosscompiling problems, bug #414105
|
||||
gnome2_src_configure \
|
||||
--disable-static \
|
||||
CC=$(tc-getCC) \
|
||||
YACC=$(type -p yacc) \
|
||||
$(use_with cairo) \
|
||||
$(use_enable doctool)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
|
||||
gnome2_src_install
|
||||
|
||||
# Prevent collision with gobject-introspection-common
|
||||
rm -v "${ED}"usr/share/aclocal/introspection.m4 \
|
||||
"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
|
||||
rmdir "${ED}"usr/share/aclocal || die
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
DIST libgee-0.10.4.tar.xz 626856 SHA256 bb18fbdd048a9fb474def98f8b038db62d391b658b6bdebd2504cb638798ef6b SHA512 a8dcea975f2e39b0039c6e14313a512e67a5096045369367c4bf918199594a5b80340a47613ccb94e30e4204527df75de3bf8cf08334e0f67eff0e74d6ed8e9a WHIRLPOOL 8a457683c9df396a8b5b86e0105913d31e50db0508ca564eaf18f6df8c48db8fdf8d59bf9a13e8a65699838366923f9d0a7e6f881129d9f656bce787d13f9ed5
|
||||
DIST libgee-0.10.5.tar.xz 626524 SHA256 84d801cac35cb93ae779e77cab8c379c31a3b30b55a5fb021af2008a38f87b15 SHA512 d01fb9c0b6b97d126bc64ae5c295240cf3e511eb929fb721bbd88b164fcbd861c9dcd389d8f69534f7bf9483448371b3fd9af9edf225aa0fddc0dac9af237882 WHIRLPOOL e876fef6a3f9754ea8e1a6d5b64f2eac28157a232ade40ee561f28157056f5b75410d5856d6dd985fde6db48aa7f648c74c1c7e9b2d029b76000fe428a3c2017
|
||||
DIST libgee-0.12.0.tar.xz 639880 SHA256 d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5 SHA512 9bb9aaa64e5b6140fcb77fb03bb36167c5e64ef7ff004048984cb62c135e543f8897d13abe49cf83d9b96c0ee8907bd1f14ae4ae3efdb3d46699dca4101dcc67 WHIRLPOOL 5a7714bfbe76013ace34d60328975b9171c1315290f1a7d83709e97a383ef3636007cba5edb1325f4c455af2601b3f73febcc6def24bfe8e1962ec6412a562ff
|
||||
DIST libgee-0.6.7.tar.xz 505040 SHA256 b512bf1785fbbb6a264be5fac325c42d4e96cc560b22e3f19ea5b01b1414106d SHA512 f80221b7400de05f966e096f6147dffc3d64e67ae68723f1a56b04c6775aaa380d9694c61e84aca7317d6d72c577297d7e25af8a590c5bd87b121b6818b61968 WHIRLPOOL 1a979f94c6896e852a64075a59081671d952b1068081014ef9321680490015030c6dbf43d5f7e55f0e5e012f2e77c84e18ffc47d2b13967467fcf3d3e42b3682
|
||||
DIST libgee-0.6.8.tar.xz 443060 SHA256 a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a WHIRLPOOL 4c96a3e1dc1c34ca6b23b5b34fae7420ff9215ad07618a9b818d70b12697cac430cee95ab7bd175b4f96fbae99fcd4e1fca8da7f55064962b2cb61c641d22bb2
|
||||
DIST libgee-0.8.4.tar.xz 584040 SHA256 0d651cf16d0825961f3f6992a4e27e67fbeb8599d4fcbcbb0f44aa2f7118a389 SHA512 538a1ca7ba9bf06bd27f4c12ecc28c48957afaadb2d336cf1edf9be69255ce9f2a22f83df85c57ae472955fc778b666be425f0128d6fc0f50a9aaf8a43fbd63f WHIRLPOOL 38f7afd2c71317db9a4e29cdf64c6cf46b813f13fae8324f638266cc76199103c0a77b888de1dc68cbbc23801d6c01c8f4d7a8007fe3abe8bb58d387754f889a
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.21.1.ebuild,v 1.1 2013/12/24 01:58:32 radhermit Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Amazon Web Services API"
|
||||
HOMEPAGE="https://github.com/boto/boto http://pypi.python.org/pypi/boto"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
# requires Amazon Web Services keys to pass some tests
|
||||
RESTRICT="test"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST equalizer-0.0.8.gem 12800 SHA256 d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da SHA512 1f7c97d8f48dbf83e37b4b053853f2a94be6f6e5cbe044af1db6c55ed9aa03fa27c9fbecf89380217a0cd248b55d4bc46e9b817ae447eebb5cf773c5396d6597 WHIRLPOOL 8d6928a5fc78bc582235ab234eaa8701d1a0493c225186718aec2087baa6722616a251a84c93dba9e6b0ebad15cb651b826984ad90304d55722a7d2dacc0350d
|
||||
DIST equalizer-0.0.9.gem 12288 SHA256 992b58dc8892afc3c0bde86cd00349b23f01fb702c295c46dd3bfb4f0574dbc4 SHA512 28588e9d42cd2bdaebb9727d35577d0d306578ed85b6a42ec5ca616fd6e858dfc972cca6a2ba3b37cc799d9d6daffc3e9ce73708dc998f7072b83d1cbd8756b2 WHIRLPOOL 8bc9938ed8c99d150d72a28f234b2491cd7c4fc030a9562aaf52e70354eb70537ceb40a050c007f84f1d109e8bbbc86fa1d11ca8ddbf7c932ebcb416c7cc6113
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/equalizer/equalizer-0.0.9.ebuild,v 1.1 2013/12/24 06:24:04 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 jruby"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Module to define equality, equivalence and inspection methods"
|
||||
HOMEPAGE="https://github.com/dkubb/equalizer"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e "/devtools/d" spec/spec_helper.rb || die
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
|
||||
DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
|
||||
DIST glib-2.36.4.tar.xz 6570720 SHA256 f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e SHA512 ed3b01051695858724d854c4d1c20df19d4c19526538d87c995e41376e3479e5758afccc9550cf7f4d1104bdd4edb8b436a716ab2b95e7bdf198ff3f17749304 WHIRLPOOL 7997c5182c605ded87aac79b75b83a0aaf30dc9eb4a657aed77fe883946e7fe07e2257f3b1b6749ca7d3c921e041067907f8f2f16fae7ebfe99e1adbbeea12b5
|
||||
DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild,v 1.6 2013/09/05 18:39:23 mgorny Exp $
|
||||
|
||||
EAPI="5"
|
||||
GNOME_ORG_MODULE="glib"
|
||||
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit eutils gnome.org distutils-r1
|
||||
|
||||
DESCRIPTION="GDBus code and documentation generator"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
# To prevent circular dependencies with glib[test]
|
||||
PDEPEND=">=dev-libs/glib-${PV}:2"
|
||||
|
||||
S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
|
||||
|
||||
python_prepare_all() {
|
||||
PATCHES=( "${FILESDIR}/${PN}-2.32.4-sitedir.patch" )
|
||||
distutils-r1_python_prepare_all
|
||||
sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
|
||||
-i config.py || die "sed config.py failed"
|
||||
|
||||
sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
|
||||
cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
|
||||
sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
elog "Skipping tests. This package is tested by dev-libs/glib"
|
||||
elog "when merged with FEATURES=test"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all # no-op, but prevents QA warning
|
||||
doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild,v 1.1 2013/12/24 06:00:02 nullishzero Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit gnome2-utils
|
||||
|
||||
DESCRIPTION="nuoveXT2 iconset"
|
||||
HOMEPAGE="http://lxde.sf.net/"
|
||||
SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="x11-libs/gtk+:2"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-devel/gettext
|
||||
!<lxde-base/lxde-common-0.5.0"
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,4 +1,3 @@
|
||||
DIST cogl-1.10.4.tar.xz 1253708 SHA256 0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9 SHA512 bbff0ae9731a12b5f9e493c7dacb8d02fe3289c30c4895fe277959b3e3155095b003b03e7c46a74ed0152916758484e3c305c599e73ceb81fd912ba491dda0ae WHIRLPOOL 65c11ee6eda657add0e0d5068cf8c055202901cb8bb19055d1f7bbe72c54373c3bed83ee3fb84edf6e0a37618d7517f3a38c3e521003c638e9850b09bdc39e82
|
||||
DIST cogl-1.12.2.tar.xz 1301108 SHA256 31971d4c6543c589f6fc49ab1724dfbdc7062c58a7da842cb1935e32ca6e1d7e SHA512 5bf43434814be4d7beae9dedc0d2d8bc31c174a82386f581d705e2586da93cea930b5b66bb707036a8ed7b49147af003ab7dda125e86098fe3433e9418001b2d WHIRLPOOL f2c6e768f874c06e95c352fa23a3b7d8bacf3a0e05466cc508e690adfc97b9dc1c627f494078a76b883428d1b8b58cd5930be49385ad4c3867843bfe6a0e4b46
|
||||
DIST cogl-1.14.0.tar.xz 1656520 SHA256 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 SHA512 9e9f34d6dd9954512322ad2478a6ca9bdad60462b1930b39421fdb5f10d3a71ef62ac70d58929fd8448d39dc5a6227f0a895a6f9113bc0ecc83b6c0f26bfb3cb WHIRLPOOL a4f550f722e3c8d748b7008f09d02de5647bcf2f261983ec0cc05eb63dedb8e4950b11ce141ada88506225ad4b4007b1a54e83f972fb80c297411affa7c6f9b5
|
||||
DIST cogl-1.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9699a1da21c60fd4c17ff2858060f24642af SHA512 528c799398920804c8f9e7b649822a0b2af7e34ef6ab884be000d7e32d0b1d1134ccbbc824c712b4a1457249bcdf73abe3c6196858be1008b1536447d907bb3e WHIRLPOOL e35ac2db1f16a20f5b6fb125c603587bd217247a0c5971464619434195c1f61e5eafde778931761a68b7abc25c5ed23fddda2e2b6ae0e9354431a65f66bcfc5a
|
||||
DIST cogl-1.16.0.tar.xz 1653292 SHA256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094 SHA512 d4e65216ad37680a58cd0a018bb2cb53b11d1e51baa2cd10e615812cbe5e1f9cd3365e248be6d84c8266cd3996039fcfb80e315bcc58f59a290555f57c013358 WHIRLPOOL 4fab497e0b7ab771a34dd53749b635bc87f16f8a2298a057497d60f9951ccaa17df200f2c120c57767007bd31c28e020ea58a7f12e2738ed5051f1d5deef164c
|
||||
|
||||
@ -1,110 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.2-r1.ebuild,v 1.1 2013/05/03 05:43:15 leio Exp $
|
||||
|
||||
EAPI="5"
|
||||
CLUTTER_LA_PUNT="yes"
|
||||
|
||||
# Inherit gnome2 after clutter to download sources from gnome.org
|
||||
inherit eutils clutter gnome2 multilib virtualx
|
||||
|
||||
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
|
||||
HOMEPAGE="http://www.clutter-project.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+ FDL-1.1+"
|
||||
SLOT="1.0/11"
|
||||
IUSE="doc examples +introspection +opengl gles2 +pango"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
# XXX: need uprof for optional profiling support
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2.28.0:2
|
||||
x11-libs/cairo:=
|
||||
>=x11-libs/gdk-pixbuf-2:2
|
||||
x11-libs/libdrm:=
|
||||
x11-libs/libX11
|
||||
>=x11-libs/libXcomposite-0.4
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXext
|
||||
>=x11-libs/libXfixes-3
|
||||
virtual/opengl
|
||||
gles2? ( media-libs/mesa[gles2] )
|
||||
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
|
||||
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
|
||||
"
|
||||
# before clutter-1.7, cogl was part of clutter
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<media-libs/clutter-1.7"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-util/gtk-doc-am-1.13
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.13 )
|
||||
test? ( app-admin/eselect-opengl
|
||||
media-libs/mesa[classic] )
|
||||
"
|
||||
# Need classic mesa swrast for tests, llvmpipe causes a test failure
|
||||
|
||||
src_configure() {
|
||||
# XXX: think about kms-egl, quartz, sdl, wayland
|
||||
# Prefer gl over gles2 if both are selected
|
||||
gnome2_src_configure \
|
||||
--disable-examples-install \
|
||||
--disable-profile \
|
||||
--disable-maintainer-flags \
|
||||
--enable-cairo \
|
||||
--enable-deprecated \
|
||||
--enable-gdk-pixbuf \
|
||||
--enable-glib \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable opengl glx) \
|
||||
$(use_enable opengl gl) \
|
||||
$(use_enable gles2) \
|
||||
$(use_enable gles2 cogl-gles2) \
|
||||
$(use_enable gles2 xlib-egl-platform) \
|
||||
$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable pango cogl-pango)
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Don't accidentally use MSAA visuals - it degrades performance and could
|
||||
# crash gnome-shell with SIGBUS on large textures
|
||||
# http://lists.freedesktop.org/archives/cogl/2013-April/001090.html
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=61182
|
||||
epatch "${FILESDIR}/${P}-dont-use-MSAA.patch"
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
|
||||
# NOTE: recheck if this is needed after every mesa bump
|
||||
if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
|
||||
ewarn "Skipping tests because a binary OpenGL library is enabled. To"
|
||||
ewarn "run tests for ${PN}, you need to enable the Mesa library:"
|
||||
ewarn "# eselect opengl set xorg-x11"
|
||||
return
|
||||
fi
|
||||
LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS="NEWS README"
|
||||
EXAMPLES="examples/{*.c,*.jpg}"
|
||||
|
||||
clutter_src_install
|
||||
|
||||
# Remove silly examples-data directory
|
||||
rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
preserve_old_lib /usr/$(get_libdir)/libcogl.so.9
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/libcogl.so.9
|
||||
}
|
||||
@ -1,92 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.14.0.ebuild,v 1.3 2013/07/27 23:57:28 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
CLUTTER_LA_PUNT="yes"
|
||||
|
||||
# Inherit gnome2 after clutter to download sources from gnome.org
|
||||
inherit eutils clutter gnome2 multilib virtualx
|
||||
|
||||
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
|
||||
HOMEPAGE="http://www.clutter-project.org/"
|
||||
|
||||
LICENSE="LGPL-2.1+ FDL-1.1+"
|
||||
SLOT="1.0/12" # subslot = .so version
|
||||
IUSE="doc examples +introspection +opengl gles2 +pango profile"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
# XXX: need uprof for optional profiling support
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2.32:2
|
||||
x11-libs/cairo:=
|
||||
>=x11-libs/gdk-pixbuf-2:2
|
||||
x11-libs/libdrm:=
|
||||
x11-libs/libX11
|
||||
>=x11-libs/libXcomposite-0.4
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXext
|
||||
>=x11-libs/libXfixes-3
|
||||
>=x11-libs/libXrandr-1.2
|
||||
virtual/opengl
|
||||
gles2? ( media-libs/mesa[gles2] )
|
||||
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
|
||||
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
|
||||
"
|
||||
# before clutter-1.7, cogl was part of clutter
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<media-libs/clutter-1.7"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-util/gtk-doc-am-1.13
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.13 )
|
||||
test? ( app-admin/eselect-opengl
|
||||
media-libs/mesa[classic] )
|
||||
"
|
||||
# Need classic mesa swrast for tests, llvmpipe causes a test failure
|
||||
|
||||
src_configure() {
|
||||
# XXX: think about kms-egl, quartz, sdl, wayland
|
||||
# Prefer gl over gles2 if both are selected
|
||||
gnome2_src_configure \
|
||||
--disable-examples-install \
|
||||
--disable-maintainer-flags \
|
||||
--enable-cairo \
|
||||
--enable-deprecated \
|
||||
--enable-gdk-pixbuf \
|
||||
--enable-glib \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable opengl glx) \
|
||||
$(use_enable opengl gl) \
|
||||
$(use_enable gles2) \
|
||||
$(use_enable gles2 cogl-gles2) \
|
||||
$(use_enable gles2 xlib-egl-platform) \
|
||||
$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable pango cogl-pango) \
|
||||
$(use_enable profile)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
|
||||
# NOTE: recheck if this is needed after every mesa bump
|
||||
if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
|
||||
ewarn "Skipping tests because a binary OpenGL library is enabled. To"
|
||||
ewarn "run tests for ${PN}, you need to enable the Mesa library:"
|
||||
ewarn "# eselect opengl set xorg-x11"
|
||||
return
|
||||
fi
|
||||
LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS="NEWS README"
|
||||
EXAMPLES="examples/{*.c,*.jpg}"
|
||||
|
||||
clutter_src_install
|
||||
|
||||
# Remove silly examples-data directory
|
||||
rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
From 1f84b5c9b41fb053e7d96b93e3558ca03eed2ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Glisse
|
||||
Date: Tue, 29 Jan 2013 18:37:41 -0500
|
||||
Subject: [PATCH] glx do not use multisample visual config for front or pixmap
|
||||
|
||||
There is no guaranty that glXGetFBConfigs will return fbconfig ordered
|
||||
with non msaa config first. This patch make sure that non msaa config
|
||||
get choose.
|
||||
|
||||
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
|
||||
Reviewed-by: Robert Bragg <robert@linux.intel.com>
|
||||
|
||||
(cherry picked from commit 93b7b4c850dd928bf21ee168a95641a8d631f713)
|
||||
---
|
||||
cogl/winsys/cogl-winsys-glx.c | 31 ++++++++++++++++++++++++-------
|
||||
1 file changed, 24 insertions(+), 7 deletions(-)
|
||||
|
||||
commit 8a1353a215ab that removes a hunk as unnecessary is manually removed
|
||||
from this patchfile instead of reverting in a second patch for Gentoo.
|
||||
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
|
||||
index 234e9da..24aee14 100644
|
||||
--- a/cogl/winsys/cogl-winsys-glx.c
|
||||
+++ b/cogl/winsys/cogl-winsys-glx.c
|
||||
@@ -2024,6 +2031,16 @@ get_fbconfig_for_depth (CoglContext *context,
|
||||
if (value != depth && (value - alpha) != depth)
|
||||
continue;
|
||||
|
||||
+ if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4)
|
||||
+ {
|
||||
+ glx_renderer->glXGetFBConfigAttrib (dpy,
|
||||
+ fbconfigs[i],
|
||||
+ GLX_SAMPLES,
|
||||
+ &value);
|
||||
+ if (value > 1)
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
value = 0;
|
||||
if (depth == 32)
|
||||
{
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 23 Dec 2013 18:07:01 +0000
|
||||
Tue, 24 Dec 2013 08:07:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 23 Dec 2013 18:07:02 +0000
|
||||
Tue, 24 Dec 2013 08:07:01 +0000
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install prepare setup
|
||||
DEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) ldap? ( net-nds/openldap ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl perl? ( dev-lang/swig ) python? ( dev-lang/swig ) test? ( app-arch/unzip dev-perl/XML-XPath net-misc/ipcalc sys-apps/grep ) =dev-lang/python-2*
|
||||
DESCRIPTION=Framework which enables integration with the Security Content Automation Protocol (SCAP)
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.open-scap.org/
|
||||
IUSE=bash-completion doc ldap nss perl python rpm selinux sql test
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=LGPL-2.1
|
||||
RDEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) ldap? ( net-nds/openldap ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl =dev-lang/python-2*
|
||||
SLOT=0
|
||||
SRC_URI=https://fedorahosted.org/releases/o/p/openscap/openscap-0.9.4.1.tar.gz
|
||||
_eclasses_=bash-completion-r1 d339dd40b2014cf1edba8592580eef42 eutils a82a329b538368791f5a6113c60e557e multilib 892e597faee02a5b94eb02ab512e7622 python 305197b0aa1194fa3ef67ca21f6faa7e toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
|
||||
_md5_=429a707938ddf475c062ef85c5dc2f82
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare
|
||||
DEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl doc? ( app-doc/doxygen ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) test? ( app-arch/unzip dev-perl/XML-XPath net-misc/ipcalc sys-apps/grep ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
|
||||
DESCRIPTION=Framework which enables integration with the Security Content Automation Protocol (SCAP)
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.open-scap.org/
|
||||
IUSE=acl bash-completion caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr python_targets_python2_6 python_targets_python2_7
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=LGPL-2.1
|
||||
RDEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl
|
||||
SLOT=0
|
||||
SRC_URI=https://fedorahosted.org/releases/o/p/openscap/openscap-1.0.1.tar.gz
|
||||
_eclasses_=bash-completion-r1 d339dd40b2014cf1edba8592580eef42 eutils a82a329b538368791f5a6113c60e557e multibuild 56d4120419072116417e8de1bd1040ff multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing c2d96fb38f2596209e98fceda58ba1ed python-r1 cd956d5a4bac2209a64d0f4851cc115d python-utils-r1 49ee0ca5e1019d8f256a23692dad2642 toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
|
||||
_md5_=972653484421485f7b9a9dd8fa78eeff
|
||||
@ -1,12 +1,11 @@
|
||||
DEFINED_PHASES=compile configure install prepare unpack
|
||||
DEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) ldap? ( net-nds/openldap ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl doc? ( app-doc/doxygen ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) test? ( app-arch/unzip dev-perl/XML-XPath net-misc/ipcalc sys-apps/grep ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) dev-vcs/git || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
DEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl doc? ( app-doc/doxygen ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) test? ( app-arch/unzip dev-perl/XML-XPath net-misc/ipcalc sys-apps/grep ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) dev-vcs/git || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
DESCRIPTION=Framework which enables integration with the Security Content Automation Protocol (SCAP)
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.open-scap.org/
|
||||
IUSE=bash-completion debug doc ldap nss perl python rpm selinux sce sql test python_targets_python2_6 python_targets_python2_7
|
||||
IUSE=acl bash-completion caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr python_targets_python2_6 python_targets_python2_7
|
||||
LICENSE=LGPL-2.1
|
||||
RDEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) ldap? ( net-nds/openldap ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl
|
||||
RESTRICT=test
|
||||
RDEPEND=!nss? ( dev-libs/libgcrypt ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl
|
||||
SLOT=0
|
||||
_eclasses_=autotools d491cbee372fe390ce066f901abdaaaf bash-completion-r1 d339dd40b2014cf1edba8592580eef42 eutils a82a329b538368791f5a6113c60e557e git-2 2027b81a576527fa16bece425941e094 git-r3 f089608c770d9ad72a2c92b547d2b20d libtool 60a86ca1cbe8068e3d9df0d3004dc520 multibuild 56d4120419072116417e8de1bd1040ff multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing c2d96fb38f2596209e98fceda58ba1ed python-r1 cd956d5a4bac2209a64d0f4851cc115d python-utils-r1 49ee0ca5e1019d8f256a23692dad2642 toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28
|
||||
_md5_=f9d2b3f0efc873857b21e662021dc04d
|
||||
_md5_=d9d8dd253b4db6a93f847e114f4a2c13
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=compile install postinst postrm prepare pretend setup test unpack
|
||||
DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) dev-embedded/msp430-binutils sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig amd64? ( multilib? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-xlibs ) ) x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
|
||||
DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) dev-embedded/msp430-binutils >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig amd64? ( multilib? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-xlibs ) ) x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
|
||||
DESCRIPTION=The GNU Compiler Collection for MSP430 microcontrollers
|
||||
EAPI=4
|
||||
HOMEPAGE=http://gcc.gnu.org/
|
||||
IUSE=multislot nls nptl regression-test vanilla altivec cxx fortran doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite lto go
|
||||
IUSE=multislot nls nptl regression-test vanilla altivec cxx fortran doc gcj awt hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
|
||||
LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
|
||||
PDEPEND=>=sys-devel/gcc-config-1.7
|
||||
RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
|
||||
RESTRICT=strip
|
||||
SLOT=4.7
|
||||
SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120911/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/dist/msp430-gcc-4.7.0_p20120911.patch.bz2
|
||||
_eclasses_=eutils a82a329b538368791f5a6113c60e557e fixheadtails f96922acc9287f1e889a1e50a6c8986e flag-o-matic 65cef1287b9d62b1a0f180765d1e0c69 gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 60a86ca1cbe8068e3d9df0d3004dc520 multilib 892e597faee02a5b94eb02ab512e7622 pax-utils 2424f959506320f5196de8f79fa05297 toolchain 6419945dca239b9ff8555a83adae8c74 toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28 versionator a8a3963967d6140be9a14b08bb8f047f
|
||||
_eclasses_=eutils a82a329b538368791f5a6113c60e557e fixheadtails f96922acc9287f1e889a1e50a6c8986e flag-o-matic 65cef1287b9d62b1a0f180765d1e0c69 gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool 60a86ca1cbe8068e3d9df0d3004dc520 multilib 892e597faee02a5b94eb02ab512e7622 pax-utils 2424f959506320f5196de8f79fa05297 toolchain ad566c7e73305dde8d0b2cf1affd8f2b toolchain-funcs 51e6c948e72c43bcc8edc7544411c953 user d0a4d0735a6c0183d707ca919bd72f28 versionator a8a3963967d6140be9a14b08bb8f047f
|
||||
_md5_=df1eeaed61e12996abc6fcb46df20146
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue