diff options
author | Dennis Lamm <expeditioneer@gentoo.org> | 2018-01-12 11:44:19 +0100 |
---|---|---|
committer | Dennis Lamm <expeditioneer@gentoo.org> | 2018-01-12 11:44:19 +0100 |
commit | fd1977984d7b5512cec651884ab5463edea947b1 (patch) | |
tree | 3bfe51bda2e5c074ff7736fb97554274fb2ca38e /dev-libs | |
parent | app-text: (diff) | |
download | gnome-fd1977984d7b5512cec651884ab5463edea947b1.tar.gz gnome-fd1977984d7b5512cec651884ab5463edea947b1.tar.bz2 gnome-fd1977984d7b5512cec651884ab5463edea947b1.zip |
dev-libs/glib: drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/glib/Manifest | 24 | ||||
-rwxr-xr-x | dev-libs/glib/files/gengiotypefuncs.py | 45 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch | 44 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch | 93 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.46.0-r1.ebuild | 270 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.54.1.ebuild | 302 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.54.2.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/glib/glib-9999.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/glib/metadata.xml | 46 |
9 files changed, 30 insertions, 806 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index c4dd9b85..dcbbaf0c 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,26 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST glib-2.46.0.tar.xz 7188812 SHA256 b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4 SHA512 70c86c6e9ee08c5cb807a511c736264fb99df3c4c5b6a885b77948d8b62a6f6318218589338a1af19143e6aded76c11ec2b2cc290f33626821052508a86b41b1 WHIRLPOOL 954568652819786ae39e89dcdfcca41ad93c2f9cb431c6d81f54986e803e80dd78c0c214a1eae082214204ae52e0cfd35499a53f4266ea01918e7f1ab0285dfd -DIST glib-2.54.1.tar.xz 7829104 SHA256 50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3 SHA512 2971feede03540f5cd2b4bd60b0c3fcbd5ad95ba96d07f6e6d3f4a6b90c31555e52f3480b51976574642fd5ab99dd557061ee5db1a1855fc601297cd74a8f1a8 WHIRLPOOL d9d4ad62b3f00b900b5cc8c5ddc2af204a55a2584d1b9ef8f62fc6bd177ec626ec381b9ae08e4423aae814cef5ab56f8acf1ad3e38e40a02755269210dddb1de DIST glib-2.54.2.tar.xz 7830724 SHA256 bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c SHA512 09ee6fa3a6f3f15af229bd789bef536e3570f36d1e4ce624a57e97c4040577f6baccd6ab5746257863ccf7173b558cfa753951d562a278f854e52604104ba7ee WHIRLPOOL 8fd0253aca9e1d10ddd11771d80b60d5cc4c6cd4985af9e09784bff51d1255faa287dbad87a5fdcac32a8b7e2e0d30c18266081974edfdb2f4694925b166e188 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQKTBAEBCAB9FiEEhjiDzgE0H6m8d3Z/4FucaN0bWf0FAlpLomFfFIAAAAAALgAo -aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDg2 -Mzg4M0NFMDEzNDFGQTlCQzc3NzY3RkUwNUI5QzY4REQxQjU5RkQACgkQ4FucaN0b -Wf382w/+N+9dOpos10oLK0uRPna8KH8GHD7gysmhOpHsP8XfFfZIZbwnqoy4SOUM -nkT6eGr6ne9xR5SEwJYQyRyAAW4K55cwoJvZJksNs9Ji6/YNXw4gGC7DEsNPcvto -PVY+YzrtSTmWRX6sXsXZYtQgIYeeEgGMZXsg70AnMeeaR2Unn03fIdX8ePn27CgE -KeOhrf7DYc9w91rSQUpSKe8hQeYvmjHHvz+5jshWLEM0+cTggew1ZoTqNXdT5XR7 -9eRqzwHUiz/vtg82lvfK3yMY6nsNei4ui+hQsNuaoLVtr4W+8Es4BeHFlizR5V/j -oMLZ2bgFl/cnTnOvZGAcEg4hhq5CfZlKkdk/UHSjtx52Fwd/646yD8Pbd8sPoeLL -wsfzubz8/ERNJ/sk64JbccKMp0vat85fFyHI48Q8kObnLmCG5G04JB6JMTVGVyrj -I0lUqH2Cv7uUnT9ZMrIlhZS2x3l4LBaycr4oFshBXafQ7wVG16tsvvargtHogNhq -GI/eJQhf4hv2EMqeJbtaOaUcVaUoCNonC0vLHXt0yUtTYO7k2k17KmYrmecOWcXo -Z2I9CVbpVGgRvS8mHWvWn6ZNzO2e0XGUwBeYzlLx2N17Ys94wCip8I3BJYnHlaSW -plrQzGCU0lN8nhCwfCbGViKBFn/2N+FWghxsTN7e+p8riBloKDI= -=QutL ------END PGP SIGNATURE----- diff --git a/dev-libs/glib/files/gengiotypefuncs.py b/dev-libs/glib/files/gengiotypefuncs.py deleted file mode 100755 index 9732d789..00000000 --- a/dev-libs/glib/files/gengiotypefuncs.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -import sys -import re -import os - -debug = os.getenv('GIO_GENTYPEFUNCS_DEBUG') is not None - -out_file = sys.argv[1] -in_files = sys.argv[2:] - -funcs = [] - - -if debug: print ('Output file: ', out_file) - -if debug: print (len(in_files), 'input files') - -for filename in in_files: - if debug: print ('Input file: ', filename) - with open(filename, "r") as f: - for line in f: - line = line.rstrip('\n').rstrip('\r') - # print line - match = re.search(r'\bg_[a-zA-Z0-9_]*_get_type\b', line) - if match: - func = match.group(0) - if not func in funcs: - funcs.append(func) - if debug: print ('Found ', func) - -file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n' - -funcs = sorted(funcs) - -for f in funcs: - if f not in ['g_io_extension_get_type', 'g_settings_backend_get_type']: - file_output += '*tp++ = {0} ();\n'.format(f) - -if debug: print (len(funcs), 'functions') - -ofile = open(out_file, "w") -ofile.write(file_output) -ofile.close() diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch deleted file mode 100644 index 584b56f4..00000000 --- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Tue, 3 Jul 2012 11:21:56 +0300 -Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure - -https://bugzilla.gnome.org/show_bug.cgi?id=679306 ---- - glib/tests/thread.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/glib/tests/thread.c b/glib/tests/thread.c -index 539782e..179ec06 100644 ---- a/glib/tests/thread.c -+++ b/glib/tests/thread.c -@@ -124,6 +124,8 @@ test_thread3 (void) - g_assert_cmpint (GPOINTER_TO_INT(result), ==, 9); - } - -+#if 0 -+// https://bugzilla.gnome.org/show_bug.cgi?id=679306 - /* test that thread creation fails as expected, - * by setting RLIMIT_NPROC ridiculously low - */ -@@ -158,6 +160,7 @@ test_thread4 (void) - g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret)); - #endif - } -+#endif - - static void - test_thread5 (void) -@@ -203,7 +206,9 @@ main (int argc, char *argv[]) - g_test_add_func ("/thread/thread1", test_thread1); - g_test_add_func ("/thread/thread2", test_thread2); - g_test_add_func ("/thread/thread3", test_thread3); -+#if 0 - g_test_add_func ("/thread/thread4", test_thread4); -+#endif - g_test_add_func ("/thread/thread5", test_thread5); - g_test_add_func ("/thread/thread6", test_thread6); - --- -1.8.3.2 - diff --git a/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch deleted file mode 100644 index 162d7fa7..00000000 --- a/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 9cd151075..2b907f66b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -372,14 +372,14 @@ AC_SUBST(REBUILD) - # option to specify python interpreter to use; this just sets $PYTHON, so that - # we will fallback to reading $PYTHON if --with-python is not given, and - # python.m4 will get the expected input --AC_ARG_WITH(python, -- AS_HELP_STRING([--with-python=PATH], -- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), -- [PYTHON="$withval"], []) --if test x"$PYTHON" = xyes; then -- AC_MSG_ERROR([--with-python option requires a path or program argument]) --fi --AM_PATH_PYTHON(2.7,,PYTHON="python2.7") -+# AC_ARG_WITH(python, -+# AS_HELP_STRING([--with-python=PATH], -+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), -+# [PYTHON="$withval"], []) -+# if test x"$PYTHON" = xyes; then -+# AC_MSG_ERROR([--with-python option requires a path or program argument]) -+# fi -+# AM_PATH_PYTHON(2.7,,PYTHON="python2.7") - - - dnl *********************** -@@ -3475,7 +3475,6 @@ gobject/glib-mkenums - gobject/tests/Makefile - gthread/Makefile - gio/Makefile --gio/gdbus-2.0/codegen/Makefile - gio/gdbus-2.0/codegen/config.py - gio/gnetworking.h - gio/xdgmime/Makefile -diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 5741a3edc..d38e768ff 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -177,7 +177,6 @@ man_MANS += \ - gsettings.1 \ - gresource.1 \ - gdbus.1 \ -- gdbus-codegen.1 \ - gio.1 \ - $(NULL) - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 1ffe0cc6f..bfd7b535e 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -1,6 +1,6 @@ - include $(top_srcdir)/glib.mk - --SUBDIRS = gdbus-2.0/codegen -+SUBDIRS = - - if OS_UNIX - SUBDIRS += xdgmime -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index 4e269dc26..0bcc16899 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -461,10 +461,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica - - BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h - gdbus-test-codegen.o: gdbus-test-codegen-generated.h --gdbus-test-codegen-generated.h: 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: 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 1d0464c5c..b0ce60ca7 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ - $(NULL) - --$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ - --c-namespace Example \ - --c-generate-object-manager \ diff --git a/dev-libs/glib/glib-2.46.0-r1.ebuild b/dev-libs/glib/glib-2.46.0-r1.ebuild deleted file mode 100644 index 9534f7ad..00000000 --- a/dev-libs/glib/glib-2.46.0-r1.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Until bug #537330 glib is a reverse dependency of pkgconfig and, then -# adding new dependencies end up making stage3 to grow. Every addition needs -# then to be think very closely. - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) -# 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. -GCONF_DEBUG="yes" -# Completely useless with or without USE static-libs, people need to use -# pkg-config -GNOME2_LA_PUNT="yes" - -inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \ - pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="http://www.gtk.org/" -SRC_URI="${SRC_URI} - http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf - -LICENSE="LGPL-2+" -SLOT="2" -IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr" -REQUIRED_USE=" - utils? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -RDEPEND=" - !<dev-util/gdbus-codegen-${PV} - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) - utils? ( - ${PYTHON_DEPS} - >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] - || ( - >=dev-libs/elfutils-0.142 - >=dev-libs/libelf-0.8.12 - >=sys-freebsd/freebsd-lib-9.2_rc1 - ) - ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-libs/libxslt-1.0 - >=sys-devel/gettext-0.11 - >=dev-util/gtk-doc-am-1.20 - systemtap? ( >=dev-util/systemtap-1.3 ) - test? ( - sys-devel/gdb - ${PYTHON_DEPS} - >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] - >=sys-apps/dbus-1.2.14 ) - !<dev-util/gtk-doc-1.15-r2 -" -# gobject-introspection blocker to ensure people don't mix -# different g-i and glib major versions - -PDEPEND="!<gnome-base/gvfs-1.6.4-r990 - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 -# Earlier versions of gvfs do not work with glib - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - export IPV6_DISABLED="yes" - fi - linux-info_pkg_setup - fi -} - -src_prepare() { - # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die - - if use test; then - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die - sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die - sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - ewarn "Some tests will be skipped due to missing terminal program" - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - fi - - # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 - if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then - ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" - ewarn "not being present on your system, think on installing them to get these tests run." - sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die - sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die - sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die - sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die - sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die - sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die - sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die - # needed to prevent gdbus-threading from asserting - ln -sfn $(type -P true) gio/tests/gdbus-testserver.py - fi - - # Some tests need ipv6, upstream bug #667468 - if [[ -n "${IPV6_DISABLED}" ]]; then - sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die - sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die - sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die - fi - - # thread test fails, upstream bug #679306 - # FIXME: we need to check if it's still failing as upstream thinks something - # is wrong in our setups - #epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" - - # This test is prone to fail, bug #504024, upstream bug #723719 - sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die - fi - - # gdbus-codegen is a separate package - epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch" - - # leave python shebang alone - sed -e '/${PYTHON}/d' \ - -i glib/Makefile.{am,in} || die - - # Gentoo handles completions in a different directory - sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ - gio/Makefile.am || die - - epatch_user - - # Also needed to prevent cross-compile failures, see bug #267603 - eautoreconf - - gnome2_src_prepare - - epunt_cxx -} - -multilib_src_configure() { - # Avoid circular depend with dev-util/pkgconfig and - # native builds (cross-compiles won't need pkg-config - # in the target ROOT to work here) - if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then - if has_version sys-apps/dbus; then - export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" - export DBUS1_LIBS="-ldbus-1" - fi - export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" - export LIBFFI_LIBS="-lffi" - fi - - local myconf - - case "${CHOST}" in - *-mingw*) myconf="${myconf} --with-threads=win32" ;; - *) myconf="${myconf} --with-threads=posix" ;; - esac - - # FIXME: Always use internal libpcre, bug #254659 - # (maybe consider going back to system lib) - # libelf used only by the gresource bin - ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ - $(use_enable xattr) \ - $(use_enable fam) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_enable systemtap dtrace) \ - $(use_enable systemtap systemtap) \ - $(multilib_native_use_enable utils libelf) \ - --disable-compile-warnings \ - --enable-man \ - --with-pcre=internal \ - --with-xml-catalog="${EPREFIX}/etc/xml/catalog" - - if multilib_is_native_abi; then - local d - for d in glib gio gobject; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_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" - unset GSETTINGS_BACKEND # bug 352451 - export LC_TIME=C # bug #411967 - python_export_best - - # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - - # Hardened: gdb needs this, bug #338891 - if host-is-pax ; then - pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ - || die "Hardened adjustment failed" - fi - - # Need X for dbus-launch session X11 initialization - Xemake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - DOCS="AUTHORS ChangeLog* NEWS* README" - einstalldocs - - if use utils ; then - python_replicate_script "${ED}"/usr/bin/gtester-report - else - rm "${ED}usr/bin/gtester-report" - rm "${ED}usr/share/man/man1/gtester-report.1" - fi - - # Do not install charset.alias even if generated, leave it to libiconv - rm -f "${ED}/usr/lib/charset.alias" - - # Don't install gdb python macros, bug 291328 - rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" -} - -pkg_postinst() { - gnome2_pkg_postinst - if has_version '<x11-libs/gtk+-3.0.12:3'; then - # To have a clear upgrade path for gtk+-3.0.x users, have to resort to - # a warning instead of a blocker - ewarn - ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes." - ewarn "You should upgrade to a newer version of gtk+:3 immediately." - fi -} diff --git a/dev-libs/glib/glib-2.54.1.ebuild b/dev-libs/glib/glib-2.54.1.ebuild deleted file mode 100644 index 857d07cc..00000000 --- a/dev-libs/glib/glib-2.54.1.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Until bug #537330 glib is a reverse dependency of pkgconfig and, then -# adding new dependencies end up making stage3 to grow. Every addition needs -# then to be think very closely. - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -# Completely useless with or without USE static-libs, people need to use -# pkg-config -GNOME2_LA_PUNT="yes" - -inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ - multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="https://www.gtk.org/" -SRC_URI="${SRC_URI} - https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf - -LICENSE="LGPL-2.1+" -SLOT="2" -IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" -REQUIRED_USE=" - utils? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -# Added util-linux multilib dependency to have libmount support (which -# is always turned on on linux systems, unless explicitly disabled, but -# this ebuild does not do that anyway) (bug #599586) - -RDEPEND=" - !<dev-util/gdbus-codegen-${PV} - >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) - utils? ( - ${PYTHON_DEPS} - >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] - virtual/libelf:0= - ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-libs/libxslt-1.0 - >=sys-devel/gettext-0.11 - >=dev-util/gtk-doc-am-1.20 - systemtap? ( >=dev-util/systemtap-1.3 ) - test? ( - sys-devel/gdb - ${PYTHON_DEPS} - >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] - >=sys-apps/dbus-1.2.14 ) - !<dev-util/gtk-doc-1.15-r2 -" -PDEPEND="!<gnome-base/gvfs-1.6.4-r990 - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 -# Earlier versions of gvfs do not work with glib - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules$(get_exeext) -) - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test ; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi -} - -src_prepare() { - # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die - - if use test; then - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - ewarn "Some tests will be skipped due to missing terminal program" - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - fi - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - - ewarn "Tests for search-utils have been skipped" - sed -i -e "/search-utils/d" glib/tests/Makefile.am || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die - fi - - # gdbus-codegen is a separate package - eapply "${FILESDIR}"/${PN}-2.54.1-external-gdbus-codegen.patch - - # Leave python shebang alone - handled by python_replicate_script - # We could call python_setup and give configure a valid --with-python - # arg, but that would mean a build dep on python when USE=utils. - sed -e '/${PYTHON}/d' \ - -i glib/Makefile.{am,in} || die - - sed -e 's:@PYTHON@:python:' \ - -i gobject/glib-{genmarshal,mkenums}.in || die - # Also needed to prevent cross-compile failures, see bug #267603 - eautoreconf - - gnome2_src_prepare - - epunt_cxx -} - -multilib_src_configure() { - # Avoid circular depend with dev-util/pkgconfig and - # native builds (cross-compiles won't need pkg-config - # in the target ROOT to work here) - if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then - if has_version sys-apps/dbus; then - export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" - export DBUS1_LIBS="-ldbus-1" - fi - export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" - export LIBFFI_LIBS="-lffi" - export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass - export PCRE_LIBS="-lpcre" - fi - - # These configure tests don't work when cross-compiling. - if tc-is-cross-compiler ; then - # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - case ${CHOST} in - hppa*|metag*) export glib_cv_stack_grows=yes ;; - *) export glib_cv_stack_grows=no ;; - esac - # https://bugzilla.gnome.org/show_bug.cgi?id=756474 - export glib_cv_uscore=no - # https://bugzilla.gnome.org/show_bug.cgi?id=756475 - export ac_cv_func_posix_get{pwuid,grgid}_r=yes - fi - - local myconf - - case "${CHOST}" in - *-mingw*) myconf="${myconf} --with-threads=win32" ;; - *) myconf="${myconf} --with-threads=posix" ;; - esac - - # libelf used only by the gresource bin - ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable xattr) \ - $(use_enable fam) \ - $(use_enable kernel_linux libmount) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_enable systemtap dtrace) \ - $(use_enable systemtap systemtap) \ - $(multilib_native_use_enable utils libelf) \ - --disable-compile-warnings \ - --enable-man \ - --with-pcre=system \ - --with-xml-catalog="${EPREFIX}/etc/xml/catalog" - - if multilib_is_native_abi; then - local d - for d in glib gio gobject; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - 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 LC_TIME=C # bug #411967 - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - - # Hardened: gdb needs this, bug #338891 - if host-is-pax ; then - pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ - || die "Hardened adjustment failed" - fi - - # Need X for dbus-launch session X11 initialization - virtx emake check -} - -multilib_src_install() { - gnome2_src_install completiondir="$(get_bashcompdir)" - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - einstalldocs - - if use utils ; then - python_replicate_script "${ED}"/usr/bin/gtester-report - else - rm "${ED}usr/bin/gtester-report" - rm "${ED}usr/share/man/man1/gtester-report.1" - fi - - # Do not install charset.alias even if generated, leave it to libiconv - rm -f "${ED}/usr/lib/charset.alias" - - # Don't install gdb python macros, bug 291328 - rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" -} - -pkg_preinst() { - gnome2_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - # force (re)generation of gschemas.compiled - GNOME2_ECLASS_GLIB_SCHEMAS="force" - - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled - fi -} diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.2.ebuild index 45b1f9de..46a5e3ee 100644 --- a/dev-libs/glib/glib-2.54.2.ebuild +++ b/dev-libs/glib/glib-2.54.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then @@ -27,7 +27,7 @@ REQUIRED_USE=" test? ( ${PYTHON_REQUIRED_USE} ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" # Added util-linux multilib dependency to have libmount support (which # is always turned on on linux systems, unless explicitly disabled, but diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild index 330eb7f6..bb0f63b6 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # Until bug #537330 glib is a reverse dependency of pkgconfig and, then # adding new dependencies end up making stage3 to grow. Every addition needs @@ -161,11 +160,6 @@ src_prepare() { sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die fi - # thread test fails, upstream bug #679306 - # FIXME: we need to check if it's still failing as upstream thinks something - # is wrong in our setups - #epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" - # This test is prone to fail, bug #504024, upstream bug #723719 sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die else diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml index b73f9ed9..b88ccebb 100644 --- a/dev-libs/glib/metadata.xml +++ b/dev-libs/glib/metadata.xml @@ -1,23 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="dbus">Enable dependencies required by glib libraries - using dbus service to manage settings saving</flag> - <flag name="mime">Pull in shared MIME database that many glib-based - applications require at runtime to detect or open files. Warning: - do not disable this flag unless installing on a headless server.</flag> - <flag name="systemtap">Build support for profiling and tracing using - <pkg>dev-util/systemtap</pkg></flag> - <flag name="utils">Install gtester-report utility to generate test - report files for your software; build gresource utility with - ELF support.</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> - </upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="dbus"> + Enable dependencies required by glib libraries + using dbus service to manage settings saving + </flag> + <flag name="mime"> + Pull in shared MIME database that many glib-based + applications require at runtime to detect or open files. Warning: + do not disable this flag unless installing on a headless server. + </flag> + <flag name="systemtap"> + Build support for profiling and tracing using + <pkg>dev-util/systemtap</pkg> + </flag> + <flag name="utils"> + Install gtester-report utility to generate test + report files for your software; build gresource utility with + ELF support. + </flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> + </upstream> </pkgmetadata> |