aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2017-02-22 17:46:48 -0800
committerAric Belsito <lluixhi@gmail.com>2017-02-22 17:46:48 -0800
commit0d6487d861eb3c4cfab4377f089b4fe73e9c1a48 (patch)
tree50cbd1d5887d616430af0c20894b17172d3ac6c6 /dev-libs/glib
parentmedia-libs/libv4l: sync with tree (diff)
downloadmusl-0d6487d861eb3c4cfab4377f089b4fe73e9c1a48.tar.gz
musl-0d6487d861eb3c4cfab4377f089b4fe73e9c1a48.tar.bz2
musl-0d6487d861eb3c4cfab4377f089b4fe73e9c1a48.zip
dev-libs/glib: remove 2.46.2-r3
no longer in tree.
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/Manifest8
-rw-r--r--dev-libs/glib/files/glib-2.46.2-fix-gstrerror-on-non-glibc.patch30
-rw-r--r--dev-libs/glib/files/glib-2.46.2-memleak.patch25
-rw-r--r--dev-libs/glib/files/glib-2.46.2-musl.patch98
-rw-r--r--dev-libs/glib/files/glib-2.48.0-GContextSpecificGroup.patch44
-rw-r--r--dev-libs/glib/glib-2.46.2-r3.ebuild323
-rw-r--r--dev-libs/glib/glib-2.48.2.ebuild4
7 files changed, 3 insertions, 529 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 0cd28de..4f1405f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,12 +1,6 @@
AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256 d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a SHA512 2f960a53cf51f809af6788664e2cd6d67a29eb58dfe34156f665e2d5ae1fd53a3c792714672fc82dcbfae38e1c793a3eef07116484511ef21d96536559339b00 WHIRLPOOL 39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0
-AUX glib-2.46.2-fix-gstrerror-on-non-glibc.patch 844 SHA256 2c4c622cf7a7236c73b4665ed3b202dbf6236bb11bdacf17b3cba023f90b280c SHA512 262f1d0314a8292c447d5561695b71ae9e27aabe3d94f2a40d78910ee93dd02b1f12ea515ae9c04c75c5ede9e256bf01a427090fdc005738d12d8aa1a0f594d0 WHIRLPOOL 5ea3133b31c523e220190e4157914e1dfa1cd599db8e02c0dfb8fc78378a0b0eb011234769814dfa1c91580967780b1f1225b91794e98759c16d1e9ef6f7fb2e
-AUX glib-2.46.2-memleak.patch 711 SHA256 baa9a70ea17bc0f78bc4c8353af28cc22fd16a1a94e5898757a87bddffd8762e SHA512 f6a52034744b3725ffd7219abbd9df8dfb562d31db2f846a86352a2481e8f5ae28b77a0bd2a19955e17c7ec9de7723a495367be051dc568d3498521ff58c4be6 WHIRLPOOL 0ded676353a97e327901ea66a8ddf85156c85143d19a4a3786d24e90ceed0fe36fef1effdeaa648b0404e58930c1ba2df6a65ea7e8a106bb3e84ea0a6b610609
-AUX glib-2.46.2-musl.patch 2497 SHA256 a9449e3f36725cdf19931fb0987de65779decb6a0fb214d384a1b32f17aeb036 SHA512 30b46bb13749d2879f84e1980fbaccb381fffe29c8d07ed0825ddc07421778cbf77896e18cb0bc1ebf9d0ff9c95064f05de81e5d78df2b9660117f6e85aa9adb WHIRLPOOL e24a6b68748330b0c62ad362aa6df2989511ddc86cd5aec582883b87ff1b6825d975f1f12126ba85fa6871d1a2f343b7a5057b81b23ce69da3dbb8f24708c94f
-AUX glib-2.48.0-GContextSpecificGroup.patch 1637 SHA256 3e0e6250775482357cd8727ad270a473be7c24431afa5445f9ac4214802a8fad SHA512 ed850d1455ac619ea97c8a82eb7f6a768882e9e1dbdfcffcf143cf3cddd46ea073d6b25c811eaa14a789d06f4cc2cf13c09541565eb34ed9bf616c8dea825e45 WHIRLPOOL 004196759130baeba4b4e72601dfaa25bf8c0e49b1d09222b21a6c51b9c84b6bf6b799bbfedf931d3eabbad91371017b5c61799c879d99aabaaf3cdaf11cbf0e
AUX glib-2.48.2-musl-glibmm.patch 1496 SHA256 17cd23f9bea7eaa0ed4c3a83e894392d3d6824a462790cb1e3b6f10d591b9448 SHA512 6656b6c40366c43e48916a1851319f0a6b939ae5f1c78b9496930f47b566ab17924ee031ed6a0ea9beb8a4b1fc37b66ef1784b4a95a890dd71410717175509e7 WHIRLPOOL afc16f2a772a474f92eec77d666b88c88b6a96e2ded4b1e4e02f824bea7a903ead48ed2cdc1ab0f273f7e1d492e99bb5ae5e3545ffa3318e2fe56538d0a55d85
-DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
-EBUILD glib-2.46.2-r3.ebuild 10585 SHA256 c10f4010878f10ef32fb3b6d4331a37dfbf2eb94ab06d40ecf7e35a5537258e2 SHA512 b5bc42c6d6a42dfad750cf1ef4c3cfc9f19bb79777ba3846b0a797d0c75d25444114cd9698cf5e4291bfdd3cc2046fac8b45ed39ae54c59cd3e5354588fbeca7 WHIRLPOOL 7869514a3ba96faf4d98f0cd9e1018175bbba3568ac1948b5ee607452f8a863d675ddc2790b513fa7d7211595e2829a167803097fbabd71434b7c0556656d9fe
-EBUILD glib-2.48.2.ebuild 8622 SHA256 f4d7799843b62ca2e8f2719b235908843e55ff8ccf071179b9f5b752152c5d86 SHA512 35f6798fc2b090133f71228ca60be1ddf3044cccce7a9fc7ea0548a8db59e260a193a6e77b33b1967c85061551f1a96aa96bae4cda7b0715221cb23b32757f42 WHIRLPOOL 96f9771197b83ec7119df9d059735443ebd91ec3ac1a0756b7fbed48c2870b11fd48b11bf982e604895332309d2ed9c683833b4c1a9e7d19c2750129a3804ab7
+EBUILD glib-2.48.2.ebuild 8617 SHA256 2b64e2ebb7ecc6eda84de3254e5ce8ae984b60ddc3c54e20652059ec2eded32d SHA512 ea1327f401eae1ad945602e4e686a396ff6c90115beb161e6703fd102f534ef3e02104abdf9d9404307f66997fca2500013e63967f698dbd0e290a5c073b2e56 WHIRLPOOL f58d2c94fea90aef272e0009a5da9b01f216df26432b390c421985804bb19ba03a47c95b29d2e2a2e103bbc1a65af65154ba9e3aa6332629df66a03600daec51
MISC metadata.xml 955 SHA256 424ffc685dcfdfa5dcb142046d937915d07945217db814ff759b9b736d67f9e4 SHA512 31b87bd850ffaa3f2263e6435d2929ef9f8f979e6fe6cff86433c8841dc383088bc6d672ac7daf94c1ef660767d0e91a03860267df9c750dcde3204dd6631cb1 WHIRLPOOL cf59bd50dcfcc466ad19a81f458875b7e62fc569cda4f730defdbed72f0112395b332b52574c5794539c8e0255f7abaa9e7f14a9c5bb5fd6048ad3c4c35991c8
diff --git a/dev-libs/glib/files/glib-2.46.2-fix-gstrerror-on-non-glibc.patch b/dev-libs/glib/files/glib-2.46.2-fix-gstrerror-on-non-glibc.patch
deleted file mode 100644
index b0db991..0000000
--- a/dev-libs/glib/files/glib-2.46.2-fix-gstrerror-on-non-glibc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From feb4fb2842ef123b16b0cdf8d50be192e30862be Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Mon, 16 Nov 2015 16:57:38 -0500
-Subject: Fix g_strerror() on non-glibc
-
-When using one of the codepaths that copies the error string into buf,
-make sure the string gets strdup() afterward.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758194
----
- glib/gstrfuncs.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index 6712a64..0e2498f 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -1293,6 +1293,8 @@ g_strerror (gint errnum)
- if (error)
- g_print ("%s\n", error->message);
- }
-+ else if (msg == (const gchar *)buf)
-+ msg = g_strdup (buf);
-
- g_hash_table_insert (errors, GINT_TO_POINTER (errnum), (char *) msg);
- }
---
-cgit v0.12
-
-
diff --git a/dev-libs/glib/files/glib-2.46.2-memleak.patch b/dev-libs/glib/files/glib-2.46.2-memleak.patch
deleted file mode 100644
index e9eca2a..0000000
--- a/dev-libs/glib/files/glib-2.46.2-memleak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e98e1eff83c742c73a148dd7b75c00d77e0cee40 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Wed, 25 Nov 2015 23:29:18 +0200
-Subject: GDBusProxy: Fix a memory leak during initialization
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758641
----
- gio/gdbusproxy.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
-index 52a22fb..7b1140f 100644
---- a/gio/gdbusproxy.c
-+++ b/gio/gdbusproxy.c
-@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable *initable,
- if (result != NULL)
- {
- process_get_all_reply (proxy, result);
-+ g_variant_unref (result);
- }
-
- proxy->priv->initialized = TRUE;
---
-cgit v0.12
-
diff --git a/dev-libs/glib/files/glib-2.46.2-musl.patch b/dev-libs/glib/files/glib-2.46.2-musl.patch
deleted file mode 100644
index a61708a..0000000
--- a/dev-libs/glib/files/glib-2.46.2-musl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Reverting commit https://github.com/GNOME/glib/commit/2fe992b099bfd3fb121a71b7af43e116b2142b5d
-
-musl's does not run ctors in the assumed order that glib-2.46 expects:
-
-- glib_init() should be called before gobject_init_ctor().
-
-
-diff --git glib/glib-init.c glib/glib-init.c
-index e7002e6..24efe9d 100644
---- glib/glib-init.c
-+++ glib/glib-init.c
-@@ -233,7 +233,6 @@ glib_init (void)
- {
- g_messages_prefixed_init ();
- g_debug_init ();
-- g_quark_init ();
- }
-
- #if defined (G_OS_WIN32)
-diff --git glib/glib-init.h glib/glib-init.h
-index b56f7e2..de6be78 100644
---- glib/glib-init.h
-+++ glib/glib-init.h
-@@ -25,8 +25,6 @@
- extern GLogLevelFlags g_log_always_fatal;
- extern GLogLevelFlags g_log_msg_prefix;
-
--void g_quark_init (void);
--
- #ifdef G_OS_WIN32
- #include <windows.h>
-
-diff --git glib/gquark.c glib/gquark.c
-index 9e51a92..d620533 100644
---- glib/gquark.c
-+++ glib/gquark.c
-@@ -40,7 +40,6 @@
- #include "gthread.h"
- #include "gtestutils.h"
- #include "glib_trace.h"
--#include "glib-init.h"
-
- #define QUARK_BLOCK_SIZE 2048
- #define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))
-@@ -54,16 +53,6 @@ static gint quark_seq_id = 0;
- static gchar *quark_block = NULL;
- static gint quark_block_offset = 0;
-
--void
--g_quark_init (void)
--{
-- g_assert (quark_seq_id == 0);
-- quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
-- quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
-- quarks[0] = NULL;
-- quark_seq_id = 1;
--}
--
- /**
- * SECTION:quarks
- * @title: Quarks
-@@ -138,9 +127,10 @@ g_quark_try_string (const gchar *string)
- return 0;
-
- G_LOCK (quark_global);
-- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-+ if (quark_ht)
-+ quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
- G_UNLOCK (quark_global);
--
-+
- return quark;
- }
-
-@@ -179,7 +169,8 @@ quark_from_string (const gchar *string,
- {
- GQuark quark = 0;
-
-- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-+ if (quark_ht)
-+ quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-
- if (!quark)
- {
-@@ -292,6 +283,13 @@ quark_new (gchar *string)
- */
- g_atomic_pointer_set (&quarks, quarks_new);
- }
-+ if (!quark_ht)
-+ {
-+ g_assert (quark_seq_id == 0);
-+ quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
-+ quarks[quark_seq_id] = NULL;
-+ g_atomic_int_inc (&quark_seq_id);
-+ }
-
- quark = quark_seq_id;
- g_atomic_pointer_set (&quarks[quark], string);
diff --git a/dev-libs/glib/files/glib-2.48.0-GContextSpecificGroup.patch b/dev-libs/glib/files/glib-2.48.0-GContextSpecificGroup.patch
deleted file mode 100644
index be7ad3d..0000000
--- a/dev-libs/glib/files/glib-2.48.0-GContextSpecificGroup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 62f320e6bb09b4e6454e6a49dc3a844b13b9cc34 Mon Sep 17 00:00:00 2001
-From: Allison Ryan Lortie <desrt@desrt.ca>
-Date: Tue, 26 Apr 2016 10:39:42 +0200
-Subject: [PATCH] GContextSpecificGroup: detach sources
-
-GContextSpecificGroup has been somewhat broken for a rather long time:
-when we remove the last reference on an object held in the group, we try
-to clean up the source, but fail to actually remove it from the
-mainloop.
-
-We will soon stop emitting signals on the source (due to it having been
-removed from the hash table) but any "in flight" signals will still be
-delivered on the source, which continues to exist. This is a problem if
-the event is being delivered just as the object is being destroyed.
-
-This also means that we leave the source attached to the mainloop
-forever (and next time will create a new one)...
-
-This is demonstrated with the GtkAppChooser dialog which writes an
-update to the mimeapps.list file just as it is closing, triggering the
-app info monitor to fire just as it is being destroyed.
-
-Karl Tomlinson correctly analysed the problem and proposed this fix.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=762994
----
- gio/gcontextspecificgroup.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/gcontextspecificgroup.c b/gio/gcontextspecificgroup.c
-index b0eb279..211d765 100644
---- a/gio/gcontextspecificgroup.c
-+++ b/gio/gcontextspecificgroup.c
-@@ -234,6 +234,7 @@ g_context_specific_group_remove (GContextSpecificGroup *group,
-
- g_assert (css->instance == instance);
-
-+ g_source_destroy ((GSource *) css);
- g_source_unref ((GSource *) css);
- g_main_context_unref (context);
- }
---
-2.8.1
-
diff --git a/dev-libs/glib/glib-2.46.2-r3.ebuild b/dev-libs/glib/glib-2.46.2-r3.ebuild
deleted file mode 100644
index 415f9d1..0000000
--- a/dev-libs/glib/glib-2.46.2-r3.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2016 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}
- https://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}]
- 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
-"
-# 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
-
-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() {
- # GDBusProxy: Fix a memory leak during initialization (from 2.46 branch)
- epatch "${FILESDIR}"/${P}-memleak.patch
-
- # Fix for MUSL
- epatch "${FILESDIR}"/${P}-musl.patch
-
- # 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
-
- # 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
- # https://bugs.gentoo.org/show_bug.cgi?id=508752
- if [[ ! -f /proc/net/if_net6 ]]; 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
-
- # This test is prone to fail, bug #504024, upstream bug #723719
- sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
-
- # 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
- 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
-
- # crash in Firefox when choosing default application, fixed in 2.48.1; bug #577686
- epatch "${FILESDIR}"/${PN}-2.48.0-GContextSpecificGroup.patch
-
- # fixes https://bugzilla.gnome.org/show_bug.cgi?id=758194
- epatch "${FILESDIR}"/${PN}-2.46.2-fix-gstrerror-on-non-glibc.patch
-
- # leave python shebang alone
- sed -e '/${PYTHON}/d' \
- -i glib/Makefile.{am,in} || 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
-
- # 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
-
- # 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() {
- 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
- 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 completiondir="$(get_bashcompdir)"
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-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_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/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- multilib_foreach_abi multilib_pkg_preinst
-}
-
-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})"
- }
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gio/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.48.2.ebuild b/dev-libs/glib/glib-2.48.2.ebuild
index c6e3b3f..dbcb2ca 100644
--- a/dev-libs/glib/glib-2.48.2.ebuild
+++ b/dev-libs/glib/glib-2.48.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,7 +28,7 @@ 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"
+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}