mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 05:51:18 +02:00
cleanup: prune outdated packages provided by portage-stable
This commit is contained in:
parent
8c92e641dd
commit
638a99fc71
@ -1,53 +0,0 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index d347e9b3..cc1c29b1 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,2 +1,2 @@
|
||||
|
||||
-SUBDIRS = lib/ccan src docs tests
|
||||
+SUBDIRS = lib/ccan src tests
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 57e7c4a3..584d2616 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -225,7 +225,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
uuid_CFLAGS = @uuid_CFLAGS@
|
||||
uuid_LIBS = @uuid_LIBS@
|
||||
-SUBDIRS = lib/ccan src docs tests
|
||||
+SUBDIRS = lib/ccan src tests
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 73198f17..94408bba 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5517,7 +5517,7 @@ CPPFLAGS="$CPPFLAGS_save"
|
||||
EFI_CPPFLAGS=$EFI_CPPFLAGS
|
||||
|
||||
|
||||
-ac_config_files="$ac_config_files Makefile src/Makefile lib/ccan/Makefile docs/Makefile tests/Makefile"
|
||||
+ac_config_files="$ac_config_files Makefile src/Makefile lib/ccan/Makefile tests/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@@ -6249,7 +6249,6 @@ do
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
||||
"lib/ccan/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ccan/Makefile" ;;
|
||||
- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
|
||||
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
|
||||
|
||||
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0d8f0bbd..fb2b6c4f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -74,5 +74,5 @@ CPPFLAGS="$CPPFLAGS_save"
|
||||
AC_SUBST(EFI_CPPFLAGS, $EFI_CPPFLAGS)
|
||||
|
||||
AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
|
||||
- [docs/Makefile tests/Makefile])
|
||||
+ [tests/Makefile])
|
||||
AC_OUTPUT
|
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/sbsigntool/sbsigntool-0.6.ebuild,v 1.3 2013/08/28 11:17:16 ago Exp $
|
||||
|
||||
EAPI="4"
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
|
||||
HOMEPAGE="http://packages.ubuntu.com/quantal/sbsigntool"
|
||||
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/openssl
|
||||
sys-apps/util-linux"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-apps/help2man
|
||||
sys-boot/gnu-efi
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
local iarch
|
||||
case ${ARCH} in
|
||||
ia64) iarch=ia64 ;;
|
||||
x86) iarch=ia32 ;;
|
||||
amd64) iarch=x86_64 ;;
|
||||
*) die "unsupported architecture: ${ARCH}" ;;
|
||||
esac
|
||||
sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
|
||||
sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
|
||||
|
||||
# stupid cross-compile nonsense...
|
||||
epatch "${FILESDIR}"/no_docs.patch
|
||||
}
|
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
|
||||
DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
|
||||
DIST glib-2.20.5.tar.bz2 5037738 SHA256 88f092769df5ce9f784c1068a3055ede00ada503317653984101d5393de63655 SHA512 71e89d15391c05d769b261669de33b674e4547dbba8df236fefe82a98bc13034c460e19953d070cf762483c4c04febf893ad2e1f16654b4d0f6c5af2bc7d946d WHIRLPOOL cd6d9f9545af4d29510861a6fe780743b05ead970d27c515634e4e2ed42e82f362f556733678870f7a54cbcf7a880d067f30dac3cc95128166d49f885b2a071a
|
||||
DIST glib-2.22.2.tar.bz2 5490926 SHA256 a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3 SHA512 25d5579385df4a656d3050ad23b13df8bd9391939347975fa578d60bc8a83e2edf7b446eabee70f439b0aa9cd29fe3c0a5b836cf890d98a5f0954a3ea0aa65b3 WHIRLPOOL 26d3986df167261993d090e80f555dd51cc055dc6d2e89c1664ac57eb44d03f25e58ab85c6ad876a23491dc3daab2831319f9b320b323cafdc9428669ac4c555
|
||||
DIST glib-2.22.3.tar.bz2 5009176 SHA256 edf1a42cfefc13dbb2c0973188a45e02908d6fe31e769306b190d15ace6c8b8a SHA512 46e0dcc0c12af81090b8e4f94f1d5dc0c70c041bd1bad3a5ed3d413e608c1789da929691bce3b232d246b0bdd0b04bb02e1fac1653990a89110c306ac15448a4 WHIRLPOOL c2de883048d0e1ae3ebea76451fe0296e8b3b1dbeff434beaa765a96ac0edd9840cd6d02a6be12b6f0e31d5348cb0ae025f5cb6981c100be420d9fe1b78b9cc7
|
||||
DIST glib-2.22.4.tar.bz2 5012207 SHA256 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14 SHA512 845fdf4d105cb84ac6e0a188aba1fe6ad8f8d5f971b381e578144dc74bea237c093ed3e7e811e3ea8741b11275695fac60d6e38283a1c8527a8ddd924fb7bf5d WHIRLPOOL 5d13678f28cf3024c9ca1baee625e617a122f5f4a2f0696db905bb79e2deeb20c1629eff451ee1c046a35a754c1ded77364b3919f5be5969f358580b07a3cfbe
|
||||
DIST glib-2.26.1.tar.bz2 6704686 SHA256 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5 SHA512 219733b6c0b7a1a7cad1b8c51e70c7984118d7ad58892e27dbe18eb44d6be8d543eec28946170bcc6d63a38af8c1b6133432c45c5828559b62c4506e61259707 WHIRLPOOL 34624e5068337603f84f484d8ae426520f8a6aeabfe9f98cefce10276a4386e34541044943658f42435aef05b4c22c4b557836237e53ef7ae4079ce71cfa32e8
|
||||
DIST glib-2.30.0.tar.xz 5744640 SHA256 d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1 SHA512 7f30319ef66641a724b75ec61f5d3c5b23ba36a781109150cb4341deebbec112ffc849cba23d0c10f28ca744068f80f0b2cda90a3e688c104e679b6cd0cf30a1 WHIRLPOOL 45852806268c92315194e2782e43f0ae27f9205648be3b41c07c84544d54aff0829a38d9e9bc1fc4e4fd17617d48e758a0dbfa3458582b87724e140d85296fb6
|
||||
DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
|
||||
DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
|
||||
DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
|
@ -1,29 +0,0 @@
|
||||
fix errors with newer automake:
|
||||
|
||||
gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
|
||||
|
||||
Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
|
||||
Makefile.am:11: ... `BUILT_SOURCES' previously defined here
|
||||
|
||||
--- Makefile.am
|
||||
+++ Makefile.am
|
||||
@@ -70,7 +70,7 @@
|
||||
|
||||
CONFIGURE_DEPENDENCIES = acglib.m4
|
||||
|
||||
-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
|
||||
+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
|
||||
glibconfig.h: stamp-gc-h
|
||||
@:
|
||||
stamp-gc-h: config.status
|
||||
--- gmodule/Makefile.am
|
||||
+++ gmodule/Makefile.am
|
||||
@@ -41,7 +41,7 @@
|
||||
libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
|
||||
|
||||
noinst_PROGRAMS = testgmodule
|
||||
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
|
||||
+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
|
||||
testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
|
||||
|
||||
.PHONY: files release
|
@ -1,44 +0,0 @@
|
||||
The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
|
||||
option parsing, it may break.
|
||||
|
||||
http://bugs.gentoo.org/133679
|
||||
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -54,6 +54,19 @@
|
||||
infodir='${prefix}/info'
|
||||
mandir='${prefix}/man'
|
||||
|
||||
+# NLS nuisances.
|
||||
+for as_var in \
|
||||
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||||
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||||
+ LC_TELEPHONE LC_TIME
|
||||
+do
|
||||
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
||||
+ eval $as_var=C; export $as_var
|
||||
+ else
|
||||
+ unset $as_var
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
# Initialize some other variables.
|
||||
subdirs=
|
||||
MFLAGS= MAKEFLAGS=
|
||||
@@ -452,16 +463,6 @@
|
||||
esac
|
||||
done
|
||||
|
||||
-# NLS nuisances.
|
||||
-# Only set these to C if already set. These must not be set unconditionally
|
||||
-# because not all systems understand e.g. LANG=C (notably SCO).
|
||||
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
|
||||
-# Non-C LC_CTYPE values break the ctype check.
|
||||
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
|
||||
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
|
||||
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
|
||||
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
|
||||
-
|
||||
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
||||
rm -rf conftest* confdefs.h
|
||||
# AIX cpp loses on an empty file, so make sure it contains at least a newline.
|
@ -1,41 +0,0 @@
|
||||
--- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100
|
||||
+++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100
|
||||
@@ -867,7 +867,7 @@
|
||||
/* beware of positional parameters
|
||||
*/
|
||||
case '$':
|
||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||||
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
|
||||
"(): unable to handle positional parameters (%%n$)");
|
||||
len += 1024; /* try adding some safety padding */
|
||||
break;
|
||||
@@ -1034,7 +1034,7 @@
|
||||
/* n . dddddddddddddddddddddddd E +- eeee */
|
||||
conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
|
||||
if (spec.mod_extra_long)
|
||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||||
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
|
||||
"(): unable to handle long double, collecting double only");
|
||||
#ifdef HAVE_LONG_DOUBLE
|
||||
#error need to implement special handling for long double
|
||||
@@ -1077,7 +1077,7 @@
|
||||
conv_done = TRUE;
|
||||
if (spec.mod_long)
|
||||
{
|
||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||||
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
|
||||
"(): unable to handle wide char strings");
|
||||
len += 1024; /* try adding some safety padding */
|
||||
}
|
||||
@@ -1108,9 +1108,8 @@
|
||||
conv_len += format - spec_start;
|
||||
break;
|
||||
default:
|
||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||||
- "(): unable to handle `%c' while parsing format",
|
||||
- c);
|
||||
+ g_warning ("%s(): unable to handle `%c' while parsing format",
|
||||
+ G_GNUC_PRETTY_FUNCTION, c);
|
||||
break;
|
||||
}
|
||||
conv_done |= conv_len > 0;
|
@ -1,9 +0,0 @@
|
||||
Fix aclocal warning:
|
||||
/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
|
||||
--- glib-1.2.10/glib.m4
|
||||
+++ glib-1.2.10/glib.m4
|
||||
@@ -7,3 +7,3 @@
|
||||
dnl
|
||||
-AC_DEFUN(AM_PATH_GLIB,
|
||||
+AC_DEFUN([AM_PATH_GLIB],
|
||||
[dnl
|
@ -1,39 +0,0 @@
|
||||
From Debian, this one is needed for gcc < 4.1...
|
||||
|
||||
--- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
|
||||
+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
|
||||
@@ -414,14 +414,14 @@
|
||||
g_atomic_int_exchange_and_add (volatile gint *atomic,
|
||||
gint val)
|
||||
{
|
||||
- return __sync_fetch_and_add (atomic, val);
|
||||
+ return __sync_fetch_and_add_si (atomic, val);
|
||||
}
|
||||
|
||||
void
|
||||
g_atomic_int_add (volatile gint *atomic,
|
||||
gint val)
|
||||
{
|
||||
- __sync_fetch_and_add (atomic, val);
|
||||
+ __sync_fetch_and_add_si (atomic, val);
|
||||
}
|
||||
|
||||
gboolean
|
||||
@@ -429,7 +429,7 @@
|
||||
gint oldval,
|
||||
gint newval)
|
||||
{
|
||||
- return __sync_bool_compare_and_swap (atomic, oldval, newval);
|
||||
+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
|
||||
}
|
||||
|
||||
gboolean
|
||||
@@ -437,7 +437,7 @@
|
||||
gpointer oldval,
|
||||
gpointer newval)
|
||||
{
|
||||
- return __sync_bool_compare_and_swap ((long *)atomic,
|
||||
+ return __sync_bool_compare_and_swap_di ((long *)atomic,
|
||||
(long)oldval, (long)newval);
|
||||
}
|
||||
|
@ -1,21 +0,0 @@
|
||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
|
||||
--- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400
|
||||
+++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400
|
||||
@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
|
||||
static gpointer
|
||||
_g_module_self (void)
|
||||
{
|
||||
+#ifndef __FreeBSD__
|
||||
gpointer handle;
|
||||
|
||||
/* to query symbols from the program itself, special link options
|
||||
@@ -117,6 +118,9 @@ _g_module_self (void)
|
||||
g_module_set_error (fetch_dlerror (TRUE));
|
||||
|
||||
return handle;
|
||||
+#else
|
||||
+ return RTLD_DEFAULT;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void
|
@ -1,20 +0,0 @@
|
||||
Temporary workaround for gio tests failure when ran without FEATURES=userpriv
|
||||
until upstream bug #552912 is fixed
|
||||
|
||||
--- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300
|
||||
+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300
|
||||
@@ -769,11 +769,14 @@
|
||||
if (posix_compat)
|
||||
{
|
||||
/* target directory is not accessible (no execute flag) */
|
||||
+#if 0
|
||||
+/* Fails when ran as root */
|
||||
do_copy_move (root, item, TEST_DIR_NO_ACCESS,
|
||||
TEST_NO_ACCESS);
|
||||
/* target directory is readonly */
|
||||
do_copy_move (root, item, TEST_DIR_NO_WRITE,
|
||||
TEST_NO_ACCESS);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
|
||||
because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
|
||||
causes gdb to use the system-wide glib instead, and fail on the test.
|
||||
|
||||
This patch exports LD_LIBRARY_PATH before running gdb
|
||||
|
||||
https://bugzilla.gnome.org/621368
|
||||
|
||||
---
|
||||
--- tests/run-assert-msg-test.sh
|
||||
+++ tests/run-assert-msg-test.sh
|
||||
@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
|
||||
msg_test="lt-$msg_test"
|
||||
fi
|
||||
echo_v "Running gdb on assert-msg-test"
|
||||
+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
|
||||
OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
|
||||
fail "failed to run gdb"
|
||||
|
@ -1,20 +0,0 @@
|
||||
Remove python detection from configure.in, we won't be installing the gdb python
|
||||
scripts anymore. They use a redhat-specific gdb module that has not been
|
||||
upstreamed yet.
|
||||
|
||||
https://bugs.gentoo.org/291328
|
||||
https://bugzilla.gnome.org/623552
|
||||
---
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
|
||||
fi
|
||||
AC_SUBST(PERL_PATH)
|
||||
|
||||
-# Need suitable python path for greport
|
||||
-AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
|
||||
-
|
||||
-
|
||||
dnl ***********************
|
||||
dnl *** Tests for iconv ***
|
||||
dnl ***********************
|
@ -1,22 +0,0 @@
|
||||
--- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
|
||||
+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
|
||||
@@ -1448,7 +1448,7 @@
|
||||
|
||||
g_test_add_func ("/gdbus/peer-to-peer", test_peer);
|
||||
g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
|
||||
- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
|
||||
+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
|
||||
g_test_add_func ("/gdbus/credentials", test_credentials);
|
||||
g_test_add_func ("/gdbus/overflow", test_overflow);
|
||||
|
||||
--- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
|
||||
+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
|
||||
@@ -336,7 +336,7 @@
|
||||
/* all the tests rely on a shared main loop */
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
|
||||
- g_test_add_func ("/gdbus/non-socket", test_non_socket);
|
||||
+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
|
||||
|
||||
ret = g_test_run();
|
||||
|
@ -1,46 +0,0 @@
|
||||
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
|
||||
index 4a668b8..6ca7b6f 100644
|
||||
--- a/gio/gdbusprivate.c
|
||||
+++ b/gio/gdbusprivate.c
|
||||
@@ -913,7 +913,7 @@ write_message_async_cb (GObject *source_object,
|
||||
g_object_unref (simple);
|
||||
goto out;
|
||||
}
|
||||
- g_assert (bytes_written > 0); /* zero is never returned */
|
||||
+ g_assert (bytes_written >= 0);
|
||||
|
||||
write_message_print_transport_debug (bytes_written, data);
|
||||
|
||||
@@ -1009,10 +1009,10 @@ write_message_continue_writing (MessageToWriteData *data)
|
||||
if (control_message != NULL)
|
||||
g_object_unref (control_message);
|
||||
|
||||
- if (bytes_written == -1)
|
||||
+ if (bytes_written == -1 || bytes_written == 0)
|
||||
{
|
||||
- /* Handle WOULD_BLOCK by waiting until there's room in the buffer */
|
||||
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
|
||||
+ /* Handle zero bytes written or WOULD_BLOCK by waiting until there's room in the buffer */
|
||||
+ if (bytes_written == 0 || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
|
||||
{
|
||||
GSource *source;
|
||||
source = g_socket_create_source (data->worker->socket,
|
||||
@@ -1024,7 +1024,8 @@ write_message_continue_writing (MessageToWriteData *data)
|
||||
NULL); /* GDestroyNotify */
|
||||
g_source_attach (source, g_main_context_get_thread_default ());
|
||||
g_source_unref (source);
|
||||
- g_error_free (error);
|
||||
+ if (error != NULL)
|
||||
+ g_error_free (error);
|
||||
goto out;
|
||||
}
|
||||
g_simple_async_result_take_error (simple, error);
|
||||
@@ -1032,7 +1033,7 @@ write_message_continue_writing (MessageToWriteData *data)
|
||||
g_object_unref (simple);
|
||||
goto out;
|
||||
}
|
||||
- g_assert (bytes_written > 0); /* zero is never returned */
|
||||
+ g_assert (bytes_written > 0); /* -1 and 0 is handled above */
|
||||
|
||||
write_message_print_transport_debug (bytes_written, data);
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 3a02a86a0a413304843c1cfad359922322486da6 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Wed, 6 Oct 2010 23:21:01 +0200
|
||||
Subject: [PATCH 1/2] gsettings: disable locale sensitive test.
|
||||
|
||||
---
|
||||
gio/tests/gsettings.c | 8 ++++----
|
||||
1 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
|
||||
index fdadf96..4d19618 100644
|
||||
--- a/gio/tests/gsettings.c
|
||||
+++ b/gio/tests/gsettings.c
|
||||
@@ -625,14 +625,14 @@ test_l10n (void)
|
||||
g_free (str);
|
||||
str = NULL;
|
||||
|
||||
- setlocale (LC_MESSAGES, "de_DE");
|
||||
+ /*setlocale (LC_MESSAGES, "de_DE");
|
||||
str = g_settings_get_string (settings, "error-message");
|
||||
setlocale (LC_MESSAGES, locale);
|
||||
|
||||
g_assert_cmpstr (str, ==, "Unbenannt");
|
||||
g_object_unref (settings);
|
||||
g_free (str);
|
||||
- str = NULL;
|
||||
+ str = NULL;*/
|
||||
|
||||
g_free (locale);
|
||||
}
|
||||
@@ -666,14 +666,14 @@ test_l10n_context (void)
|
||||
g_free (str);
|
||||
str = NULL;
|
||||
|
||||
- setlocale (LC_MESSAGES, "de_DE");
|
||||
+ /*setlocale (LC_MESSAGES, "de_DE");
|
||||
g_settings_get (settings, "backspace", "s", &str);
|
||||
setlocale (LC_MESSAGES, locale);
|
||||
|
||||
g_assert_cmpstr (str, ==, "Löschen");
|
||||
g_object_unref (settings);
|
||||
g_free (str);
|
||||
- str = NULL;
|
||||
+ str = NULL;*/
|
||||
|
||||
g_free (locale);
|
||||
}
|
||||
--
|
||||
1.7.3
|
||||
|
@ -1,43 +0,0 @@
|
||||
From 8eb4fb83d0933d09bb6ef0ec1511a6b0eb2cee9b Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Wed, 6 Oct 2010 23:21:22 +0200
|
||||
Subject: [PATCH 2/2] volumemonitor: disable failing test
|
||||
|
||||
---
|
||||
gio/tests/volumemonitor.c | 6 +++---
|
||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c
|
||||
index 54123ec..df19b58 100644
|
||||
--- a/gio/tests/volumemonitor.c
|
||||
+++ b/gio/tests/volumemonitor.c
|
||||
@@ -112,7 +112,7 @@ test_connected_drives (void)
|
||||
g_list_free (drives);
|
||||
}
|
||||
|
||||
-static void
|
||||
+/*static void
|
||||
test_volumes (void)
|
||||
{
|
||||
GList *volumes, *l;
|
||||
@@ -131,7 +131,7 @@ test_volumes (void)
|
||||
|
||||
g_list_foreach (volumes, (GFunc)g_object_unref, NULL);
|
||||
g_list_free (volumes);
|
||||
-}
|
||||
+}*/
|
||||
|
||||
static void
|
||||
test_mounts (void)
|
||||
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
|
||||
monitor = g_volume_monitor_get ();
|
||||
|
||||
g_test_add_func ("/volumemonitor/connected_drives", test_connected_drives);
|
||||
- g_test_add_func ("/volumemonitor/volumes", test_volumes);
|
||||
+ //g_test_add_func ("/volumemonitor/volumes", test_volumes);
|
||||
g_test_add_func ("/volumemonitor/mounts", test_mounts);
|
||||
|
||||
ret = g_test_run ();
|
||||
--
|
||||
1.7.3
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 1c6fd63f60ffa24aa9ea29d2ac13bb0b2b5b9d4e Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Sun, 17 Oct 2010 03:30:30 +0000
|
||||
Subject: Prevent error pileup
|
||||
|
||||
---
|
||||
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
|
||||
index c2725b4..22681d0 100644
|
||||
--- a/gio/glib-compile-schemas.c
|
||||
+++ b/gio/glib-compile-schemas.c
|
||||
@@ -497,8 +497,7 @@ key_state_start_aliases (KeyState *state,
|
||||
g_set_error_literal (error, G_MARKUP_ERROR,
|
||||
G_MARKUP_ERROR_INVALID_CONTENT,
|
||||
"<aliases> already specified for this key");
|
||||
-
|
||||
- if (!state->is_flags && !state->is_enum && !state->has_choices)
|
||||
+ else if (!state->is_flags && !state->is_enum && !state->has_choices)
|
||||
g_set_error_literal (error, G_MARKUP_ERROR,
|
||||
G_MARKUP_ERROR_INVALID_CONTENT,
|
||||
"<aliases> can only be specified for keys with "
|
||||
@@ -1634,6 +1633,7 @@ parse_gschema_files (gchar **files,
|
||||
|
||||
/* let them know */
|
||||
fprintf (stderr, "%s: %s. ", filename, error->message);
|
||||
+ g_clear_error (&error);
|
||||
|
||||
if (strict)
|
||||
{
|
||||
--
|
||||
cgit v0.8.3.1
|
@ -1,26 +0,0 @@
|
||||
From e01a20ceb958a9a43383a2ef236524ba9f79b6d9 Mon Sep 17 00:00:00 2001
|
||||
From: Tor Lillqvist <tml@iki.fi>
|
||||
Date: Thu, 07 Oct 2010 09:04:52 +0000
|
||||
Subject: Don't call close() on -1
|
||||
|
||||
Of course, a proper implementation of close() will just ignore an
|
||||
invalid parameter silently, and set errno. But apparently the "debug"
|
||||
version of the Microsoft C library generates some noise in this
|
||||
case. So avoid that. Thanks to John Emmas for reporting.
|
||||
---
|
||||
diff --git a/tests/testglib.c b/tests/testglib.c
|
||||
index 7625928..b4e29f0 100644
|
||||
--- a/tests/testglib.c
|
||||
+++ b/tests/testglib.c
|
||||
@@ -886,7 +886,8 @@ test_file_functions (void)
|
||||
fd = g_mkstemp (template);
|
||||
if (g_test_verbose() && fd != -1)
|
||||
g_print ("g_mkstemp works even if template doesn't end in XXXXXX\n");
|
||||
- close (fd);
|
||||
+ if (fd != -1)
|
||||
+ close (fd);
|
||||
strcpy (template, "fooXXXXXX");
|
||||
fd = g_mkstemp (template);
|
||||
if (fd == -1)
|
||||
--
|
||||
cgit v0.8.3.1
|
@ -1,25 +0,0 @@
|
||||
From 2a9b14c015a05cd8dc16a2c5bce2d531c76824c8 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Thu, 30 Sep 2010 18:40:50 +0000
|
||||
Subject: message_to_write_data_free: Don't unref data->message if it is NULL
|
||||
|
||||
After the recent changes to message filtering, it can happen that
|
||||
data->message is NULL when we get here.
|
||||
(cherry picked from commit fe1186a842458dcc647c5f9ab03f17c762354e95)
|
||||
---
|
||||
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
|
||||
index 442d5e1..dd9d58a 100644
|
||||
--- a/gio/gdbusprivate.c
|
||||
+++ b/gio/gdbusprivate.c
|
||||
@@ -876,7 +876,8 @@ static void
|
||||
message_to_write_data_free (MessageToWriteData *data)
|
||||
{
|
||||
_g_dbus_worker_unref (data->worker);
|
||||
- g_object_unref (data->message);
|
||||
+ if (data->message)
|
||||
+ g_object_unref (data->message);
|
||||
g_free (data->blob);
|
||||
g_free (data);
|
||||
}
|
||||
--
|
||||
cgit v0.8.3.1
|
@ -1,28 +0,0 @@
|
||||
diff -ur glib-2.26.1.orig/gio/gdbusconnection.c glib-2.26.1/gio/gdbusconnection.c
|
||||
--- glib-2.26.1.orig/gio/gdbusconnection.c 2010-11-12 22:55:24.000000000 +0900
|
||||
+++ glib-2.26.1/gio/gdbusconnection.c 2010-12-15 15:59:31.323159007 +0900
|
||||
@@ -1449,7 +1449,8 @@
|
||||
if (out_serial != NULL)
|
||||
*out_serial = serial_to_use;
|
||||
|
||||
- g_dbus_message_set_serial (message, serial_to_use);
|
||||
+ if ((flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL) == 0)
|
||||
+ g_dbus_message_set_serial (message, serial_to_use);
|
||||
|
||||
g_dbus_message_lock (message);
|
||||
_g_dbus_worker_send_message (connection->worker,
|
||||
diff -ur glib-2.26.1.orig/gio/gdbusmethodinvocation.c glib-2.26.1/gio/gdbusmethodinvocation.c
|
||||
--- glib-2.26.1.orig/gio/gdbusmethodinvocation.c 2010-12-15 10:45:37.883158988 +0900
|
||||
+++ glib-2.26.1/gio/gdbusmethodinvocation.c 2010-12-15 11:27:15.733159008 +0900
|
||||
@@ -403,8 +403,9 @@
|
||||
error = NULL;
|
||||
if (!g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, &error))
|
||||
{
|
||||
- g_warning (_("Error sending message: %s"), error->message);
|
||||
- g_error_free (error);
|
||||
+ g_warning (_("Error sending message: %s"), error ? error->message : "(null!)");
|
||||
+ if (error)
|
||||
+ g_error_free (error);
|
||||
}
|
||||
g_object_unref (reply);
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -uNr glib-2.26.1/gio/inotify/inotify-kernel.c glib-2.26.1.mod/gio/inotify/inotify-kernel.c
|
||||
--- glib-2.26.1/gio/inotify/inotify-kernel.c 2010-08-17 03:43:54.000000000 +0900
|
||||
+++ glib-2.26.1.mod/gio/inotify/inotify-kernel.c 2010-11-29 14:55:09.031045372 +0900
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <sys/inotify.h>
|
||||
|
||||
/* Timings for pairing MOVED_TO / MOVED_FROM events */
|
||||
-#define PROCESS_EVENTS_TIME 1000 /* 1000 milliseconds (1 hz) */
|
||||
+#define PROCESS_EVENTS_TIME 1 /* 1 milliseconds (1000 hz) */
|
||||
#define DEFAULT_HOLD_UNTIL_TIME 0 /* 0 millisecond */
|
||||
#define MOVE_HOLD_UNTIL_TIME 500 /* 500 microseconds or 0.5 milliseconds */
|
||||
|
@ -1,95 +0,0 @@
|
||||
From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gmail.com>
|
||||
Date: Wed, 24 Aug 2011 21:35:59 -0400
|
||||
Subject: [PATCH] Use an external gdbus-codegen package
|
||||
|
||||
---
|
||||
configure.ac | 4 +---
|
||||
docs/reference/gio/Makefile.am | 3 +--
|
||||
gio/Makefile.am | 2 +-
|
||||
gio/tests/Makefile.am | 4 +---
|
||||
gio/tests/gdbus-object-manager-example/Makefile.am | 4 +---
|
||||
5 files changed, 5 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index dc23b8b..0bb0c4a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -365,7 +365,7 @@ fi
|
||||
AC_SUBST(PERL_PATH)
|
||||
|
||||
# Need suitable python path for greport
|
||||
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
|
||||
+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
|
||||
|
||||
|
||||
dnl ***********************
|
||||
@@ -3858,8 +3858,6 @@ gobject/tests/Makefile
|
||||
gthread/Makefile
|
||||
gthread/tests/Makefile
|
||||
gio/Makefile
|
||||
-gio/gdbus-2.0/codegen/Makefile
|
||||
-gio/gdbus-2.0/codegen/config.py
|
||||
gio/xdgmime/Makefile
|
||||
gio/inotify/Makefile
|
||||
gio/libasyncns/Makefile
|
||||
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
|
||||
index 9eb0fce..511aec9 100644
|
||||
--- a/docs/reference/gio/Makefile.am
|
||||
+++ b/docs/reference/gio/Makefile.am
|
||||
@@ -79,8 +79,7 @@ man_MANS = \
|
||||
gio-querymodules.1 \
|
||||
glib-compile-schemas.1 \
|
||||
gsettings.1 \
|
||||
- gdbus.1 \
|
||||
- gdbus-codegen.1
|
||||
+ gdbus.1
|
||||
|
||||
if ENABLE_MAN
|
||||
|
||||
diff --git a/gio/Makefile.am b/gio/Makefile.am
|
||||
index 7803bb2..d4a08e5 100644
|
||||
--- a/gio/Makefile.am
|
||||
+++ b/gio/Makefile.am
|
||||
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
|
||||
|
||||
NULL =
|
||||
|
||||
-SUBDIRS = gdbus-2.0/codegen
|
||||
+SUBDIRS =
|
||||
|
||||
if OS_UNIX
|
||||
SUBDIRS += libasyncns xdgmime
|
||||
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
|
||||
index a85ea4f..8fbe8ec 100644
|
||||
--- a/gio/tests/Makefile.am
|
||||
+++ b/gio/tests/Makefile.am
|
||||
@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
|
||||
|
||||
if OS_UNIX
|
||||
gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
|
||||
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
|
||||
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
|
||||
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
|
||||
+ $(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 5e6eb9a..8b16926 100644
|
||||
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
@@ -22,9 +22,7 @@ GDBUS_GENERATED = \
|
||||
$(NULL)
|
||||
|
||||
$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
|
||||
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
|
||||
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
|
||||
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
|
||||
+ $(AM_V_GEN) gdbus-codegen \
|
||||
--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
|
||||
--c-namespace Example \
|
||||
--c-generate-object-manager \
|
||||
--
|
||||
1.7.6.1
|
||||
|
@ -1,19 +0,0 @@
|
||||
diff -rupN glib-2.30.0/glib/glib-unix.h glib-2.30.0.patched/glib/glib-unix.h
|
||||
--- glib-2.30.0/glib/glib-unix.h 2011-09-14 17:10:44.000000000 -0700
|
||||
+++ glib-2.30.0_patched/glib/glib-unix.h 2011-11-10 17:08:02.621275643 -0800
|
||||
@@ -38,6 +38,8 @@
|
||||
#error "This header may only be used on UNIX"
|
||||
#endif
|
||||
|
||||
+G_BEGIN_DECLS
|
||||
+
|
||||
/**
|
||||
* G_UNIX_ERROR:
|
||||
*
|
||||
@@ -77,4 +79,6 @@ guint g_unix_signal_add (gint
|
||||
GSourceFunc handler,
|
||||
gpointer user_data);
|
||||
|
||||
+G_END_DECLS
|
||||
+
|
||||
#endif
|
@ -1,12 +0,0 @@
|
||||
diff -rupN glib-2.30.0/configure.ac glib-2.30.0.patched/configure.ac
|
||||
--- glib-2.30.0/configure.ac 2011-09-27 17:03:02.456785498 -0700
|
||||
+++ glib-2.30.0.patched/configure.ac 2011-09-27 16:58:29.346782462 -0700
|
||||
@@ -584,7 +584,7 @@ AC_CHECK_FUNCS(atexit on_exit timegm gmt
|
||||
dnl don't use AC_CHECK_FUNCS here, otherwise HAVE_QSORT_R will
|
||||
dnl be automatically defined, which we don't want to do
|
||||
dnl until we have checked this function is actually usable
|
||||
-AC_CHECK_FUNC([qsort_r])
|
||||
+# AC_CHECK_FUNC([qsort_r])
|
||||
|
||||
# BSD has a qsort_r with wrong argument order
|
||||
if test x$ac_cv_func_qsort_r = xyes ; then
|
@ -1,99 +0,0 @@
|
||||
From 732f04b55f59b8107a7fbe317317edb5f184ea8f Mon Sep 17 00:00:00 2001
|
||||
From: Priit Laes <plaes@plaes.org>
|
||||
Date: Fri, 3 Feb 2012 09:08:28 +0200
|
||||
Subject: [PATCH] Split out gdbus codegen
|
||||
|
||||
---
|
||||
configure.ac | 4 +---
|
||||
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, 7 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4cf04a1..0bb18c8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -356,7 +356,7 @@ fi
|
||||
AC_SUBST(PERL_PATH)
|
||||
|
||||
# Need suitable python path for greport
|
||||
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
|
||||
+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
|
||||
|
||||
|
||||
dnl ***********************
|
||||
@@ -3525,8 +3525,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/xdgmime/Makefile
|
||||
gio/inotify/Makefile
|
||||
gio/fen/Makefile
|
||||
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
|
||||
index 535aa26..5027dd5 100644
|
||||
--- a/docs/reference/gio/Makefile.am
|
||||
+++ b/docs/reference/gio/Makefile.am
|
||||
@@ -144,8 +144,7 @@ man_MANS = \
|
||||
glib-compile-resources.1 \
|
||||
gsettings.1 \
|
||||
gresource.1 \
|
||||
- gdbus.1 \
|
||||
- gdbus-codegen.1
|
||||
+ gdbus.1
|
||||
|
||||
if ENABLE_MAN
|
||||
|
||||
diff --git a/gio/Makefile.am b/gio/Makefile.am
|
||||
index 67eeae6..277931b 100644
|
||||
--- a/gio/Makefile.am
|
||||
+++ b/gio/Makefile.am
|
||||
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
|
||||
|
||||
NULL =
|
||||
|
||||
-SUBDIRS = gdbus-2.0/codegen
|
||||
+SUBDIRS =
|
||||
|
||||
if OS_UNIX
|
||||
SUBDIRS += xdgmime
|
||||
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
|
||||
index e987fd1..66af8cf 100644
|
||||
--- a/gio/tests/Makefile.am
|
||||
+++ b/gio/tests/Makefile.am
|
||||
@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
|
||||
gdbus_close_pending_LDADD = $(progs_ldadd)
|
||||
|
||||
if OS_UNIX
|
||||
-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 9861d0e..9ca6eb9 100644
|
||||
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
|
||||
@@ -21,10 +21,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.7.8.4
|
||||
|
@ -1,247 +0,0 @@
|
||||
From 4c2928a54482913cf236bff0e66650a8f47e17ea Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Wed, 22 Aug 2012 18:26:11 +0000
|
||||
Subject: CVE-2012-3524: Hardening for being run in a setuid environment
|
||||
|
||||
Some programs attempt to use libglib (or even libgio) when setuid.
|
||||
For a long time, GTK+ simply aborted if launched in this
|
||||
configuration, but we never had a real policy for GLib.
|
||||
|
||||
I'm not sure whether we should advertise such support. However, given
|
||||
that there are real-world programs that do this currently, we can make
|
||||
them safer with not too much effort.
|
||||
|
||||
Better to fix a problem caused by an interaction between two
|
||||
components in *both* places if possible.
|
||||
|
||||
This patch adds a private function g_check_setuid() which is used to
|
||||
first ensure we don't run an external dbus-launch binary if
|
||||
DBUS_SESSION_BUS_ADDRESS isn't set.
|
||||
|
||||
Second, we also ensure the local VFS is used in this case. The
|
||||
gdaemonvfs extension point will end up talking to the session bus
|
||||
which is typically undesirable in a setuid context.
|
||||
|
||||
Implementing g_check_setuid() is interesting - whether or not we're
|
||||
running in a privilege-escalated path is operating system specific.
|
||||
Note that GTK+'s code to check euid versus uid worked historically on
|
||||
Unix, more modern systems have filesystem capabilities and SELinux
|
||||
domain transitions, neither of which are captured by the uid
|
||||
comparison.
|
||||
|
||||
On Linux/glibc, the way this works is that the kernel sets an
|
||||
AT_SECURE flag in the ELF auxiliary vector, and glibc looks for it on
|
||||
startup. If found, then glibc sets a public-but-undocumented
|
||||
__libc_enable_secure variable which we can use. Unfortunately, while
|
||||
it *previously* worked to check this variable, a combination of newer
|
||||
binutils and RPM break it:
|
||||
http://www.openwall.com/lists/owl-dev/2012/08/14/1
|
||||
|
||||
So for now on Linux/glibc, we fall back to the historical Unix version
|
||||
until we get glibc fixed.
|
||||
|
||||
On some BSD variants, there is a issetugid() function. On other Unix
|
||||
variants, we fall back to what GTK+ has been doing.
|
||||
|
||||
Reported-By: Sebastian Krahmer <krahmer@suse.de>
|
||||
Signed-off-by: Colin Walters <walters@verbum.org>
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 584df1d..67ea1a9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -583,9 +583,20 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
|
||||
# Checks for library functions.
|
||||
AC_FUNC_VPRINTF
|
||||
AC_FUNC_ALLOCA
|
||||
-AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
|
||||
+AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2 issetugid)
|
||||
AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
|
||||
|
||||
+AC_CACHE_CHECK([for __libc_enable_secure], glib_cv_have_libc_enable_secure,
|
||||
+ [AC_TRY_LINK([#include <unistd.h>
|
||||
+ extern int __libc_enable_secure;],
|
||||
+ [return __libc_enable_secure;],
|
||||
+ glib_cv_have_libc_enable_secure=yes,
|
||||
+ glib_cv_have_libc_enable_secure=no)])
|
||||
+AS_IF([test x$glib_cv_have_libc_enable_secure = xyes], [
|
||||
+ AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1,
|
||||
+ [Define if you have the __libc_enable_secure variable (GNU libc, eglibc)])
|
||||
+])
|
||||
+
|
||||
AC_CHECK_SIZEOF(char)
|
||||
AC_CHECK_SIZEOF(short)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
@@ -984,7 +995,7 @@ AC_MSG_RESULT(unsigned $glib_size_type)
|
||||
|
||||
# Check for some functions
|
||||
AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk memmem)
|
||||
-AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid)
|
||||
+AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid)
|
||||
AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat)
|
||||
# Check for high-resolution sleep functions
|
||||
AC_CHECK_FUNCS(splice)
|
||||
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
|
||||
index 4aa13b9..96b6343 100644
|
||||
--- a/gio/gdbusaddress.c
|
||||
+++ b/gio/gdbusaddress.c
|
||||
@@ -37,6 +37,7 @@
|
||||
#include "giostream.h"
|
||||
#include "gasyncresult.h"
|
||||
#include "gsimpleasyncresult.h"
|
||||
+#include "glib-private.h"
|
||||
#include "gdbusprivate.h"
|
||||
#include "giomodule-priv.h"
|
||||
#include "gdbusdaemon.h"
|
||||
@@ -1023,6 +1024,14 @@ get_session_address_dbus_launch (GError **error)
|
||||
restore_dbus_verbose = FALSE;
|
||||
old_dbus_verbose = NULL;
|
||||
|
||||
+ /* Don't run binaries as root if we're setuid. */
|
||||
+ if (GLIB_PRIVATE_CALL (g_check_setuid) ())
|
||||
+ {
|
||||
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||
+ _("Cannot spawn a message bus when setuid"));
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
machine_id = _g_dbus_get_machine_id (error);
|
||||
if (machine_id == NULL)
|
||||
{
|
||||
diff --git a/gio/gvfs.c b/gio/gvfs.c
|
||||
index dda8afb..9afbcec 100644
|
||||
--- a/gio/gvfs.c
|
||||
+++ b/gio/gvfs.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "config.h"
|
||||
#include <string.h>
|
||||
#include "gvfs.h"
|
||||
+#include "glib-private.h"
|
||||
#include "glocalvfs.h"
|
||||
#include "gresourcefile.h"
|
||||
#include "giomodule-priv.h"
|
||||
@@ -191,6 +192,8 @@ g_vfs_parse_name (GVfs *vfs,
|
||||
GVfs *
|
||||
g_vfs_get_default (void)
|
||||
{
|
||||
+ if (GLIB_PRIVATE_CALL (g_check_setuid) ())
|
||||
+ return g_vfs_get_local ();
|
||||
return _g_io_module_get_default (G_VFS_EXTENSION_POINT_NAME,
|
||||
"GIO_USE_VFS",
|
||||
(GIOModuleVerifyFunc)g_vfs_is_active);
|
||||
diff --git a/glib/genviron.c b/glib/genviron.c
|
||||
index 59a8bbe..9525cf0 100644
|
||||
--- a/glib/genviron.c
|
||||
+++ b/glib/genviron.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
+#include "glib-private.h"
|
||||
#include "gmem.h"
|
||||
#include "gmessages.h"
|
||||
#include "gstrfuncs.h"
|
||||
diff --git a/glib/glib-private.c b/glib/glib-private.c
|
||||
index 3946e77..3506782 100644
|
||||
--- a/glib/glib-private.c
|
||||
+++ b/glib/glib-private.c
|
||||
@@ -38,7 +38,9 @@ glib__private__ (void)
|
||||
g_wakeup_signal,
|
||||
g_wakeup_acknowledge,
|
||||
|
||||
- g_get_worker_context
|
||||
+ g_get_worker_context,
|
||||
+
|
||||
+ g_check_setuid
|
||||
};
|
||||
|
||||
return &table;
|
||||
diff --git a/glib/glib-private.h b/glib/glib-private.h
|
||||
index fde0be8..87da6f3 100644
|
||||
--- a/glib/glib-private.h
|
||||
+++ b/glib/glib-private.h
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
G_GNUC_INTERNAL
|
||||
GMainContext * g_get_worker_context (void);
|
||||
+G_GNUC_INTERNAL
|
||||
+gboolean g_check_setuid (void);
|
||||
|
||||
#define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol)
|
||||
|
||||
@@ -40,6 +42,8 @@ typedef struct {
|
||||
/* See gmain.c */
|
||||
GMainContext * (* g_get_worker_context) (void);
|
||||
/* Add other private functions here, initialize them in glib-private.c */
|
||||
+
|
||||
+ gboolean (* g_check_setuid) (void);
|
||||
} GLibPrivateVTable;
|
||||
|
||||
GLibPrivateVTable *glib__private__ (void);
|
||||
diff --git a/glib/gutils.c b/glib/gutils.c
|
||||
index 38b5e44..f8a38d1 100644
|
||||
--- a/glib/gutils.c
|
||||
+++ b/glib/gutils.c
|
||||
@@ -2409,3 +2409,60 @@ g_get_tmp_dir (void)
|
||||
}
|
||||
|
||||
#endif
|
||||
+
|
||||
+/* Private API:
|
||||
+ *
|
||||
+ * Returns %TRUE if the current process was executed as setuid (or an
|
||||
+ * equivalent __libc_enable_secure is available). See:
|
||||
+ * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html
|
||||
+ */
|
||||
+gboolean
|
||||
+g_check_setuid (void)
|
||||
+{
|
||||
+ /* TODO: get __libc_enable_secure exported from glibc.
|
||||
+ * See http://www.openwall.com/lists/owl-dev/2012/08/14/1
|
||||
+ */
|
||||
+#if 0 && defined(HAVE_LIBC_ENABLE_SECURE)
|
||||
+ {
|
||||
+ /* See glibc/include/unistd.h */
|
||||
+ extern int __libc_enable_secure;
|
||||
+ return __libc_enable_secure;
|
||||
+ }
|
||||
+#elif defined(HAVE_ISSETUGID)
|
||||
+ /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */
|
||||
+ return issetugid ();
|
||||
+#elif defined(G_OS_UNIX)
|
||||
+ uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
|
||||
+ gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */
|
||||
+
|
||||
+ static gsize check_setuid_initialised;
|
||||
+ static gboolean is_setuid;
|
||||
+
|
||||
+ if (g_once_init_enter (&check_setuid_initialised))
|
||||
+ {
|
||||
+#ifdef HAVE_GETRESUID
|
||||
+ /* These aren't in the header files, so we prototype them here.
|
||||
+ */
|
||||
+ int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
|
||||
+ int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
|
||||
+
|
||||
+ if (getresuid (&ruid, &euid, &suid) != 0 ||
|
||||
+ getresgid (&rgid, &egid, &sgid) != 0)
|
||||
+#endif /* HAVE_GETRESUID */
|
||||
+ {
|
||||
+ suid = ruid = getuid ();
|
||||
+ sgid = rgid = getgid ();
|
||||
+ euid = geteuid ();
|
||||
+ egid = getegid ();
|
||||
+ }
|
||||
+
|
||||
+ is_setuid = (ruid != euid || ruid != suid ||
|
||||
+ rgid != egid || rgid != sgid);
|
||||
+
|
||||
+ g_once_init_leave (&check_setuid_initialised, 1);
|
||||
+ }
|
||||
+ return is_setuid;
|
||||
+#else
|
||||
+ return FALSE;
|
||||
+#endif
|
||||
+}
|
||||
--
|
||||
cgit v0.9.0.2
|
@ -1,27 +0,0 @@
|
||||
From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Sun, 15 Jul 2012 22:30:07 -0400
|
||||
Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp
|
||||
|
||||
In Gentoo, we use /usr/share/bash-completion, not
|
||||
/usr/share/bash-completion/completions.
|
||||
---
|
||||
gio/Makefile.am | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/gio/Makefile.am b/gio/Makefile.am
|
||||
index 704367c..bee9dc6 100644
|
||||
--- a/gio/Makefile.am
|
||||
+++ b/gio/Makefile.am
|
||||
@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la
|
||||
|
||||
-completiondir = $(datadir)/bash-completion/completions
|
||||
+completiondir = $(datadir)/bash-completion
|
||||
completion_DATA = \
|
||||
completion/gdbus \
|
||||
completion/gsettings \
|
||||
--
|
||||
1.7.8.6
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000
|
||||
+++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000
|
||||
@@ -50,7 +50,7 @@
|
||||
CATOBJEXT = @CATOBJEXT@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
-CFLAGS = @CFLAGS@
|
||||
+CFLAGS = @CFLAGS@ -fno-stack-protector
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
|
@ -1,26 +0,0 @@
|
||||
This patch decreases the inteval time between calls to ik_process_eq_callback()
|
||||
from 1 second to 1 millisecond, as 1 second is too long for interactive
|
||||
programs to get notified about file changes.
|
||||
|
||||
The performance impact of the patch should be negligible:
|
||||
|
||||
1. The code is used only when GFileMonotor is in use.
|
||||
2. ik_process_eq_callback(), which is called from the glib main loop
|
||||
periodically to process inotify events, is deleted from the main loop,
|
||||
once the last event is processed.
|
||||
|
||||
See crosbug.com/6375 and https://bugzilla.gnome.org/show_bug.cgi?id=627285
|
||||
for details.
|
||||
|
||||
diff -ur glib-2.22.4.orig/gio/inotify/inotify-kernel.c glib-2.22.4/gio/inotify/inotify-kernel.c
|
||||
--- glib-2.22.4.orig/gio/inotify/inotify-kernel.c 2009-09-24 23:25:53.000000000 +0900
|
||||
+++ glib-2.22.4/gio/inotify/inotify-kernel.c 2010-09-07 15:55:48.893073025 +0900
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <sys/inotify.h>
|
||||
|
||||
/* Timings for pairing MOVED_TO / MOVED_FROM events */
|
||||
-#define PROCESS_EVENTS_TIME 1000 /* milliseconds (1 hz) */
|
||||
+#define PROCESS_EVENTS_TIME 1 /* milliseconds (1000 hz) */
|
||||
#define DEFAULT_HOLD_UNTIL_TIME 0 /* 0 millisecond */
|
||||
#define MOVE_HOLD_UNTIL_TIME 0 /* 0 milliseconds */
|
||||
|
@ -1,62 +0,0 @@
|
||||
--- glib/gbase64.c.orig 2008-12-04 12:07:21.000000000 +0100
|
||||
+++ glib/gbase64.c 2009-01-12 14:08:31.000000000 +0100
|
||||
@@ -54,8 +54,9 @@ static const char base64_alphabet[] =
|
||||
*
|
||||
* The output buffer must be large enough to fit all the data that will
|
||||
* be written to it. Due to the way base64 encodes you will need
|
||||
- * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will
|
||||
- * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes.
|
||||
+ * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of
|
||||
+ * non-zero state). If you enable line-breaking you will need at least:
|
||||
+ * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space.
|
||||
*
|
||||
* @break_lines is typically used when putting base64-encoded data in emails.
|
||||
* It breaks the lines at 72 columns instead of putting all of the text on
|
||||
@@ -233,8 +234,14 @@ g_base64_encode (const guchar *data,
|
||||
g_return_val_if_fail (data != NULL, NULL);
|
||||
g_return_val_if_fail (len > 0, NULL);
|
||||
|
||||
- /* We can use a smaller limit here, since we know the saved state is 0 */
|
||||
- out = g_malloc (len * 4 / 3 + 4);
|
||||
+ /* We can use a smaller limit here, since we know the saved state is 0,
|
||||
+ +1 is needed for trailing \0, also check for unlikely integer overflow */
|
||||
+ if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3)
|
||||
+ g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)",
|
||||
+ G_STRLOC, len);
|
||||
+
|
||||
+ out = g_malloc ((len / 3 + 1) * 4 + 1);
|
||||
+
|
||||
outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save);
|
||||
outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save);
|
||||
out[outlen] = '\0';
|
||||
@@ -275,7 +282,8 @@ static const unsigned char mime_base64_r
|
||||
*
|
||||
* The output buffer must be large enough to fit all the data that will
|
||||
* be written to it. Since base64 encodes 3 bytes in 4 chars you need
|
||||
- * at least: @len * 3 / 4 bytes.
|
||||
+ * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero
|
||||
+ * state).
|
||||
*
|
||||
* Return value: The number of bytes of output that was written
|
||||
*
|
||||
@@ -358,7 +366,8 @@ g_base64_decode (const gchar *text,
|
||||
gsize *out_len)
|
||||
{
|
||||
guchar *ret;
|
||||
- gint input_length, state = 0;
|
||||
+ gsize input_length;
|
||||
+ gint state = 0;
|
||||
guint save = 0;
|
||||
|
||||
g_return_val_if_fail (text != NULL, NULL);
|
||||
@@ -368,7 +377,9 @@ g_base64_decode (const gchar *text,
|
||||
|
||||
g_return_val_if_fail (input_length > 1, NULL);
|
||||
|
||||
- ret = g_malloc0 (input_length * 3 / 4);
|
||||
+ /* We can use a smaller limit here, since we know the saved state is 0,
|
||||
+ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */
|
||||
+ ret = g_malloc0 ((input_length / 4) * 3 + 1);
|
||||
|
||||
*out_len = g_base64_decode_step (text, input_length, ret, &state, &save);
|
||||
|
@ -1,103 +0,0 @@
|
||||
Patch for bug 286102 from upstream git. It includes the following 5 commits:
|
||||
|
||||
commit 3826963e65d8c4c68bcd3e4066505f63ef734b95
|
||||
Author: Benjamin Otte <otte@gnome.org>
|
||||
Date: Tue Sep 1 21:53:35 2009 +0200
|
||||
|
||||
commit 48e0af0157f52ac12b904bd92540432a18b139c7
|
||||
Author: Benjamin Otte <otte@gnome.org>
|
||||
Date: Tue Sep 1 21:26:08 2009 +0200
|
||||
|
||||
commit bb7852e34b1845e516290e1b45a960a345ee8a43
|
||||
Author: Benjamin Otte <otte@gnome.org>
|
||||
Date: Tue Sep 1 20:36:31 2009 +0200
|
||||
|
||||
commit fc44bf40a4eff8e122b223e97ee5efcbc548be03
|
||||
Author: Benjamin Otte <otte@gnome.org>
|
||||
Date: Tue Sep 1 12:48:55 2009 +0200
|
||||
|
||||
commit e695c0932f5d02f3b222f0b7a3de1f8c00ba7b81
|
||||
Author: Benjamin Otte <otte@gnome.org>
|
||||
Date: Tue Sep 1 11:54:48 2009 +0200
|
||||
|
||||
Patch generated by a3li@gentoo.org,
|
||||
CVE available for 2.20.5 only (see timeline).
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 7bda924..e2a33b5 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -952,7 +952,7 @@ AC_MSG_RESULT(unsigned $glib_size_type)
|
||||
|
||||
# Check for some functions
|
||||
AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk)
|
||||
-AC_CHECK_FUNCS(chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
|
||||
+AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
|
||||
AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo)
|
||||
# Check for high-resolution sleep functions
|
||||
AC_CHECK_FUNCS(nanosleep nsleep)
|
||||
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
|
||||
index 72a59b5..a61cc55 100644
|
||||
--- a/gio/glocalfileinfo.c
|
||||
+++ b/gio/glocalfileinfo.c
|
||||
@@ -1869,15 +1869,40 @@ get_string (const GFileAttributeValue *value,
|
||||
|
||||
static gboolean
|
||||
set_unix_mode (char *filename,
|
||||
+ GFileQueryInfoFlags flags,
|
||||
const GFileAttributeValue *value,
|
||||
GError **error)
|
||||
{
|
||||
guint32 val;
|
||||
+ int res = 0;
|
||||
|
||||
if (!get_uint32 (value, &val, error))
|
||||
return FALSE;
|
||||
-
|
||||
- if (g_chmod (filename, val) == -1)
|
||||
+
|
||||
+#ifdef HAVE_SYMLINK
|
||||
+ if (flags & G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS) {
|
||||
+#ifdef HAVE_LCHMOD
|
||||
+ res = lchmod (filename, val);
|
||||
+#else
|
||||
+ struct stat statbuf;
|
||||
+ /* Calling chmod on a symlink changes permissions on the symlink.
|
||||
+ * We don't want to do this, so we need to check for a symlink */
|
||||
+ res = g_lstat (filename, &statbuf);
|
||||
+ if (res == 0 && S_ISLNK (statbuf.st_mode))
|
||||
+ {
|
||||
+ g_set_error_literal (error, G_IO_ERROR,
|
||||
+ G_IO_ERROR_NOT_SUPPORTED,
|
||||
+ _("Cannot set permissions on symlinks"));
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ else if (res == 0)
|
||||
+ res = g_chmod (filename, val);
|
||||
+#endif
|
||||
+ } else
|
||||
+#endif
|
||||
+ res = g_chmod (filename, val);
|
||||
+
|
||||
+ if (res == -1)
|
||||
{
|
||||
int errsv = errno;
|
||||
|
||||
@@ -2172,7 +2197,7 @@ _g_local_file_info_set_attribute (char *filename,
|
||||
_g_file_attribute_value_set_from_pointer (&value, type, value_p, FALSE);
|
||||
|
||||
if (strcmp (attribute, G_FILE_ATTRIBUTE_UNIX_MODE) == 0)
|
||||
- return set_unix_mode (filename, &value, error);
|
||||
+ return set_unix_mode (filename, flags, &value, error);
|
||||
|
||||
#ifdef HAVE_CHOWN
|
||||
else if (strcmp (attribute, G_FILE_ATTRIBUTE_UNIX_UID) == 0)
|
||||
@@ -2316,7 +2341,7 @@ _g_local_file_info_set_attributes (char *filename,
|
||||
value = _g_file_info_get_attribute_value (info, G_FILE_ATTRIBUTE_UNIX_MODE);
|
||||
if (value)
|
||||
{
|
||||
- if (!set_unix_mode (filename, value, error))
|
||||
+ if (!set_unix_mode (filename, flags, value, error))
|
||||
{
|
||||
value->status = G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING;
|
||||
res = FALSE;
|
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.53 2008/08/03 22:36:31 eva Exp $
|
||||
|
||||
inherit autotools libtool flag-o-matic eutils portability
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
|
||||
ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
|
||||
mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="1"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="hardened"
|
||||
|
||||
DEPEND=""
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
epatch "${FILESDIR}"/${P}-automake.patch
|
||||
epatch "${FILESDIR}"/${P}-m4.patch
|
||||
epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
|
||||
|
||||
# Allow glib to build with gcc-3.4.x #47047
|
||||
epatch "${FILESDIR}"/${P}-gcc34-fix.patch
|
||||
|
||||
# Fix for -Wl,--as-needed (bug #133818)
|
||||
epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
|
||||
|
||||
use ppc64 && use hardened && replace-flags -O[2-3] -O1
|
||||
append-ldflags $(dlopen_lib)
|
||||
|
||||
rm -f acinclude.m4 #168198
|
||||
eautoreconf
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Bug 48839: pam fails to build on ia64
|
||||
# The problem is that it attempts to link a shared object against
|
||||
# libglib.a; this library needs to be built with -fPIC. Since
|
||||
# this package doesn't contain any significant binaries, build the
|
||||
# whole thing with -fPIC (23 Apr 2004 agriffis)
|
||||
append-flags -fPIC
|
||||
|
||||
econf \
|
||||
--with-threads=posix \
|
||||
--enable-debug=yes \
|
||||
|| die
|
||||
emake || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make install DESTDIR="${D}" || die
|
||||
|
||||
dodoc AUTHORS ChangeLog README* INSTALL NEWS
|
||||
dohtml -r docs
|
||||
|
||||
cd "${D}"/usr/$(get_libdir) || die
|
||||
chmod 755 libgmodule-1.2.so.*
|
||||
}
|
@ -1,96 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.5-r1.ebuild,v 1.10 2009/11/17 15:41:51 ranger Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit gnome.org eutils flag-o-matic autotools
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="debug doc fam hardened selinux xattr"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/pkgconfig-0.16
|
||||
>=sys-devel/gettext-0.11
|
||||
dev-util/gtk-doc-am
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gtk-doc-1.11
|
||||
~app-text/docbook-xml-dtd-4.1.2 )"
|
||||
|
||||
src_prepare() {
|
||||
if use ppc64 && use hardened ; then
|
||||
replace-flags -O[2-3] -O1
|
||||
epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
|
||||
fi
|
||||
|
||||
if use ia64 ; then
|
||||
# Only apply for < 4.1
|
||||
local major=$(gcc-major-version)
|
||||
local minor=$(gcc-minor-version)
|
||||
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
|
||||
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Don't fail gio tests when ran without userpriv, upstream bug 552912
|
||||
# This is only a temporary workaround, remove as soon as possible
|
||||
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
# Fix bug 286102, symlink permission error (CVE-2009-3289)
|
||||
epatch "${FILESDIR}"/${PN}2-CVE-2009-3289.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
epunt_cxx
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Always build static libs, see #153807
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
--enable-static \
|
||||
--enable-regex \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Installation failed"
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${D}/usr/lib/charset.alias"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
emake check || die "tests failed"
|
||||
}
|
@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.2.ebuild,v 1.4 2010/01/19 17:17:43 armin76 Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit gnome.org libtool eutils flag-o-matic
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="debug doc fam hardened selinux xattr"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/pkgconfig-0.16
|
||||
>=sys-devel/gettext-0.11
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gtk-doc-1.11
|
||||
~app-text/docbook-xml-dtd-4.1.2 )"
|
||||
|
||||
src_prepare() {
|
||||
if use ppc64 && use hardened ; then
|
||||
replace-flags -O[2-3] -O1
|
||||
epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
|
||||
fi
|
||||
|
||||
if use ia64 ; then
|
||||
# Only apply for < 4.1
|
||||
local major=$(gcc-major-version)
|
||||
local minor=$(gcc-minor-version)
|
||||
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
|
||||
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Don't fail gio tests when ran without userpriv, upstream bug 552912
|
||||
# This is only a temporary workaround, remove as soon as possible
|
||||
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
epunt_cxx
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Always build static libs, see #153807
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
--enable-static \
|
||||
--enable-regex \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Installation failed"
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${D}/usr/lib/charset.alias"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export XDG_DATA_HOME="${T}"
|
||||
emake check || die "tests failed"
|
||||
}
|
@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.3.ebuild,v 1.1 2009/12/18 13:35:16 mrpouet Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit gnome.org libtool eutils flag-o-matic
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="debug doc fam hardened selinux xattr"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/pkgconfig-0.16
|
||||
>=sys-devel/gettext-0.11
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gtk-doc-1.11
|
||||
~app-text/docbook-xml-dtd-4.1.2 )"
|
||||
|
||||
src_prepare() {
|
||||
if use ppc64 && use hardened ; then
|
||||
replace-flags -O[2-3] -O1
|
||||
epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
|
||||
fi
|
||||
|
||||
if use ia64 ; then
|
||||
# Only apply for < 4.1
|
||||
local major=$(gcc-major-version)
|
||||
local minor=$(gcc-minor-version)
|
||||
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
|
||||
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Don't fail gio tests when ran without userpriv, upstream bug 552912
|
||||
# This is only a temporary workaround, remove as soon as possible
|
||||
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
epunt_cxx
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Always build static libs, see #153807
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
--enable-static \
|
||||
--enable-regex \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Installation failed"
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${D}/usr/lib/charset.alias"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export XDG_DATA_HOME="${T}"
|
||||
emake check || die "tests failed"
|
||||
}
|
@ -1,101 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.4.ebuild,v 1.3 2010/03/06 16:14:28 phajdan.jr Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit gnome.org libtool eutils flag-o-matic
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="debug doc fam hardened selinux xattr"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/pkgconfig-0.16
|
||||
>=sys-devel/gettext-0.11
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gtk-doc-1.11
|
||||
~app-text/docbook-xml-dtd-4.1.2 )"
|
||||
|
||||
src_prepare() {
|
||||
# GFileMonitor has a bug that causes the notification delivery to
|
||||
# delay for a second. See comments in the patch for details.
|
||||
epatch "${FILESDIR}/${PN}-inotify.patch"
|
||||
|
||||
if use ppc64 && use hardened ; then
|
||||
replace-flags -O[2-3] -O1
|
||||
epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
|
||||
fi
|
||||
|
||||
if use ia64 ; then
|
||||
# Only apply for < 4.1
|
||||
local major=$(gcc-major-version)
|
||||
local minor=$(gcc-minor-version)
|
||||
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
|
||||
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Don't fail gio tests when ran without userpriv, upstream bug 552912
|
||||
# This is only a temporary workaround, remove as soon as possible
|
||||
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
# Do not try to remove files on live filesystem, bug #XXX ?
|
||||
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
|
||||
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
|
||||
|
||||
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
epunt_cxx
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Always build static libs, see #153807
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
--enable-static \
|
||||
--enable-regex \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Installation failed"
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${D}/usr/lib/charset.alias"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export XDG_DATA_HOME="${T}"
|
||||
emake check || die "tests failed"
|
||||
}
|
@ -1,147 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.0-r1.ebuild,v 1.1 2010/10/17 15:12:35 pacho Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit autotools gnome.org libtool eutils flag-o-matic pax-utils
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="debug doc fam selinux +static-libs test xattr"
|
||||
SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
sys-libs/zlib
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/pkgconfig-0.16
|
||||
>=sys-devel/gettext-0.11
|
||||
>=dev-util/gtk-doc-am-1.13
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gtk-doc-1.13
|
||||
~app-text/docbook-xml-dtd-4.1.2 )
|
||||
test? ( >=sys-apps/dbus-1.2.14 )"
|
||||
|
||||
# We don't use gobject-introspection.
|
||||
# PDEPEND="introspection? ( dev-libs/gobject-introspection )"
|
||||
|
||||
# eautoreconf needs gtk-doc-am
|
||||
# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
|
||||
|
||||
src_prepare() {
|
||||
if use ia64 ; then
|
||||
# Only apply for < 4.1
|
||||
local major=$(gcc-major-version)
|
||||
local minor=$(gcc-minor-version)
|
||||
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
|
||||
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Don't fail gio tests when ran without userpriv, upstream bug 552912
|
||||
# This is only a temporary workaround, remove as soon as possible
|
||||
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
# Don't check for python, hence removing the build-time python dep.
|
||||
# We remove the gdb python scripts in src_install due to bug 291328
|
||||
epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
|
||||
|
||||
# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
|
||||
epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
|
||||
|
||||
# skip tests that require writing to /root/.dbus, upstream bug ???
|
||||
epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
|
||||
|
||||
# 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 failing tests, upstream bug #???
|
||||
epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch"
|
||||
epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch"
|
||||
|
||||
# GFileMonitor has a bug that causes the notification delivery to
|
||||
# delay for a second. See comments in the patch for details.
|
||||
epatch "${FILESDIR}/${PN}-2.26.1-inotify.patch"
|
||||
|
||||
# Remove false warning and fix possible NULL pointer deref.
|
||||
epatch "${FILESDIR}/${PN}-2.26.1-gdbus-remove-false-warnings.patch"
|
||||
|
||||
# Fix crosbug.com/15242
|
||||
epatch "${FILESDIR}/${PN}-2.26-gdbus-bad-assertion.patch"
|
||||
|
||||
# Needed for the punt-python-check patch.
|
||||
# Also needed to prevent croscompile failures, see bug #267603
|
||||
eautoreconf
|
||||
|
||||
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
|
||||
epunt_cxx
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
# disable-visibility needed for reference debug, bug #274647
|
||||
use debug && myconf="--enable-debug --disable-visibility"
|
||||
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
$(use_enable static-libs static) \
|
||||
--enable-regex \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local f
|
||||
emake DESTDIR="${D}" install || die "Installation failed"
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${D}/usr/lib/charset.alias"
|
||||
|
||||
# Don't install gdb python macros, bug 291328
|
||||
rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
|
||||
|
||||
insinto /usr/share/bash-completion
|
||||
for f in gdbus gsettings; do
|
||||
newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
|
||||
done
|
||||
rm -rf "${D}/etc"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export XDG_DATA_HOME="${T}"
|
||||
|
||||
# Hardened: gdb needs this, bug #338891
|
||||
if host-is-pax ; then
|
||||
pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
|
||||
|| die "Hardened adjustment failed"
|
||||
fi
|
||||
|
||||
emake check || die "tests failed"
|
||||
}
|
@ -1 +0,0 @@
|
||||
glib-2.30.0.ebuild
|
@ -1,206 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.2 2011/09/28 11:19:21 ssuominen Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="2"
|
||||
IUSE="debug doc fam selinux +static-libs systemtap test xattr"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
|
||||
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
virtual/libffi
|
||||
sys-libs/zlib
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/gettext-0.11
|
||||
>=dev-util/gtk-doc-am-1.15
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gtk-doc-1.15
|
||||
~app-text/docbook-xml-dtd-4.1.2 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
test? (
|
||||
>=dev-util/gdbus-codegen-2.30.0
|
||||
>=sys-apps/dbus-1.2.14 )
|
||||
!<dev-util/gtk-doc-1.15-r2"
|
||||
PDEPEND="!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
|
||||
|
||||
# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
|
||||
|
||||
src_prepare() {
|
||||
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
|
||||
|
||||
if use ia64 ; then
|
||||
# Only apply for < 4.1
|
||||
local major=$(gcc-major-version)
|
||||
local minor=$(gcc-minor-version)
|
||||
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
|
||||
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Don't fail gio tests when ran without userpriv, upstream bug 552912
|
||||
# This is only a temporary workaround, remove as soon as possible
|
||||
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
|
||||
epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
|
||||
|
||||
# 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"
|
||||
|
||||
if ! use test; then
|
||||
# don't waste time building tests
|
||||
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
|
||||
else
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
|
||||
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
|
||||
fi
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
|
||||
|
||||
# Skip the qsort_r test, which fails to run under cross-compilation,
|
||||
# and thus use the qsort_r implementation provided by glib
|
||||
epatch "${FILESDIR}/${PN}-2.30.0-qsort_r-check.patch"
|
||||
|
||||
# Add the missing G_BEGIN_DECLS / G_END_DECLS in header files.
|
||||
# upstream bug 663880
|
||||
epatch "${FILESDIR}/${PN}-2.30.0-missing-decls.patch"
|
||||
|
||||
# disable pyc compiling
|
||||
ln -sfn $(type -P true) py-compile
|
||||
|
||||
# Needed for the punt-python-check patch, disabling timeout test
|
||||
# Also needed to prevent croscompile failures, see bug #267603
|
||||
# Also needed for the no-gdbus-codegen patch
|
||||
AT_M4DIR="${WORKDIR}" eautoreconf
|
||||
|
||||
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
|
||||
epunt_cxx
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Avoid circular depend with dev-util/pkgconfig
|
||||
if ! has_version dev-util/pkgconfig; then
|
||||
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
|
||||
export DBUS1_LIBS="-ldbus-1"
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable systemtap dtrace) \
|
||||
$(use_enable systemtap systemtap) \
|
||||
--enable-regex \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local f
|
||||
emake DESTDIR="${D}" install || die "Installation failed"
|
||||
|
||||
# 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/"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
|
||||
|
||||
insinto /usr/share/bash-completion
|
||||
for f in gdbus gsettings; do
|
||||
newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
|
||||
done
|
||||
rm -rf "${ED}/etc"
|
||||
|
||||
# Completely useless with or without USE static-libs, people need to use
|
||||
# pkg-config
|
||||
find "${ED}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
|
||||
src_test() {
|
||||
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"
|
||||
export XDG_DATA_HOME="${T}"
|
||||
unset GSETTINGS_BACKEND # bug 352451
|
||||
|
||||
# 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 "${S}"/tests/.libs/assert-msg-test \
|
||||
|| die "Hardened adjustment failed"
|
||||
fi
|
||||
|
||||
# Need X for dbus-launch session X11 initialization
|
||||
Xemake check || die "tests failed"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Only give the introspection message if:
|
||||
# * The user has gobject-introspection
|
||||
# * Has glib already installed
|
||||
# * Previous version was different from new version
|
||||
if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
|
||||
ewarn "You must rebuild gobject-introspection so that the installed"
|
||||
ewarn "typelibs and girs are regenerated for the new APIs in glib"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
|
||||
if has_version dev-libs/dbus-glib; then
|
||||
ewarn "If you experience a breakage after updating dev-libs/glib try"
|
||||
ewarn "rebuilding dev-libs/dbus-glib"
|
||||
fi
|
||||
|
||||
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,235 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.6 2012/10/06 21:17:44 blueness Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="utils? 2"
|
||||
# Avoid runtime dependency on python when USE=test
|
||||
|
||||
inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
http://dev.gentoo.org/~tetromino/distfiles/glib/${P}-AS_IF-patches.tar.xz
|
||||
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="2"
|
||||
IUSE="debug doc 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 ~x86-linux"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
virtual/libffi
|
||||
sys-libs/zlib
|
||||
|| (
|
||||
>=dev-libs/elfutils-0.142
|
||||
>=dev-libs/libelf-0.8.12 )
|
||||
xattr? ( sys-apps/attr )
|
||||
fam? ( virtual/fam )
|
||||
utils? ( >=dev-util/gdbus-codegen-${PV} )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/gettext-0.11
|
||||
>=dev-util/gtk-doc-am-1.15
|
||||
doc? (
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=dev-util/gdbus-codegen-${PV}
|
||||
>=dev-util/gtk-doc-1.15
|
||||
~app-text/docbook-xml-dtd-4.1.2 )
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
test? (
|
||||
sys-devel/gdb
|
||||
=dev-lang/python-2*
|
||||
>=dev-util/gdbus-codegen-${PV}
|
||||
>=sys-apps/dbus-1.2.14 )
|
||||
!<dev-util/gtk-doc-1.15-r2"
|
||||
PDEPEND="!<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
|
||||
|
||||
pkg_setup() {
|
||||
# Needed for gio/tests/gdbus-testserver.py
|
||||
if use test ; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-CVE-2012-3524.patch
|
||||
|
||||
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
|
||||
|
||||
# Fix gmodule issues on fbsd; bug #184301
|
||||
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
|
||||
|
||||
# need to build tests if USE=doc for bug #387385
|
||||
if ! use test && ! use doc; then
|
||||
# don't waste time building tests
|
||||
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
|
||||
else
|
||||
# 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
|
||||
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
|
||||
|
||||
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
|
||||
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
|
||||
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
|
||||
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
|
||||
fi
|
||||
|
||||
# gdbus-codegen is a separate package
|
||||
epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
|
||||
|
||||
# bashcomp goes in /usr/share/bash-completion
|
||||
epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
|
||||
|
||||
# AS_IF fixes from 2.33.x, needed for cross-compiling, bug #434770
|
||||
epatch ../AS_IF-patches/*.patch
|
||||
|
||||
# disable pyc compiling
|
||||
use test && python_clean_py-compile_files
|
||||
|
||||
# Needed for the punt-python-check patch, disabling timeout test
|
||||
# Also needed to prevent croscompile failures, see bug #267603
|
||||
# Also needed for the no-gdbus-codegen patch
|
||||
AT_M4DIR="${WORKDIR}" eautoreconf
|
||||
|
||||
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
|
||||
|
||||
epunt_cxx
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# 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.
|
||||
# -- compnerd (3/27/06)
|
||||
use debug && myconf="--enable-debug"
|
||||
|
||||
# Always use internal libpcre, bug #254659
|
||||
econf ${myconf} \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable doc man) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable selinux) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable systemtap dtrace) \
|
||||
$(use_enable systemtap systemtap) \
|
||||
--with-pcre=internal \
|
||||
--with-threads=posix
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local f
|
||||
|
||||
# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
|
||||
emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
|
||||
|
||||
if ! use utils; then
|
||||
rm "${ED}usr/bin/gtester-report"
|
||||
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/"
|
||||
|
||||
dodoc AUTHORS ChangeLog* NEWS* README
|
||||
|
||||
# Completely useless with or without USE static-libs, people need to use
|
||||
# pkg-config
|
||||
find "${D}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# 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 "${S}"/tests/.libs/assert-msg-test \
|
||||
|| die "Hardened adjustment failed"
|
||||
fi
|
||||
|
||||
# Need X for dbus-launch session X11 initialization
|
||||
Xemake check
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Only give the introspection message if:
|
||||
# * The user has gobject-introspection
|
||||
# * Has glib already installed
|
||||
# * Previous version was different from new version
|
||||
if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
|
||||
ewarn "You must rebuild gobject-introspection so that the installed"
|
||||
ewarn "typelibs and girs are regenerated for the new APIs in glib"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
|
||||
if has_version dev-libs/dbus-glib; then
|
||||
ewarn "If you experience a breakage after updating dev-libs/glib try"
|
||||
ewarn "rebuilding dev-libs/dbus-glib"
|
||||
fi
|
||||
|
||||
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,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>gnome</herd>
|
||||
</pkgmetadata>
|
@ -1,445 +0,0 @@
|
||||
# ChangeLog for dev-libs/gobject-introspection
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.86 2013/01/03 00:31:07 tetromino Exp $
|
||||
|
||||
03 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-1.34.2-r1.ebuild:
|
||||
Forgot to add PYTHON_DEPS to dependencies (bug #449824, thanks to Jory A.
|
||||
Pratt).
|
||||
|
||||
*gobject-introspection-1.34.2-r1 (29 Dec 2012)
|
||||
|
||||
29 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
+gobject-introspection-1.34.2-r1.ebuild,
|
||||
+files/gobject-introspection-1.34.2-better-traceback.patch:
|
||||
Print the filename and line being parsed if g-ir-scanner crashes while
|
||||
parsing a gtk-doc annotation. Update to EAPI5 and python-single-r1.
|
||||
|
||||
09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.1.ebuild,
|
||||
-gobject-introspection-1.34.0.ebuild, -gobject-introspection-1.34.1.1.ebuild:
|
||||
Pin to a specific range of glib versions to avoid problems like bug #446622.
|
||||
Drop old.
|
||||
|
||||
*gobject-introspection-1.34.2 (21 Nov 2012)
|
||||
|
||||
21 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org>
|
||||
+gobject-introspection-1.34.2.ebuild:
|
||||
Version bump.
|
||||
|
||||
*gobject-introspection-1.34.1.1 (30 Oct 2012)
|
||||
|
||||
30 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org>
|
||||
+gobject-introspection-1.34.1.1.ebuild:
|
||||
Version bump. Drop useless USE=doc, it served no useful purpose.
|
||||
|
||||
28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
ia64/s390/sh/sparc stable wrt #427544
|
||||
|
||||
06 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
stable ppc ppc64, bug #427544
|
||||
|
||||
06 Oct 2012; Markus Meier <maekke@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
arm stable, bug #427544
|
||||
|
||||
04 Oct 2012; Agostino Sarubbo <ago@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
Stable for amd64, wrt bug #427544
|
||||
|
||||
03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
x86 stable wrt bug #427544
|
||||
|
||||
02 Oct 2012; Jeroen Roovers <jer@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
Stable for HPPA (bug #427544).
|
||||
|
||||
26 Sep 2012; Matt Turner <mattst88@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
Stable on alpha, bug 427544.
|
||||
|
||||
*gobject-introspection-1.34.0 (25 Sep 2012)
|
||||
|
||||
25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.1.ebuild,
|
||||
+gobject-introspection-1.34.0.ebuild:
|
||||
Version bump with an improved (and more strict) annotation parser and
|
||||
glib-2.34 updates. Make license more precise.
|
||||
|
||||
07 Jul 2012; Pacho Ramos <pacho@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
Prevent crosscompiling problems, bug #414105 by Jimmy.Jazz.
|
||||
|
||||
04 Jun 2012; Pacho Ramos <pacho@gentoo.org>
|
||||
-files/gobject-introspection-0.10.8-build-tests.patch,
|
||||
-gobject-introspection-0.10.8.ebuild, -gobject-introspection-1.30.0-r1.ebuild,
|
||||
-gobject-introspection-1.32.0.ebuild:
|
||||
Drop old.
|
||||
|
||||
04 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0-r1.ebuild,
|
||||
gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.0.ebuild,
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
Need PYTHON_USE_WITH="xml"(bug #418083, thanks to Arfrever).
|
||||
|
||||
21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-1.30.0-r1.ebuild,
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
Need eutils for epatch.
|
||||
|
||||
06 May 2012; Fabian Groffen <grobian@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
Remove bashism from configure script
|
||||
|
||||
04 May 2012; Jeff Horelick <jdhore@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0-r1.ebuild,
|
||||
gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.0.ebuild,
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
dev-util/pkgconfig -> virtual/pkgconfig
|
||||
|
||||
26 Apr 2012; Alexis Ballier <aballier@gentoo.org>
|
||||
gobject-introspection-1.32.1.ebuild:
|
||||
keyword ~amd64-fbsd
|
||||
|
||||
*gobject-introspection-1.32.1 (20 Apr 2012)
|
||||
|
||||
20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
+gobject-introspection-1.32.1.ebuild:
|
||||
Version bump with various bugfixes.
|
||||
|
||||
16 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-1.32.0.ebuild:
|
||||
Fix glib dependency to match installed gir data and fix test failure (bug
|
||||
#412059, thanks to Hans de Graaff).
|
||||
|
||||
*gobject-introspection-1.32.0 (28 Mar 2012)
|
||||
|
||||
28 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
-gobject-introspection-1.30.0.ebuild, +gobject-introspection-1.32.0.ebuild,
|
||||
metadata.xml:
|
||||
Version bump with a new documentation tool and numerous bugfixes. Autotools
|
||||
macros were split off into a separate package, gobject-introspection-common.
|
||||
Drop old.
|
||||
|
||||
25 Mar 2012; Raúl Porcel <armin76@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
alpha/ia64/s390/sh/sparc stable wrt #393007
|
||||
|
||||
05 Mar 2012; Brent Baude <ranger@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
Marking gobject-introspection-1.30.0-r2 ppc stable for bug 393007
|
||||
|
||||
05 Mar 2012; Brent Baude <ranger@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
Marking gobject-introspection-1.30.0-r2 ppc64 stable for bug 393007
|
||||
|
||||
07 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0.ebuild,
|
||||
gobject-introspection-1.30.0-r1.ebuild,
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
Directly inherit multilib, thanks to Arfrever for reporting.
|
||||
|
||||
07 Feb 2012; Jeroen Roovers <jer@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
Stable for HPPA (bug #399529).
|
||||
|
||||
29 Jan 2012; Markus Meier <maekke@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
arm stable, bug #399529
|
||||
|
||||
28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
x86 stable wrt bug #399529
|
||||
|
||||
20 Jan 2012; Agostino Sarubbo <ago@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild:
|
||||
Stable for AMD64, wrt bug #399529
|
||||
|
||||
18 Jan 2012; Markus Meier <maekke@gentoo.org>
|
||||
gobject-introspection-1.30.0-r1.ebuild:
|
||||
arm stable, bug #393007
|
||||
|
||||
14 Jan 2012; Markus Meier <maekke@gentoo.org>
|
||||
gobject-introspection-1.30.0-r1.ebuild:
|
||||
x86 stable, bug #393007
|
||||
|
||||
08 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-1.30.0-r2.ebuild,
|
||||
-files/gobject-introspection-1.30.0-forced-cairo.patch:
|
||||
Update fix for bug #391213 to not use eautoreconf.
|
||||
|
||||
*gobject-introspection-1.30.0-r2 (08 Jan 2012)
|
||||
|
||||
08 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
+gobject-introspection-1.30.0-r2.ebuild,
|
||||
+files/gobject-introspection-1.30.0-forced-cairo.patch:
|
||||
Force building cairo-gobject support, and add a PDEPEND on cairo[glib]
|
||||
(PDEPEND instead of RDEPEND to avoid circular dependencies). Fixes bug
|
||||
#391213; thanks to Pacho Ramos, Rafał Mużyło, and the many helpful
|
||||
testers.
|
||||
|
||||
31 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0.ebuild,
|
||||
gobject-introspection-1.30.0-r1.ebuild:
|
||||
Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
|
||||
|
||||
29 Dec 2011; Pacho Ramos <pacho@gentoo.org>
|
||||
gobject-introspection-1.30.0-r1.ebuild:
|
||||
amd64 stable, bug 393007
|
||||
|
||||
20 Dec 2011; Jeroen Roovers <jer@gentoo.org>
|
||||
gobject-introspection-1.30.0-r1.ebuild:
|
||||
Stable for HPPA (bug #393007).
|
||||
|
||||
15 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
gobject-introspection-1.30.0-r1.ebuild:
|
||||
Port to EAPI 4
|
||||
|
||||
*gobject-introspection-1.30.0-r1 (30 Oct 2011)
|
||||
|
||||
30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
+gobject-introspection-1.30.0-r1.ebuild:
|
||||
Add useful upstream patches to take into account struct padding on ppc and
|
||||
arm, improve stability, report better error messages, fix memory leaks, fix
|
||||
distcc incompatibility, and fix potential glib-2.31.x incompatibility.
|
||||
|
||||
28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
|
||||
gobject-introspection-1.30.0.ebuild:
|
||||
Use virtual/libffi instead of dev-libs/libffi in case we have to switch to
|
||||
using copy from GCC in future.
|
||||
|
||||
*gobject-introspection-1.30.0 (27 Sep 2011)
|
||||
|
||||
27 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-1.30.0.ebuild:
|
||||
Bump to 1.30, from the GNOME overlay. Ebuild updates by tetromino.
|
||||
|
||||
20 Sep 2011; Matt Turner <mattst88@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Add missing dependency on bison, bug 382987
|
||||
|
||||
12 Sep 2011; Pacho Ramos <pacho@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild,
|
||||
+files/gobject-introspection-0.10.8-build-tests.patch:
|
||||
Build tests only on make check, bug #379929 by Dave Kemper and patch by
|
||||
Alexandre Rostovtsev.
|
||||
|
||||
16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Make the DESCRIPTION a bit more descriptive
|
||||
|
||||
14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
DEPEND on virtual/yacc since bison is no longer in the system set, bug 378535
|
||||
|
||||
09 Jul 2011; Matt Turner <mattst88@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Added ~mips, bug 324847
|
||||
|
||||
08 Jul 2011; Alexis Ballier <aballier@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
keyword ~x86-fbsd, bug #364693
|
||||
|
||||
14 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
-gobject-introspection-0.10.2.ebuild, -gobject-introspection-0.10.7.ebuild:
|
||||
Remove old.
|
||||
|
||||
02 May 2011; Jeroen Roovers <jer@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Stable for HPPA (bug #364973).
|
||||
|
||||
30 Apr 2011; Raúl Porcel <armin76@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
alpha/arm/ia64/s390/sh/sparc stable wrt #364973
|
||||
|
||||
29 Apr 2011; Jeroen Roovers <jer@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Marked ~hppa (bug #364693).
|
||||
|
||||
28 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
x86 stable wrt security bug #364973
|
||||
|
||||
27 Apr 2011; Christoph Mende <angelos@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Stable on amd64 wrt bug #364973
|
||||
|
||||
27 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
ppc/ppc64 stable wrt #364973
|
||||
|
||||
25 Apr 2011; Fabian Groffen <grobian@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Run elibtoolize for correct Darwin bundle (Python)
|
||||
|
||||
25 Apr 2011; Fabian Groffen <grobian@gentoo.org>
|
||||
gobject-introspection-0.10.8.ebuild:
|
||||
Keyworded for Prefix arches, bug #364693
|
||||
|
||||
*gobject-introspection-0.10.8 (24 Apr 2011)
|
||||
|
||||
24 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
-gobject-introspection-0.10.6.ebuild,
|
||||
-gobject-introspection-0.10.7-r1.ebuild,
|
||||
-files/gobject-introspection-0.10.7-fix-g-variant-new.patch,
|
||||
+gobject-introspection-0.10.8.ebuild:
|
||||
Bump to 0.10.8, remove old
|
||||
|
||||
*gobject-introspection-0.10.7-r1 (19 Apr 2011)
|
||||
|
||||
19 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-0.10.7-r1.ebuild,
|
||||
+files/gobject-introspection-0.10.7-fix-g-variant-new.patch:
|
||||
Add variant fixes, needed for pygobject-2.28.4
|
||||
|
||||
*gobject-introspection-0.10.7 (04 Apr 2011)
|
||||
|
||||
04 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
-gobject-introspection-0.10.3.ebuild,
|
||||
-gobject-introspection-0.10.4.ebuild,
|
||||
+gobject-introspection-0.10.7.ebuild:
|
||||
Bump to 0.10.7, remove old
|
||||
|
||||
*gobject-introspection-0.10.6 (26 Mar 2011)
|
||||
|
||||
26 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-0.10.6.ebuild:
|
||||
Bump to 0.10.6
|
||||
|
||||
22 Mar 2011; Brent Baude <ranger@gentoo.org>
|
||||
gobject-introspection-0.10.2.ebuild:
|
||||
Marking gobject-introspection-0.10.2 ppc stable for bug 353436
|
||||
|
||||
21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
|
||||
gobject-introspection-0.10.2.ebuild:
|
||||
ppc64 stable wrt #353436
|
||||
|
||||
12 Mar 2011; Raúl Porcel <armin76@gentoo.org>
|
||||
gobject-introspection-0.10.2.ebuild:
|
||||
alpha/arm/ia64/s390/sh/sparc stable wrt #353436
|
||||
|
||||
*gobject-introspection-0.10.4 (11 Mar 2011)
|
||||
|
||||
11 Mar 2011; Pacho Ramos <pacho@gentoo.org>
|
||||
+gobject-introspection-0.10.4.ebuild:
|
||||
Version bump.
|
||||
|
||||
24 Feb 2011; Thomas Kahle <tomka@gentoo.org>
|
||||
gobject-introspection-0.10.2.ebuild:
|
||||
x86 stable per bug 353436
|
||||
|
||||
23 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
|
||||
gobject-introspection-0.10.2.ebuild:
|
||||
Stable on amd64 wrt bug #353436
|
||||
|
||||
*gobject-introspection-0.10.3 (23 Feb 2011)
|
||||
|
||||
23 Feb 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
-gobject-introspection-0.10.1.ebuild,
|
||||
+gobject-introspection-0.10.3.ebuild:
|
||||
Bump to 0.10.3, lots of introspection building fixes
|
||||
|
||||
*gobject-introspection-0.10.2 (08 Feb 2011)
|
||||
|
||||
08 Feb 2011; Pacho Ramos <pacho@gentoo.org>
|
||||
-gobject-introspection-0.6.14.ebuild, -gobject-introspection-0.9.0-r1.ebuild,
|
||||
-files/gobject-introspection-0.9.0-python27.patch,
|
||||
-gobject-introspection-0.9.12.ebuild, -gobject-introspection-0.10.0.ebuild,
|
||||
+gobject-introspection-0.10.2.ebuild:
|
||||
Version bump, remove old.
|
||||
|
||||
26 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
|
||||
gobject-introspection-0.10.1.ebuild:
|
||||
~ppc/~ppc64 wrt #324847
|
||||
|
||||
*gobject-introspection-0.10.1 (12 Jan 2011)
|
||||
|
||||
12 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
|
||||
+gobject-introspection-0.10.1.ebuild:
|
||||
Version bump.
|
||||
|
||||
*gobject-introspection-0.10.0 (22 Dec 2010)
|
||||
|
||||
22 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org>
|
||||
-gobject-introspection-0.9.0.ebuild, -gobject-introspection-0.9.3.ebuild,
|
||||
-gobject-introspection-0.9.6.ebuild, -gobject-introspection-0.9.10.ebuild,
|
||||
+gobject-introspection-0.10.0.ebuild:
|
||||
Version bump. Clean up old revisions.
|
||||
|
||||
*gobject-introspection-0.9.12 (13 Oct 2010)
|
||||
|
||||
13 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
|
||||
+gobject-introspection-0.9.12.ebuild:
|
||||
Version bump. More multi ABI python changes.
|
||||
|
||||
*gobject-introspection-0.9.10 (02 Oct 2010)
|
||||
*gobject-introspection-0.9.0-r1 (02 Oct 2010)
|
||||
|
||||
02 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
|
||||
-gobject-introspection-0.6.9.ebuild,
|
||||
+gobject-introspection-0.9.0-r1.ebuild,
|
||||
+files/gobject-introspection-0.9.0-python27.patch,
|
||||
+gobject-introspection-0.9.10.ebuild:
|
||||
Version bump. Fix build with python 2.7, bug #327759. Install
|
||||
documentation with USE=doc, bug #335110.
|
||||
|
||||
*gobject-introspection-0.9.6 (21 Sep 2010)
|
||||
|
||||
21 Sep 2010; Arun Raghavan <ford_prefect@gentoo.org>
|
||||
+gobject-introspection-0.9.6.ebuild:
|
||||
Bump to 0.9.6. Lots of fixes and additions. Breaks ABI (gir version bumped
|
||||
from 1.1 to 1.2, so all introspection packages will need updating. Watch
|
||||
out for a revbump later with a tool to update when ABI breaks.
|
||||
|
||||
*gobject-introspection-0.9.3 (22 Aug 2010)
|
||||
|
||||
22 Aug 2010; Jonathan Callen <abcd@gentoo.org>
|
||||
+gobject-introspection-0.9.3.ebuild:
|
||||
Bump to 0.9.3, from gnome overlay
|
||||
|
||||
24 Jul 2010; Raúl Porcel <armin76@gentoo.org>
|
||||
gobject-introspection-0.9.0.ebuild:
|
||||
Add ~alpha/~ia64/~s390/~sh/~sparc wrt #324847
|
||||
|
||||
21 Jul 2010; Markus Meier <maekke@gentoo.org>
|
||||
gobject-introspection-0.9.0.ebuild:
|
||||
add ~arm, bug #324847
|
||||
|
||||
*gobject-introspection-0.9.0 (11 Jul 2010)
|
||||
|
||||
11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-0.9.0.ebuild:
|
||||
Bump to 0.9.0
|
||||
|
||||
11 Jun 2010; Arun Raghavan <ford_prefect@gentoo.org>
|
||||
-gobject-introspection-0.6.7.ebuild, -gobject-introspection-0.6.8.ebuild:
|
||||
Remove old ebuilds
|
||||
|
||||
*gobject-introspection-0.6.14 (11 Jun 2010)
|
||||
|
||||
11 Jun 2010; Arun Raghavan <ford_prefect@gentoo.org>
|
||||
+gobject-introspection-0.6.14.ebuild:
|
||||
Bump to 0.6.14. Upstream doesn't like ChangeLogs, so meh. Added USE=test
|
||||
and bumped to EAPI-3 for python eclass lovin'.
|
||||
|
||||
*gobject-introspection-0.6.9 (19 Mar 2010)
|
||||
|
||||
19 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-0.6.9.ebuild:
|
||||
Bump to 0.6.9; minimal changes
|
||||
|
||||
*gobject-introspection-0.6.8 (18 Mar 2010)
|
||||
|
||||
18 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-0.6.8.ebuild:
|
||||
Bump to 0.6.8, all tests pass.
|
||||
|
||||
*gobject-introspection-0.6.7 (26 Feb 2010)
|
||||
|
||||
26 Feb 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
+gobject-introspection-0.6.7.ebuild, +metadata.xml:
|
||||
Add initial ebuild for gobject-introspection, infrastructure for
|
||||
generation of gobject library bindings
|
@ -1,25 +0,0 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX gobject-introspection-1.34.2-better-traceback.patch 1431 SHA256 921870ef1182bb6d358eaecd479f73bf22404ccd9b4d2ee27005f8aa0960a865 SHA512 48acab361c2e6a938eb88c4c2ea3cdd83dd1eb165d489b3fa54967d748a36842a4f89833a71c73ed79e4ee85e0e9aeb05fb1eac82470cc1664ba9dc0eedb8037 WHIRLPOOL af33c96fa943b6e36269963b603652bb0e6ca9702a57a384dbbef59f7b7516084bc6a2334f41d415460a7d8796c0908f9e24285cfbdde705b4430db0bb747831
|
||||
DIST gobject-introspection-1.30.0-patches-1.tar.xz 5776 SHA256 90a01c8b3ce6b112d58e9781460f3664d652bed169ddbdd9451a5e0a9fe2d37c SHA512 a11195aa3c7ebeee89d7262751f1b894890170d99cbfbfa4a5122f616adbe394b2abf8f00d9f658e906c9ccc34608ecc9939a98e2d2a0bf98ad3116e393c0d40 WHIRLPOOL 21d173277ecf0a3186efd2975b8c5746ca9a765a2c8db023706083b2eab47e5c8aac4ea728c2e9a2e30453fd3aef63ca4ce5a8aafe3882a116a7e2e1e0a738f8
|
||||
DIST gobject-introspection-1.30.0.tar.xz 1063720 SHA256 8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2 SHA512 fa4daa40ad971fd3da8d7b29ada94bd7d29a011972dd007c24692fb1b3e72716bdaa8a3e932c22fa5bf41a4c0d3b1a0a5012a6abac69714ab3fcde0c669da9f4 WHIRLPOOL 0a70ffb3135509accfe484a1e52adc1a674d89a4f2874aea60f45047269f27a410c769f85ac21b7f06396489a69bd5a01422618b8c11b1af678fd8f523d6d6a6
|
||||
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
|
||||
EBUILD gobject-introspection-1.30.0-r2.ebuild 2702 SHA256 f59a167478a965c6b61fc67a9f40ca05d39a7b015fd0d5a0413b9eb1f4ef0622 SHA512 57f7377879b2b48e1fba18e385bb46eac0907333e34c6378cd6942a3a53a60669a1222c3f4f2d3d86ef7baebf18252f53406302dd959611d5d5b0abb03d5764f WHIRLPOOL 142b5602cb4517dfc150ba2d3f753b36d8cd35a7e7eb976bee3adea9ff92570dc0994ef58ea1e5505f9b77517edb2d39abce6de144abe24e79386718d2f239f0
|
||||
EBUILD gobject-introspection-1.32.1.ebuild 3001 SHA256 a04f5f593d362a802e66f813aec43a278ed06e01905a4a364c36e3b5a9f43c2b SHA512 00feaff99ca8dbb0a7b9b1ad5cb9a855b734f3bc14ae9b0b7471b9e64411f7febdd601337a0006947fd4038283ded4380684e50a83da4a82a6bf0fffad6f6945 WHIRLPOOL 19a18bd0f46ff0a5428414060b6f957e847a18916f20f9877e2307d8f4a43fb3d826bc921b16d26294553be1bbc029bd7dbd7e4d172d739dae72dbaa7b40ff25
|
||||
EBUILD gobject-introspection-1.34.2-r1.ebuild 2598 SHA256 be1653ae8ab4038e0472e4b57f76e05446f72da9edc9e0d52b9c23a7a9ebbb7c SHA512 ba8435d7bd1fefc0ab3205c700492d1faac9f41d5c567f222e112e78202b95776aa8205fab409b28503e3025da18801749361a97e4515aa7e2cfdee7007d67eb WHIRLPOOL e3589c4e82e206fa5106dd497ff3a7debbfb6fa236d1b864747c4c66323a3ca197aa5ceb8971a6771457929c3781595858ffaf7c785d248f2b24b1062d62aca8
|
||||
EBUILD gobject-introspection-1.34.2.ebuild 2801 SHA256 ea89e3e4b7954e46a790e38718e57187c8f572588df6788e280a88ba61df1723 SHA512 d918de34a89ac7ed928f927c4096471064f88212a55337b2ca7f25f77c188cc22962191a7d448668529dc0fb4084f9555fd0310359deeec6099cb800e7dcade5 WHIRLPOOL 10deb676e0537b3e58845c191f7002c22ccf6671fe41b23584e73ebcbf22f0503b1eadea7e8d0f854146d8baee4a3962e126de5e168cd1018f8920778050037c
|
||||
MISC ChangeLog 16018 SHA256 a540a52f3c3492086a3fe57717e710dbc552dc04bb2cce021e630a560f625cc5 SHA512 6ca9c335083ad9cc3bae967884170f2c7dacb58592ad8fcb7fc2518e7bc1647b7fbabc245a43a5d89245bf0cbcde30813b789160fbfb88109ebd9a9b19a49e51 WHIRLPOOL 0ff1f175cd89dbe9d370c07eb708289f43c42829d05c8a0fdb2f872ce559d83cbc1a2dbadb7641ca8a31f8e9e30c6e17f37f32636975832e25467fe3288160f6
|
||||
MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJQ5NFNAAoJEJ0WA1zPCt1hDS8H/A/SivWJi03NRWJmaEaioEJf
|
||||
w+DWIF0BmX9zRXMhqbuYWdKoL4gIGv4hBUFX8jbtW7lSx0/geBgtrt79RO3vGNJf
|
||||
ufIUfspyuzRKiplWSvHPNVhJdbbhjDrlgLF4hsKQ/L+PZWrinVI3BUvZ6uzUqzVs
|
||||
rFWiJEsadlvzkbbdJmkpDT/msFDUTTdH+rZrKfq4OHQcx+svr2S48deLEGYWnm2O
|
||||
nlmRxNB7FGhjCLkxlIL/nqD4IItnCnNBUYScyDY0L5pwNamDbH0PahDed0IrBVgG
|
||||
EuYswaONNWm41WJ8hY+0YRWPeTvoMTGNdLLJPmgJ+zRVJvBV9vqDiSl78xOrDBk=
|
||||
=dU8q
|
||||
-----END PGP SIGNATURE-----
|
@ -1,43 +0,0 @@
|
||||
From 3e452d88e285531f78707de9a0326649d537e59f Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Sat, 29 Dec 2012 05:22:08 -0500
|
||||
Subject: [PATCH] scanner: add filename/line to the backtrace if
|
||||
parse_comment_block() raised an exception
|
||||
|
||||
In most cases, such exceptions are caused by gtk-doc syntax errors in
|
||||
annotations, and developers want to see which annotation made g-ir-scanner
|
||||
crash.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=690850
|
||||
---
|
||||
giscanner/annotationparser.py | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
|
||||
index f545590..f33e956 100644
|
||||
--- a/giscanner/annotationparser.py
|
||||
+++ b/giscanner/annotationparser.py
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
|
||||
import re
|
||||
+import traceback
|
||||
|
||||
from . import message
|
||||
from .odict import odict
|
||||
@@ -766,7 +767,11 @@ class AnnotationParser(object):
|
||||
comment_blocks = {}
|
||||
|
||||
for comment in comments:
|
||||
- comment_block = self.parse_comment_block(comment)
|
||||
+ try:
|
||||
+ comment_block = self.parse_comment_block(comment)
|
||||
+ except:
|
||||
+ message.fatal("error when parsing comment block\n%s" % traceback.format_exc(),
|
||||
+ message.Position(comment[1], comment[2]))
|
||||
|
||||
if comment_block is not None:
|
||||
# Note: previous versions of this parser did not check
|
||||
--
|
||||
1.8.0.2
|
||||
|
@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2012 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.30.0-r2.ebuild,v 1.15 2012/12/09 18:33:49 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
PYTHON_USE_WITH="xml"
|
||||
|
||||
inherit eutils gnome2 multilib python
|
||||
|
||||
DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
|
||||
HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
|
||||
SRC_URI="${SRC_URI} mirror://gentoo/${P}-patches-1.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2+ GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.29.7:2
|
||||
<dev-libs/glib-2.31:2
|
||||
virtual/libffi"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex
|
||||
virtual/yacc
|
||||
doc? ( >=dev-util/gtk-doc-1.15 )"
|
||||
# PDEPEND to avoid circular dependencies, bug #391213
|
||||
PDEPEND="x11-libs/cairo[glib]"
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
|
||||
G2CONF="${G2CONF}
|
||||
--disable-static
|
||||
YACC=$(type -p yacc)
|
||||
$(use_enable test tests)"
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Useful upstream patches, will be in 1.31
|
||||
epatch ../patches/*.patch
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=659824
|
||||
sed -i -e '/^TAGS/s/[{}]//g' "${S}/giscanner/docbookdescription.py" || die
|
||||
|
||||
# FIXME: Parallel compilation failure with USE=doc
|
||||
use doc && MAKEOPTS="-j1"
|
||||
|
||||
# Don't pre-compile .py
|
||||
echo > py-compile
|
||||
echo > build-aux/py-compile
|
||||
|
||||
gnome2_src_prepare
|
||||
|
||||
skip_tests=
|
||||
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"
|
||||
export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
|
||||
export CAIRO_GOBJECT_LIBS="-lcairo-gobject"
|
||||
export CAIRO_GOBJECT_CFLAGS="-I${EPREFIX}/usr/include/cairo"
|
||||
if use test; then
|
||||
G2CONF="${G2CONF} --disable-tests"
|
||||
skip_tests=yes
|
||||
ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present"
|
||||
ewarn "on your system. Consider installing it to get tests to run."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
[[ -z ${skip_tests} ]] && default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,doc-tool,scanner}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner
|
||||
python_need_rebuild
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup /usr/lib*/${PN}/giscanner
|
||||
}
|
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2012 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.32.1.ebuild,v 1.15 2012/12/09 18:33:49 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
PYTHON_USE_WITH="xml"
|
||||
|
||||
inherit gnome2 python 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"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
IUSE="doc doctool test"
|
||||
|
||||
RDEPEND=">=dev-libs/gobject-introspection-common-${PV}
|
||||
>=dev-libs/glib-2.31.22:2
|
||||
<dev-libs/glib-2.33:2
|
||||
doctool? ( dev-python/mako )
|
||||
virtual/libffi"
|
||||
# Wants real bison, not virtual/yacc
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
doc? ( >=dev-util/gtk-doc-1.15 )"
|
||||
|
||||
pkg_setup() {
|
||||
# To prevent crosscompiling problems, bug #414105
|
||||
CC=$(tc-getCC)
|
||||
|
||||
DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
|
||||
G2CONF="${G2CONF}
|
||||
--disable-static
|
||||
YACC=$(type -p yacc)
|
||||
$(use_enable doctool)
|
||||
$(use_enable test tests)"
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# FIXME: Parallel compilation failure with USE=doc
|
||||
use doc && MAKEOPTS="-j1"
|
||||
|
||||
gnome2_src_prepare
|
||||
|
||||
python_clean_py-compile_files
|
||||
|
||||
# avoid GNU-isms
|
||||
sed -i -e 's/\(if test .* \)==/\1=/' configure || die
|
||||
|
||||
gi_skip_tests=
|
||||
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"
|
||||
export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
|
||||
export CAIRO_GOBJECT_LIBS="-lcairo-gobject"
|
||||
export CAIRO_GOBJECT_CFLAGS="-I${EPREFIX}/usr/include/cairo"
|
||||
if use test; then
|
||||
G2CONF="${G2CONF} --disable-tests"
|
||||
gi_skip_tests=yes
|
||||
ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present"
|
||||
ewarn "on your system. Consider installing it to get tests to run."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
[[ -z ${gi_skip_tests} ]] && default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,scanner}
|
||||
use doctool && python_convert_shebangs 2 "${ED}"usr/bin/g-ir-doc-tool
|
||||
|
||||
# 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
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner
|
||||
python_need_rebuild
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup /usr/$(get_libdir)/${PN}/giscanner
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>gnome</herd>
|
||||
<use>
|
||||
<flag name="doctool">Install g-ir-doc-tool for generating documentation
|
||||
from introspected data</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=prepare
|
||||
DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
|
||||
DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
|
||||
EAPI=4
|
||||
HOMEPAGE=http://packages.ubuntu.com/quantal/sbsigntool
|
||||
KEYWORDS=amd64 x86
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=dev-libs/openssl sys-apps/util-linux
|
||||
SLOT=0
|
||||
SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/sbsigntool_0.6.orig.tar.gz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=b5ea6469674d7b88b834e01a58aff95e
|
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile install unpack
|
||||
DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=hardened
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
|
||||
LICENSE=LGPL-2.1
|
||||
SLOT=1
|
||||
SRC_URI=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/glib-1.2.10.tar.gz mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
|
||||
_eclasses_=autotools c118b9a8e93bfef124f2d7a2fe56a95e eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf portability a45c088f246ef5091e029f6285d7ce42 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=f31941ec5f6a80c3afb225a703745269
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install prepare test
|
||||
DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 dev-util/gtk-doc-am doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam hardened selinux xattr
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.20/glib-2.20.5.tar.bz2
|
||||
_eclasses_=autotools c118b9a8e93bfef124f2d7a2fe56a95e eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=b38ba52105255458695d6d6a97b9f5f2
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install prepare test
|
||||
DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 )
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam hardened selinux xattr
|
||||
KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.22/glib-2.22.2.tar.bz2
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=bd991871edc3c1020a5f3803d2467982
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install prepare test
|
||||
DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 )
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam hardened selinux xattr
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.22/glib-2.22.3.tar.bz2
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=89b228e987b8143477a0313afd320f09
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install prepare test
|
||||
DEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 )
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam hardened selinux xattr
|
||||
KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.22/glib-2.22.4.tar.bz2
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=2e997e6a07e491f5872cbc176310d3b6
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install prepare test
|
||||
DEPEND=virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=dev-util/pkgconfig-0.16 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( >=sys-apps/dbus-1.2.14 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam selinux +static-libs test xattr
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/glib-2.26.1.tar.bz2
|
||||
_eclasses_=autotools c118b9a8e93bfef124f2d7a2fe56a95e eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils dfe060cb70d89757fde5c1ff8405e950 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=64f984f32a865043bc81e1713c2872e1
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst preinst prepare test
|
||||
DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( >=dev-util/gdbus-codegen-2.30.0 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam selinux +static-libs systemtap test xattr test
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
|
||||
LICENSE=LGPL-2
|
||||
PDEPEND=!<gnome-base/gvfs-1.6.4-r990
|
||||
RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.30/glib-2.30.0.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
|
||||
_eclasses_=autotools c118b9a8e93bfef124f2d7a2fe56a95e eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils dfe060cb70d89757fde5c1ff8405e950 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
|
||||
_md5_=1db53b0397b760a260626595b1df8333
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst preinst prepare test
|
||||
DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( >=dev-util/gdbus-codegen-2.30.0 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam selinux +static-libs systemtap test xattr test
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
|
||||
LICENSE=LGPL-2
|
||||
PDEPEND=!<gnome-base/gvfs-1.6.4-r990
|
||||
RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.30/glib-2.30.0.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
|
||||
_eclasses_=autotools c118b9a8e93bfef124f2d7a2fe56a95e eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils dfe060cb70d89757fde5c1ff8405e950 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
|
||||
_md5_=1db53b0397b760a260626595b1df8333
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst preinst prepare setup test
|
||||
DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.4 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.32.4 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.32.4 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
|
||||
DESCRIPTION=The GLib library of C routines
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.gtk.org/
|
||||
IUSE=debug doc fam kernel_linux selinux static-libs systemtap test utils xattr test
|
||||
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
|
||||
LICENSE=LGPL-2+
|
||||
PDEPEND=!<gnome-base/gvfs-1.6.4-r990
|
||||
RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.4 ) utils? ( =dev-lang/python-2* )
|
||||
SLOT=2
|
||||
SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.4.tar.xz http://dev.gentoo.org/~tetromino/distfiles/glib/glib-2.32.4-AS_IF-patches.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
|
||||
_eclasses_=autotools c118b9a8e93bfef124f2d7a2fe56a95e eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils dfe060cb70d89757fde5c1ff8405e950 python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
|
||||
_md5_=d051781e357c41fbb278d23efb5c349a
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
|
||||
DEPEND=>=dev-libs/glib-2.29.7:2 <dev-libs/glib-2.31:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
|
||||
DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
|
||||
EAPI=4
|
||||
HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
|
||||
IUSE=doc test
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=LGPL-2+ GPL-2+
|
||||
PDEPEND=x11-libs/cairo[glib]
|
||||
RDEPEND=>=dev-libs/glib-2.29.7:2 <dev-libs/glib-2.31:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnome/sources/gobject-introspection/1.30/gobject-introspection-1.30.0.tar.xz mirror://gentoo/gobject-introspection-1.30.0-patches-1.tar.xz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 45916e43d354f01469675d59c24f3a07 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=23ab53e75d9e78ef9ffac5d91a849f26
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
|
||||
DEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 <dev-libs/glib-2.33:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
|
||||
DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
|
||||
EAPI=4
|
||||
HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
|
||||
IUSE=doc doctool test
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=LGPL-2+ GPL-2+
|
||||
RDEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 <dev-libs/glib-2.33:2 doctool? ( dev-python/mako ) virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.tar.xz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 45916e43d354f01469675d59c24f3a07 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f
|
||||
_md5_=65fe3db364f1e7f8751f123d567426e1
|
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=compile install unpack
|
||||
DEPEND=>=sys-kernel/linux-headers-2.6.11
|
||||
DESCRIPTION=Linux Key Management Utilities
|
||||
HOMEPAGE=http://www.kernel.org/
|
||||
KEYWORDS=~amd64 ~ppc ~x86
|
||||
LICENSE=GPL-2 LGPL-2.1
|
||||
RDEPEND=>=sys-kernel/linux-headers-2.6.11
|
||||
SLOT=0
|
||||
SRC_URI=http://people.redhat.com/~dhowells/keyutils/keyutils-1.1.tar.bz2
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=cf2d7aee93b3437bf27ad860aa7378b2
|
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=install prepare
|
||||
DEPEND=app-arch/xz-utils
|
||||
DESCRIPTION=Gentoo Cross-toolchain generator
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.gentoo.org/
|
||||
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=>=sys-apps/portage-2.1 app-shells/bash !sys-devel/crossdev-wrappers
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/crossdev-20140118.tar.xz http://dev.gentoo.org/~vapier/dist/crossdev-20140118.tar.xz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=522e42bff5de9b0377c3b467cb7b4af9
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup
|
||||
DEPEND=~sys-libs/e2fsprogs-libs-1.42.9 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo
|
||||
DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
|
||||
EAPI=3
|
||||
HOMEPAGE=http://e2fsprogs.sourceforge.net/
|
||||
IUSE=nls static-libs elibc_FreeBSD
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
|
||||
LICENSE=GPL-2 BSD
|
||||
RDEPEND=~sys-libs/e2fsprogs-libs-1.42.9 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.9.tar.gz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=f5a0291b20feb62881b97093605a962c
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
|
||||
DESCRIPTION=e2fsprogs libraries (common error and subsystem)
|
||||
EAPI=4
|
||||
HOMEPAGE=http://e2fsprogs.sourceforge.net/
|
||||
IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.9.tar.gz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 multibuild ddc59d206214ef1c240093e1bb2513cf multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 9eb4b5fb858228316d8bb32ada51f6a5 multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=ebce999350c8a7b453616a71f9ced0e4
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
|
||||
DESCRIPTION=e2fsprogs libraries (common error and subsystem)
|
||||
EAPI=4
|
||||
HOMEPAGE=http://e2fsprogs.sourceforge.net/
|
||||
IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.9.tar.gz
|
||||
_eclasses_=eutils 6faef4c127028ccbba3a11400d24ae34 multibuild ddc59d206214ef1c240093e1bb2513cf multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 9eb4b5fb858228316d8bb32ada51f6a5 multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=ebce999350c8a7b453616a71f9ced0e4
|
@ -1,6 +0,0 @@
|
||||
DEFINED_PHASES=-
|
||||
DESCRIPTION=Virtual for OpenGL utility library
|
||||
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
|
||||
RDEPEND=|| ( media-libs/glu media-libs/opengl-apple )
|
||||
SLOT=0
|
||||
_md5_=c2d2391024c792f2b089c7381f925629
|
@ -1 +0,0 @@
|
||||
DIST keyutils-1.1.tar.bz2 39206 RMD160 7fad7364ef59b4933ce108317abd606fb727c592 SHA1 e3e523e42d7cedb39d57e5f9a7315b30cf7d9d96 SHA256 a67456986bbdce8872d75f3d537ea2a398ddae412a2a0bf8b9fa62bdd2ade002
|
@ -1,22 +0,0 @@
|
||||
diff -ruN keyutils-1.1/Makefile keyutils-1.1.new/Makefile
|
||||
--- keyutils-1.1/Makefile 2010-05-13 16:46:06.000000000 -0700
|
||||
+++ keyutils-1.1.new/Makefile 2010-05-13 16:46:45.000000000 -0700
|
||||
@@ -11,7 +11,7 @@
|
||||
ETCDIR := /etc
|
||||
BINDIR := /bin
|
||||
SBINDIR := /sbin
|
||||
-LIBDIR := /lib
|
||||
+LIBDIR := /usr/lib
|
||||
USRLIBDIR := /usr/lib
|
||||
SHAREDIR := /usr/share/keyutils
|
||||
INCLUDEDIR := /usr/include
|
||||
@@ -92,7 +92,7 @@
|
||||
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
|
||||
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
|
||||
mkdir -p $(DESTDIR)$(USRLIBDIR)
|
||||
- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
|
||||
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
|
||||
$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
|
||||
|
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.1.ebuild,v 1.2 2006/11/26 10:25:32 peper Exp $
|
||||
|
||||
inherit eutils multilib
|
||||
|
||||
DESCRIPTION="Linux Key Management Utilities"
|
||||
HOMEPAGE="http://www.kernel.org/"
|
||||
SRC_URI="http://people.redhat.com/~dhowells/${PN}/${P}.tar.bz2"
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE=""
|
||||
DEPEND=">=sys-kernel/linux-headers-2.6.11"
|
||||
#RDEPEND=""
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}/${P}-installdir.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-getCC
|
||||
emake CFLAGS="-Wall ${CFLAGS}" NO_ARLIB=0
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" USRLIBDIR="/usr/$(get_libdir)" NO_ARLIB=0
|
||||
dodoc README
|
||||
}
|
@ -1 +0,0 @@
|
||||
DIST crossdev-20140118.tar.xz 21384 SHA256 8ba9ddb74022d6e3d481db5b02db21ea545d046e33a47b44e92ae369b4c218ee SHA512 ee27fc55bd8892fa454f6482d1276e0c6520f7987629b92cc7b96572eca51bb752c119f4f818783a579706afe7c9eabdfb8f0536e87cd888f0f76510ae51939d WHIRLPOOL c2018dfb4ab21d4eadbc9f6e4dd0fb532a8b4ac4530821262f28b8b969e3a7d7c14cd83bbd05e2c93eb73928bb8a4dfd074134d3a93700fe937c0fd1c3ef0fbb
|
@ -1,41 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-20140118.ebuild,v 1.1 2014/01/18 19:52:02 vapier Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
if [[ ${PV} == "99999999" ]] ; then
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/crossdev.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
#KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.xz
|
||||
http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Gentoo Cross-toolchain generator"
|
||||
HOMEPAGE="http://www.gentoo.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=sys-apps/portage-2.1
|
||||
app-shells/bash
|
||||
!sys-devel/crossdev-wrappers"
|
||||
DEPEND="app-arch/xz-utils"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/*.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
if [[ "${PV}" == "99999999" ]] ; then
|
||||
sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
|
||||
fi
|
||||
}
|
@ -1,56 +0,0 @@
|
||||
From 18a89b529289474263c6dbf642b04e720b8f885b Mon Sep 17 00:00:00 2001
|
||||
From: Michael Marineau <mike@marineau.org>
|
||||
Date: Sat, 19 Jul 2014 12:02:52 -0700
|
||||
Subject: [PATCH] cross-pkg-config: require 0.24 and use PKG_CONFIG_SYSROOT_DIR
|
||||
|
||||
The bug with PKG_CONFIG_SYSROOT_DIR was fixed long ago and the
|
||||
replacement code doesn't translate paths outside of /usr, causing the
|
||||
wrapper to abort when it looks up a library installed in /lib.
|
||||
---
|
||||
wrappers/cross-pkg-config | 16 ++--------------
|
||||
1 file changed, 2 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
|
||||
index d124261..67acd9b 100755
|
||||
--- a/wrappers/cross-pkg-config
|
||||
+++ b/wrappers/cross-pkg-config
|
||||
@@ -23,7 +23,7 @@ error() {
|
||||
#
|
||||
# Sanity/distro checks
|
||||
#
|
||||
-MIN_VER="0.20" # needs PKG_CONFIG_SYSROOT_DIR
|
||||
+MIN_VER="0.24" # needs working PKG_CONFIG_SYSROOT_DIR
|
||||
if ! pkg-config --atleast-pkgconfig-version ${MIN_VER} ; then
|
||||
error pkg-config is too old ... upgrade to at least v${MIN_VER}
|
||||
fi
|
||||
@@ -81,12 +81,7 @@ export PKG_CONFIG_LIBDIR="${SYSROOT}/usr/lib/pkgconfig:${SYSROOT}/usr/share/pkgc
|
||||
if [ -n "${EXTRA_PKG_CONFIG_LIBDIR}" ] ; then
|
||||
PKG_CONFIG_LIBDIR="${EXTRA_PKG_CONFIG_LIBDIR}:${PKG_CONFIG_LIBDIR}"
|
||||
fi
|
||||
-#
|
||||
-# This guy is horribly broken in pkg-config <=0.23:
|
||||
-# https://bugs.freedesktop.org/show_bug.cgi?id=16905
|
||||
-#
|
||||
-#export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
|
||||
-unset PKG_CONFIG_SYSROOT_DIR
|
||||
+export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
|
||||
|
||||
#
|
||||
# Sanity check the output to catch common errors that do not
|
||||
@@ -95,13 +90,6 @@ unset PKG_CONFIG_SYSROOT_DIR
|
||||
output=$(pkg-config "$@")
|
||||
ret=$?
|
||||
|
||||
-#
|
||||
-# Inject PKG_CONFIG_SYSROOT_DIR ourselves until pkg-config is fixed.
|
||||
-# We can't mung the .pc files as some of the vars are used at compile
|
||||
-# time to encode runtime paths.
|
||||
-#
|
||||
-output=$(echo "${output}" | sed -e 's:\(-[IL][[:space:]]*\)\(/usr\):\1'"${SYSROOT}"'\2:g')
|
||||
-
|
||||
# We turn the output into a newline separate string of options, then use grep
|
||||
# to look for bad -Is and -Ls. Bad -Is and -Ls are ones that point to things
|
||||
# outside the ${SYSROOT}.
|
||||
--
|
||||
1.8.5.5
|
||||
|
@ -1 +0,0 @@
|
||||
DIST e2fsprogs-1.42.9.tar.gz 6069173 SHA256 2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802 SHA512 31041c45bc4e4a37fc4a1026424e15d4fc8fbf990c968fc9fba92861d9bec15f192dee8d5341cc2215af30a86b0bdb12d8a01f3c113b79a66c65f4a737136bb7 WHIRLPOOL 8fd7fb0ac22c41e9169902aba4cf0f3990897619f4709dd43c3a7153b710f6a869a123854fc9154b21b7088896737ae2e5283e56a8e15f8abd27f5f740e579f9
|
@ -1,150 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild,v 1.2 2014/01/18 05:15:33 vapier Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
case ${PV} in
|
||||
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
|
||||
*) UP_PV=${PV} ;;
|
||||
esac
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
|
||||
IUSE="nls static-libs elibc_FreeBSD"
|
||||
|
||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
||||
>=sys-apps/util-linux-2.16
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
sys-apps/texinfo"
|
||||
|
||||
S=${WORKDIR}/${P%_pre*}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ! -e ${EROOT}/etc/mtab ]] ; then
|
||||
# add some crap to deal with missing /etc/mtab #217719
|
||||
ewarn "No /etc/mtab file, creating one temporarily"
|
||||
echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/0001-e2fsck-skip-fixing-UUID.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
|
||||
if [[ ${CHOST} == *-mint* ]] ; then
|
||||
epatch "${FILESDIR}"/${PN}-1.41-mint.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
|
||||
fi
|
||||
# blargh ... trick e2fsprogs into using e2fsprogs-libs
|
||||
rm -rf doc
|
||||
sed -i -r \
|
||||
-e 's:@LIBINTL@:@LTLIBINTL@:' \
|
||||
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
|
||||
-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
|
||||
MCONFIG.in || die "muck libs" #122368
|
||||
sed -i -r \
|
||||
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
|
||||
Makefile.in || die "remove subdirs"
|
||||
|
||||
# Avoid rebuild
|
||||
touch lib/ss/ss_err.h
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Keep the package from doing silly things #261411
|
||||
export VARTEXFONTS=${T}/fonts
|
||||
|
||||
# needs open64() prototypes and friends
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
|
||||
# We want to use the "bsd" libraries while building on Darwin, but while
|
||||
# building on other Gentoo/*BSD we prefer elf-naming scheme.
|
||||
local libtype
|
||||
case ${CHOST} in
|
||||
*-darwin*) libtype=--enable-bsd-shlibs ;;
|
||||
*-mint*) libtype= ;;
|
||||
*) libtype=--enable-elf-shlibs ;;
|
||||
esac
|
||||
|
||||
ac_cv_path_LDCONFIG=: \
|
||||
econf \
|
||||
--with-root-prefix="${EPREFIX}/" \
|
||||
--enable-symlink-install \
|
||||
${libtype} \
|
||||
$(tc-has-tls || echo --disable-tls) \
|
||||
--without-included-gettext \
|
||||
$(use_enable nls) \
|
||||
--disable-libblkid \
|
||||
--disable-libuuid \
|
||||
--disable-quota \
|
||||
--disable-fsck \
|
||||
--disable-uuidd
|
||||
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
|
||||
eerror "INTL sanity check failed, aborting build."
|
||||
eerror "Please post your ${S}/config.log file as an"
|
||||
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
|
||||
die "Preventing included intl cruft from building"
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
|
||||
|
||||
# Build the FreeBSD helper
|
||||
if use elibc_FreeBSD ; then
|
||||
cp "${FILESDIR}"/fsck_ext2fs.c .
|
||||
emake fsck_ext2fs || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if [[ -r ${EROOT}/etc/mtab ]] ; then
|
||||
if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
|
||||
rm -f "${EROOT}"/etc/mtab
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# need to set root_libdir= manually as any --libdir options in the
|
||||
# econf above (i.e. multilib) will screw up the default #276465
|
||||
emake \
|
||||
STRIP=: \
|
||||
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D}" \
|
||||
install install-libs || die
|
||||
dodoc README RELEASE-NOTES
|
||||
|
||||
insinto /etc
|
||||
doins "${FILESDIR}"/e2fsck.conf || die
|
||||
|
||||
# Move shared libraries to /lib/, install static libraries to
|
||||
# /usr/lib/, and install linker scripts to /usr/lib/.
|
||||
gen_usr_ldscript -a e2p ext2fs
|
||||
# configure doesn't have an option to disable static libs :/
|
||||
use static-libs || find "${D}" -name '*.a' -delete
|
||||
|
||||
if use elibc_FreeBSD ; then
|
||||
# Install helpers for us
|
||||
into /
|
||||
dosbin "${S}"/fsck_ext2fs || die
|
||||
doman "${FILESDIR}"/fsck_ext2fs.8 || die
|
||||
|
||||
# filefrag is linux only
|
||||
rm \
|
||||
"${ED}"/usr/sbin/filefrag \
|
||||
"${ED}"/usr/share/man/man8/filefrag.8 || die
|
||||
fi
|
||||
}
|
@ -1,44 +0,0 @@
|
||||
From d1dffed0d15c80cfc69f133819d953d0342cf486 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Marineau <michael.marineau@coreos.com>
|
||||
Date: Sat, 18 Jan 2014 20:09:30 -0800
|
||||
Subject: [PATCH] e2fsck: skip fixing UUID on a mounted filesystem with csums
|
||||
|
||||
This fix is similar to 66457fcb for tune2fs. When booting from a root
|
||||
filesystem with an empty UUID which fsck fixes the following remount
|
||||
step reliably fails, leaving the filesystem in an inconsistent state.
|
||||
Like the tune2fs fix this patch resolves the issue by simply refusing to
|
||||
update the UUID if the filesystem is mounted.
|
||||
|
||||
Signed-off-by: Michael Marineau <michael.marineau@coreos.com>
|
||||
---
|
||||
|
||||
This patch is against master but is equally applicable to maint, it
|
||||
applies to maint with 1 line of fuzz (ext2fs_init_csum_seed).
|
||||
I've tested it on top of v1.42.9.
|
||||
|
||||
It may also be possible to fix this issue with a patch to ext4_remount
|
||||
in the kernel but I have not investigated that.
|
||||
|
||||
e2fsck/super.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/e2fsck/super.c b/e2fsck/super.c
|
||||
index 59c1f97..3c92df2 100644
|
||||
--- a/e2fsck/super.c
|
||||
+++ b/e2fsck/super.c
|
||||
@@ -734,8 +734,11 @@ void check_super_block(e2fsck_t ctx)
|
||||
#ifndef EXT2_SKIP_UUID
|
||||
/*
|
||||
* If the UUID field isn't assigned, assign it.
|
||||
+ * Skip if checksums are enabled and the filesystem is mounted,
|
||||
+ * if the id changes under the kernel remounting rw may fail.
|
||||
*/
|
||||
- if (!(ctx->options & E2F_OPT_READONLY) && uuid_is_null(sb->s_uuid)) {
|
||||
+ if (!(ctx->options & E2F_OPT_READONLY) && uuid_is_null(sb->s_uuid) &&
|
||||
+ (!csum_flag || !(ctx->mount_flags & EXT2_MF_MOUNTED))) {
|
||||
if (fix_problem(ctx, PR_0_ADD_UUID, &pctx)) {
|
||||
uuid_generate(sb->s_uuid);
|
||||
ext2fs_init_csum_seed(fs);
|
||||
--
|
||||
1.8.3.2
|
||||
|
@ -1,6 +0,0 @@
|
||||
# See the e2fsck.conf man page for more info
|
||||
|
||||
[options]
|
||||
|
||||
# allow fsck to run sanely at any point in time #142850
|
||||
buggy_init_scripts = yes
|
@ -1,11 +0,0 @@
|
||||
--- a/lib/ext2fs/ext2_fs.h
|
||||
+++ b/lib/ext2fs/ext2_fs.h
|
||||
@@ -414,7 +414,7 @@
|
||||
|
||||
#define i_size_high i_dir_acl
|
||||
|
||||
-#if defined(__KERNEL__) || defined(__linux__)
|
||||
+#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__)
|
||||
#define i_reserved1 osd1.linux1.l_i_reserved1
|
||||
#define i_frag osd2.linux2.l_i_frag
|
||||
#define i_fsize osd2.linux2.l_i_fsize
|
File diff suppressed because it is too large
Load Diff
@ -1,113 +0,0 @@
|
||||
On Darwin, create dylibs with a versioning scheme like Linux/ELF, not
|
||||
like BSD/ELF.
|
||||
This patch uses intentionally ELF_* vars to make it easier to diff
|
||||
against the ELF Makefile.
|
||||
|
||||
http://sourceforge.net/tracker/index.php?func=detail&aid=2555389&group_id=2406&atid=302406
|
||||
|
||||
--- lib/Makefile.darwin-lib
|
||||
+++ lib/Makefile.darwin-lib
|
||||
@@ -1,14 +1,15 @@
|
||||
#
|
||||
-# This is a Makefile stub which handles the creation of Darwin BSD shared
|
||||
-# libraries.
|
||||
+# This is a Makefile stub which handles the creation of Darwin shared
|
||||
+# libraries based on the ELF scheme.
|
||||
#
|
||||
# In order to use this stub, the following makefile variables must be defined.
|
||||
-#
|
||||
-# BSDLIB_VERSION = 1.0
|
||||
-# BSDLIB_IMAGE = libce
|
||||
-# BSDLIB_MYDIR = et
|
||||
-# BSDLIB_INSTALL_DIR = $(SHLIBDIR)
|
||||
-#
|
||||
+#
|
||||
+# ELF_VERSION = 1.0
|
||||
+# ELF_SO_VERSION = 1
|
||||
+# ELF_IMAGE = libce
|
||||
+# ELF_MYDIR = et
|
||||
+# ELF_INSTALL_DIR = $(SHLIBDIR)
|
||||
+# ELF_OTHER_LIBS = -lc
|
||||
|
||||
all:: image
|
||||
|
||||
@@ -16,36 +17,58 @@
|
||||
$(E) " MKDIR pic"
|
||||
$(Q) mkdir -p pic
|
||||
|
||||
-BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
|
||||
-BSDLIB_PIC_FLAG = -fPIC
|
||||
+ELF_LIB = $(ELF_IMAGE).$(ELF_VERSION).dylib
|
||||
+ELF_SONAME = $(ELF_IMAGE).$(ELF_SO_VERSION).dylib
|
||||
|
||||
-image: $(BSD_LIB)
|
||||
+image: $(ELF_LIB)
|
||||
|
||||
-$(BSD_LIB): $(OBJS)
|
||||
- $(E) " GEN_BSD_SOLIB $(BSD_LIB)"
|
||||
- $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
|
||||
- -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
|
||||
- $(Q) $(MV) pic/$(BSD_LIB) .
|
||||
- $(Q) $(RM) -f ../$(BSD_LIB)
|
||||
+$(ELF_LIB): $(OBJS)
|
||||
+ $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
|
||||
+ $(Q) (cd pic; $(CC) -dynamiclib -o $(ELF_LIB) $(LDFLAGS) \
|
||||
+ -Wl,-install_name,$(libdir)/$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
|
||||
+ $(Q) $(MV) pic/$(ELF_LIB) .
|
||||
+ $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).dylib ../$(ELF_SONAME)
|
||||
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
|
||||
- `echo $(my_dir) | sed -e 's;lib/;;'`/$(BSD_LIB) $(BSD_LIB))
|
||||
- $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(BSD_LIB) $(BSDLIB_IMAGE).dylib)
|
||||
-
|
||||
-install-shlibs install:: $(BSD_LIB)
|
||||
- $(E) " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
|
||||
- $(Q) $(INSTALL_PROGRAM) $(BSD_LIB) \
|
||||
- $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
|
||||
- -$(Q) $(LDCONFIG)
|
||||
+ `echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB))
|
||||
+ $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_IMAGE).dylib)
|
||||
+ $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
|
||||
+
|
||||
+installdirs-elf-lib::
|
||||
+ $(E) " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
|
||||
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
|
||||
+ $(DESTDIR)$(libdir)
|
||||
+
|
||||
+installdirs:: installdirs-elf-lib
|
||||
+
|
||||
+install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
|
||||
+ $(E) " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
|
||||
+ $(Q) $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
|
||||
+ $(E) " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
|
||||
+ $(Q) $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
|
||||
+ $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).dylib"
|
||||
+ $(Q) if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
|
||||
+ $(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib ; \
|
||||
+ else \
|
||||
+ $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
|
||||
+ $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib; \
|
||||
+ fi
|
||||
|
||||
install-strip: install
|
||||
+ $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
|
||||
+ $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
|
||||
+ --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
|
||||
|
||||
install-shlibs-strip: install-shlibs
|
||||
+ $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
|
||||
+ $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
|
||||
+ --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
|
||||
|
||||
uninstall-shlibs uninstall::
|
||||
- $(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
|
||||
+ $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
|
||||
+ $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
|
||||
+ $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib
|
||||
|
||||
clean::
|
||||
$(RM) -rf pic
|
||||
- $(RM) -f $(BSD_LIB)
|
||||
- $(RM) -f ../$(BSD_LIB)
|
||||
- $(RM) -f ../$(BSDLIB_IMAGE).dylib
|
||||
+ $(RM) -f $(ELF_LIB)
|
||||
+ $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).dylib ../$(ELF_SONAME)
|
@ -1,43 +0,0 @@
|
||||
http://bugs.gentoo.org/276055
|
||||
|
||||
<alanh@fairlite.co.uk>:
|
||||
The configure test program links against libblkid to test. This works
|
||||
fine on shared library systems as libblkid automatically depends on
|
||||
libuuid. But on static systems it needs explicit linking.
|
||||
|
||||
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -398,8 +398,8 @@
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(blkid, blkid_get_cache,
|
||||
- [LIBBLKID=`$PKG_CONFIG --libs blkid`;
|
||||
- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
|
||||
+ [LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
|
||||
+ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`],
|
||||
[AC_MSG_ERROR([external blkid library not found])],
|
||||
[$LIBBLKID])
|
||||
BLKID_CMT=#
|
||||
--- configure.old 2011-01-01 14:20:07.000000000 +0000
|
||||
+++ configure 2011-01-01 14:22:01.000000000 +0000
|
||||
@@ -5228,7 +5228,7 @@
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lblkid $LIBBLKID $LIBS"
|
||||
+LIBS="-lblkid -luuid $LIBBLKID $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -5259,8 +5259,8 @@
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
|
||||
$as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
|
||||
if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then :
|
||||
- LIBBLKID=`$PKG_CONFIG --libs blkid`;
|
||||
- STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
|
||||
+ LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
|
||||
+ STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`
|
||||
else
|
||||
as_fn_error "external blkid library not found" "$LINENO" 5
|
||||
fi
|
@ -1,10 +0,0 @@
|
||||
--- e2fsprogs-1.41.5/Makefile.in
|
||||
+++ e2fsprogs-1.41.5/Makefile.in
|
||||
@@ -281,6 +66,7 @@
|
||||
uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
|
||||
|
||||
install-libs: install-libs-recursive
|
||||
+install-libs-recursive: | install-shlibs-libs-recursive
|
||||
|
||||
uninstall-libs: uninstall-libs-recursive
|
||||
|
@ -1 +0,0 @@
|
||||
DIST e2fsprogs-libs-1.42.9.tar.gz 574130 SHA256 87778c5816bfab40cd5b1c64725b4f4c94c9cca42e74b6937211fbf6f3509667 SHA512 e68f9aef3415e95db85980c1677fb6c71338b69858a386e5eabab208121b0c26b37a2ceb9b60368492d365ab4161522dff0ba74cc69030d9bc5b4819762a9aed WHIRLPOOL da5ed2b45e01dbb836c9b7fafed0105329e883fdcd5915419886173be66956a240a2581c0517fc9dd1c5513be668ae9e416d46c5bde00b447c4624980872ce78
|
@ -1 +0,0 @@
|
||||
e2fsprogs-libs-1.42.9.ebuild
|
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild,v 1.3 2014/01/18 02:37:17 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
case ${PV} in
|
||||
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
|
||||
*) UP_PV=${PV} ;;
|
||||
esac
|
||||
|
||||
inherit toolchain-funcs eutils multilib-minimal
|
||||
|
||||
DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
|
||||
IUSE="nls static-libs"
|
||||
|
||||
RDEPEND="!sys-libs/com_err
|
||||
!sys-libs/ss
|
||||
!<sys-fs/e2fsprogs-1.41.8
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
DEPEND="nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig"
|
||||
|
||||
S=${WORKDIR}/${P%_pre*}
|
||||
|
||||
src_prepare() {
|
||||
printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
|
||||
epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# we use blkid/uuid from util-linux now
|
||||
ac_cv_lib_uuid_uuid_generate=yes \
|
||||
ac_cv_lib_blkid_blkid_get_cache=yes \
|
||||
ac_cv_path_LDCONFIG=: \
|
||||
ECONF_SOURCE="${S}" \
|
||||
econf \
|
||||
--disable-lib{blkid,uuid} \
|
||||
--disable-quota \
|
||||
$(tc-is-static-only || echo --enable-elf-shlibs) \
|
||||
$(tc-has-tls || echo --disable-tls) \
|
||||
$(use_enable nls)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake STRIP=: DESTDIR="${D}" install || die
|
||||
multilib_is_native_abi && gen_usr_ldscript -a com_err ss
|
||||
# configure doesn't have an option to disable static libs :/
|
||||
use static-libs || find "${ED}" -name '*.a' -delete
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
# double make sure that compile_et is being installed...
|
||||
test -f "${ED}/usr/bin/compile_et" || die "missing compile_et"
|
||||
}
|
@ -1,36 +0,0 @@
|
||||
From 947b1fe6c67b2399edd436c74408cb354c381e4a Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Tue, 31 Dec 2013 13:35:05 -0500
|
||||
Subject: [PATCH] fix build when quota is disabled
|
||||
|
||||
Building e2fsprogs-libs with quota disabled fails:
|
||||
|
||||
making all in lib/quota
|
||||
make[2]: Entering directory '.../lib/quota'
|
||||
make[2]: *** No rule to make target '.../lib/ext2fs/ext2_fs.h', needed by 'mkquota.o'. Stop.
|
||||
make[2]: *** Waiting for unfinished jobs....
|
||||
make[2]: Leaving directory '.../lib/quota'
|
||||
Makefile:380: recipe for target 'all-libs-recursive' failed
|
||||
make[1]: *** [all-libs-recursive] Error 1
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index f327d19..544ed02 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -13,7 +13,7 @@ INSTALL = @INSTALL@
|
||||
@DEBUGFS_CMT@DEBUGFS_DIR= debugfs
|
||||
@UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
|
||||
@BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
|
||||
-QUOTA_LIB_SUBDIR= lib/quota
|
||||
+@QUOTA_CMT@QUOTA_LIB_SUBDIR= lib/quota
|
||||
|
||||
LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
|
||||
PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
|
||||
--
|
||||
1.8.4.3
|
||||
|
@ -1,13 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.1 2012/09/18 23:45:34 chithanh Exp $
|
||||
|
||||
DESCRIPTION="Virtual for OpenGL utility library"
|
||||
HOMEPAGE=""
|
||||
SRC_URI=""
|
||||
LICENSE=""
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
RDEPEND="|| ( media-libs/glu media-libs/opengl-apple )"
|
||||
DEPEND=""
|
Loading…
x
Reference in New Issue
Block a user