diff options
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/Manifest | 7 | ||||
| -rw-r--r-- | dev-libs/glib/files/external-gdbus-codegen.patch | 100 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.12.12-fbsd.patch | 21 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch | 20 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.24-assert-test-failure.patch | 10 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.30.1-homedir-env.patch | 61 | ||||
| -rw-r--r-- | dev-libs/glib/glib-9999-r1.ebuild | 226 |
7 files changed, 0 insertions, 445 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest deleted file mode 100644 index e6db4d9c..00000000 --- a/dev-libs/glib/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX external-gdbus-codegen.patch 3606 RMD160 18a1f414c10a14fc5628c804952e1caf1bda1a86 SHA1 9a3176cc9223e383a752623b9ebbe2b81c1f9c1d SHA256 ab33c9cea821b9f99145ba4ebc68ddb8d6049a844641553959904793125ed8a9 -AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d -AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb -AUX glib-2.24-assert-test-failure.patch 451 RMD160 8528793f4b8d0ebff3c841dbf418b49a8d3faf5e SHA1 18b61527c8c31fa497161949e4ecf5f42251b11d SHA256 a4a671669a4d1ba4f5cc9cff55b77bde28a63d86e6aba9567ea6d310dfc24f22 -AUX glib-2.30.1-homedir-env.patch 1849 RMD160 2bbe190e2d6ee96cb33dcfe37c1ff227ea4e8ca9 SHA1 42077f9373acce576b4eb811b6464f0332db7711 SHA256 4f0e149703a9aadc4fb568b9fa00419b9848b345b19d3cc9e1a2bd67985ea25b -DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af -EBUILD glib-9999-r1.ebuild 7918 RMD160 41a24ff633a56a0d55cd9d84daa6ca9a0a4fbb9a SHA1 a8325dd22598c7d24e3fb8aa95f90627f8a7dca4 SHA256 f796f5af2c8e1315554df3023daa7ad3a8a9e06fcec8a17357e693226d7a1e24 diff --git a/dev-libs/glib/files/external-gdbus-codegen.patch b/dev-libs/glib/files/external-gdbus-codegen.patch deleted file mode 100644 index 1560a5bf..00000000 --- a/dev-libs/glib/files/external-gdbus-codegen.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 05dccf57fa9b3f9ead8168ea80996bcb06cdb448 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Wed, 1 Feb 2012 14:46:28 +0100 -Subject: [PATCH] extrernal gdbus-codegen - -Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> ---- - 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..d77f98f 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 d9227b9..ca4a75c 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 f11a992..39a60b9 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.9.106.g2a2aa.dirty - diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch deleted file mode 100644 index bba63296..00000000 --- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch +++ /dev/null @@ -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 diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch deleted file mode 100644 index cabe56f5..00000000 --- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch +++ /dev/null @@ -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 - } - } - } diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch deleted file mode 100644 index 1c68b7b3..00000000 --- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \ - fail "failed to run gdb" - diff --git a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch deleted file mode 100644 index 30d44997..00000000 --- a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: Handle the G_HOME environment variable to override the passwd entry - This will allow to fix various kinds of build failures due to restricted - build environments. -Author: Josselin Mouette <joss@debian.org> -Origin: vendor - ---- a/docs/reference/glib/running.sgml -+++ b/docs/reference/glib/running.sgml -@@ -213,6 +213,22 @@ - </para> - </formalpara> - -+<formalpara id="G_HOME"> -+ <title><envar>G_HOME</envar></title> -+ -+ <para> -+ For various reasons, GLib applications ignore the <envar>HOME</envar> -+ environment variable on Unix systems and will use the user directory -+ as specified by the <filename>passwd</filename> entry, which is more -+ reliable. -+ </para> -+ <para> -+ The <envar>G_HOME</envar> environment variable will override any -+ other setting for the home directory. It is not meant for daily usage, -+ but it is useful in testing or building environments. -+ </para> -+</formalpara> -+ - </refsect2> - - <refsect2 id="setlocale"> ---- a/glib/gutils.c -+++ b/glib/gutils.c -@@ -1626,11 +1626,14 @@ - } - #endif /* !G_OS_WIN32 */ - -+ g_home_dir = g_strdup (g_getenv ("G_HOME")); -+ - #ifdef G_OS_WIN32 - /* We check $HOME first for Win32, though it is a last resort for Unix - * where we prefer the results of getpwuid(). - */ -- g_home_dir = g_strdup (g_getenv ("HOME")); -+ if (!g_home_dir) -+ g_home_dir = g_strdup (g_getenv ("HOME")); - - /* Only believe HOME if it is an absolute path and exists */ - if (g_home_dir) -@@ -1926,6 +1929,11 @@ - * homedir = g_get_home_dir (<!-- -->); - * ]| - * -+ * However, to allow changing this value for testing and development -+ * purposes, the value of the <envar>G_HOME</envar> environment -+ * variable, if set, will override the <filename>passwd</filename> -+ * entry. -+ * - * Returns: the current user's home directory - */ - G_CONST_RETURN gchar* diff --git a/dev-libs/glib/glib-9999-r1.ebuild b/dev-libs/glib/glib-9999-r1.ebuild deleted file mode 100644 index 7f3a5763..00000000 --- a/dev-libs/glib/glib-9999-r1.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -PYTHON_DEPEND="utils? 2" -# Avoid runtime dependency on python when USE=test - -inherit autotools bash-completion-r1 gnome2-live libtool eutils flag-o-matic multilib pax-utils python virtualx - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="http://www.gtk.org/" -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 +introspection selinux +static-libs systemtap test utils xattr" -KEYWORDS="" - -RDEPEND="virtual/libiconv - virtual/libffi - sys-libs/zlib - 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/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="introspection? ( dev-libs/gobject-introspection ) - !<gnome-base/gvfs-1.6.4-r990" # Earlier versions 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 -} - -src_prepare() { - gnome2-live_src_prepare - mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die - - # 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 - - 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 - - # 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}/external-gdbus-codegen.patch" - - # Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568 - epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.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 - - epunt_cxx -} - -src_configure() { - # Avoid circular depend with dev-util/pkgconfig - if ! has_version dev-util/pkgconfig; 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) \ - --enable-regex \ - --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/" - - # This is there for git snapshots and the live ebuild, bug 351966 - emake README || die "emake README failed" - dodoc AUTHORS ChangeLog* NEWS* README - - for f in gdbus gsettings; do - newbashcomp "${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 "${E}" -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 -} - -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 -} |