# ChangeLog for dev-libs/glib
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.635 2015/01/02 12:08:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.636 2015/01/21 09:44:49 pacho Exp $
+
+ 21 Jan 2015; Pacho Ramos <pacho@gentoo.org> -files/glib-2.12.12-fbsd.patch,
+ -files/glib-2.36.4-znodelete.patch,
+ -files/glib-2.37.x-external-gdbus-codegen.patch,
+ -files/glib-2.38.2-configure.patch, -files/glib-2.38.2-sigaction.patch,
+ -glib-2.38.2-r1.ebuild, -glib-2.40.0-r1.ebuild, glib-2.42.1.ebuild:
+ Ensure dconf is present (#498436, #498474#c6), drop old
02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> glib-2.40.2.ebuild:
Stable for alpha, wrt bug #529964
AUX glib-1.2.10-configure-LANG.patch 1464 SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4 SHA512 a83e3d51775ee696dd4f862eef9d973e62bb157562c4ba5d6e25708f4140af35e4473b92e61541c0efea175223b64575fd23e08f666980ad8063ba1acb19b002 WHIRLPOOL a46a8f5e3574feeba640262823705584da98f3bfbb4699378a746d66290edf65804add1f59ec244c04d78492dcb2b4a7a9981ab9633ec0b3b373fd105b5175f6
AUX glib-1.2.10-gcc34-fix.patch 2008 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd SHA512 2f8bec2a10828c57da507d73a308ffec6b1069cdd7704e3128aeabe9f031952c71c900062de782bd464bec101bbf925586f88336bb0f8ac05dda00b1a269158a WHIRLPOOL 602ce9ff26da42417be8f8c03e2cad33e31a3a8fea0b1392fb95253fb7c3f8424b28a2c910cd532b1932a37c9b334d0150d273c43d1389bd7107c897b3923c9a
AUX glib-1.2.10-m4.patch 225 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37894f415c8ea9c7925b68 SHA512 b754a680cff0fdbaade899152e597cfc4351cbbf6adf931a5f4f856823e1e6e68b54aa5f318f33476d497a8ae39b0d2dbb2a32792aec1727d196a014315cac12 WHIRLPOOL fbd2fd7b06a7fd0617f1b0ea4746d59a68977a9133e7eb37a64fad5f825e58b64a42c920f2435b61deeb075fe6e5401a361b30d3cdd175007f5ab5f2453b182b
-AUX glib-2.12.12-fbsd.patch 850 SHA256 1af80d3f26d44715bdbf597e5d37f6547dd1adb993852c12db614b579b02f001 SHA512 43a78da1ffbae15d920f58b0c5e987bf8e563f13b6e50668d3b2146472b3ec64938f36daeca88f08edf197134976d1ea328502337fa25e0a1d8a8dc52732d6ad WHIRLPOOL c3936bb66de72ef4efbcaffb42f9a9458b03a01e588398b90f5c3fb338e8376e0092a8068302c84370e3ba3fc7d38bb7af6d056d6b6ae4767b433dc32f2bf16e
AUX glib-2.34.0-testsuite-skip-thread4.patch 1296 SHA256 91cc22f43c04599826e9e15efffb3a668f73208391b047f321c993e27c3a9dd9 SHA512 e7e12c40d3da03c3420c1d0e161d5583e30a3185300a660408ddf78ffe0bbf2d812eb9180b6e7e013370a880d5f5e020cbdf45bebaa8fa8d74f6f4af8822c5aa WHIRLPOOL 876a1740f520d0e9f4cc26b55a20e6f6b0d979de801edeb8262b53a68130e35c0a968081658ea89ae47e4a9a7e273ee6ef2c74dfe011e103c69cfb9bfc4d6c0f
-AUX glib-2.36.4-znodelete.patch 2199 SHA256 4195ca98519b842520d9b11d7cd01f1f6f6ed1843735e2fb50c217fc6c33fe43 SHA512 77284716ff8f4f7482765cc5724e325169fd49b205e19cad19e755a4cceeb57037bdd78fcde6265586770b95fd9481afc69d797a4a521401a2704f4eab644d47 WHIRLPOOL 9941b5aa7f1fdb1fa6cdf39f4f94a52bfd6093f55f31a6466ecc0996eaa22901ac26cff42fdd64af9dac13004fe47d054991cc27e6450ab4b6810e0f421157f4
-AUX glib-2.37.x-external-gdbus-codegen.patch 4573 SHA256 7094ff73cef6add5bf1727f2d01f6f45ac6ae82d725a47b83d0280064d006ee2 SHA512 dc8e0460c549a5d65cc9ba575d0f1eb2bd7a487d382970922e454ceb4efe46a096da82abfe5ba50bf37f56e1c24570ed391a5474f22f9f97d678baad003893ed WHIRLPOOL 86f0da69db6c0c9c8f22869155ce679c75db755c78bd7add7401e7e73c454fd9704dcb0a050b67d99a4bbbb161c26325ff120ef0bb7d76341ebc528015169b20
-AUX glib-2.38.2-configure.patch 985 SHA256 4a3d9bf2b84f966ad2792ed7a356cf9e4f23e95efbe950bd6d5df544d45fff97 SHA512 ebdcc5775b4ada3f464a791ac0bffe0cd7a4441c9f21af327c9a99638157bbb8d72bb01aa70190c4e757481c5832763a0b569b7de6f452b4a2d05ea5b4a3e63d WHIRLPOOL 99d02f68ad97dbeb9de6dfdef5a76b19b94da9ff66ace3657bd772fdc181067c19225926ff5bd0bc7006a4abc5b4ed3a5523769fb8e488bed74b1cacbeab9448
-AUX glib-2.38.2-sigaction.patch 707 SHA256 72476721ee93a0587a89b48f35944d8b1e317bc240ef79363f82ad7ed71c2e55 SHA512 f97c30585c06a6a4d937ee8f27574d60580893e29372a282d1310f6702a7b003233c64e2d56d2ae91af53eee6465d9acb68b76027ec9428f1615bd7c25af45db WHIRLPOOL 5a478f80558bca17508e6d2b342e2204bb419818c7382f17e2c01ba6e0addc9190fc12a7817c728e35b3f7c304575551d43a529b0aa3e2fa2432b823d69f6467
AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256 d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a SHA512 2f960a53cf51f809af6788664e2cd6d67a29eb58dfe34156f665e2d5ae1fd53a3c792714672fc82dcbfae38e1c793a3eef07116484511ef21d96536559339b00 WHIRLPOOL 39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0
DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
-DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
-DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 SHA512 346a32f2d1447d3398ac2400047f0556517b914788cf9c8c9f28de5f395ef3993231f9a58fc103e08013fa2e7136a097de46aabdf4c035a46f883ca3971408a4 WHIRLPOOL d3e7ccfa3ac4270ccc5f950771238addabcbf025ebaf85a1586c7757493c6cdc3dc447f6ab92af1ed87f1c68c79d7b1bb6417b1894f8c0304fd87e04b1eb9b3b
DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
-EBUILD glib-2.38.2-r1.ebuild 10136 SHA256 e276186ee74001eb75dd8b300a04395446034279ea30f81d4a9c3c60a3938b1d SHA512 30edcf3a44987b941451b0f0e24bb3d08aa2a233315a4bb02135c109aa334c9db8420a0739bc92aeecbe8d90478caff24deea3d30ceb661189dad6f20406afbc WHIRLPOOL 44f83bb6b1581a64c4037528c3c26e86661efbd07843ca887174c70de76c3a0ffc9ad5091a5604a30df86000da09808ce80bfbfa8c420c17cfe5fdd2e41f413a
-EBUILD glib-2.40.0-r1.ebuild 10046 SHA256 dffa65f057a95a6fabf9330e7ae025fd4b0d84b2e6b889547c9d7370b9d030fd SHA512 74d9ee1e22b2dad5442f143c91e2310f20dcb0d0e1e20571331e9b63287de64b64ceb7b47aaeaa7e8ad98059ed93187b56ee67f893ff40af5ec193483d3bdc94 WHIRLPOOL 1f8656d4ab290a4b40c892ddd17bfd4f36e9e6de0d1fc6d6d6c04c69f38f92db2395ef6cf1ef66ddcfaceeddcfa2419f661cd04786afdac1b39cc76ce15d5bba
EBUILD glib-2.40.2.ebuild 9623 SHA256 481a4b75daadc594a1dba58f77c8f8e80768f625689b900a42306f3b1278395f SHA512 b9f66e3f5fddb5a8100686354bf8e4e19c89219ccb442fcddae330a900a0c619cd0dd1f6f7ce429fbce3624583495b1e2487f68e71818e57a56d91f428bb8bcc WHIRLPOOL bab325a28046a288a6218d14e341c0918497f615659d08ca48bad22467fd1ba8025f526ca69a87a89622d7ea7f09fed0f03f1982390213a452a34e4e2b2505c9
-EBUILD glib-2.42.1.ebuild 9586 SHA256 7755e45404e62a40ffd8baa73acca26d791d3f9504b3539c4a8c2867ef0276e9 SHA512 84704160193d3302bf9d40a85dfae731865664d2563c0118756aa1d60f2b70830e3230e4067df2ff77ca3a32acf1e25fcc744773231a45406d6e365d7c51698e WHIRLPOOL 5bc2b06a633e77296bc537b349331a67c92b660d1919c49689233b3aa8ed8e7508fb3f13d732d01c8f6d7ebced45012273cc79384515be517ca8dcfb9ec3c999
-MISC ChangeLog 88941 SHA256 c2352a11d5222002cacfebf03bf623358a202ddbe8d2c64b6ff24b9f261e066b SHA512 469fb4030a2cc29b3cf3698bfe88ad444cd6ec25dedc6f7de56250eba2e2f370224d60740bc9e051fe9a1e89d32168867e5805253c69d4669fb319e0162a93f4 WHIRLPOOL 2e26d4990869baa3a1a3dc01345c258ac0a8812701b63d7d1a27d93a661434e7146bea3aff30d09c841a23474b3f535879530519ae722cb007789f54f3922c48
+EBUILD glib-2.42.1.ebuild 9424 SHA256 7cf0421af9e1e197ce3509183b7a9400779fc45638ac5fd78f02e19a7260e841 SHA512 2f208a0de1d97ef3051eb4d7d508338fc830bc056b08d6b6b01a7466785fc1a4efe2842a2d06517d48271d0a1af5acdca0fc9153bce68f9724fc5705c868cd89 WHIRLPOOL fe69fa42319d1f6574a9cb13bf171b1d419e4a6b4aec6364fdfb97ba1b2fb7326cac646a84f81d8928f182e91e8fb71dbbe5d0a3e740131e686e3729731903b6
+MISC ChangeLog 89313 SHA256 b40ef341a26c8ab795fce6d9df6c9f35a8092dbc8a93a6ed83e7a103a8685d97 SHA512 9e75979beba6dfe1871c15a3fd9f4491402dca854e59d870854fc69a550061f9843aa7a27dfa1ac159872a4e7e26982d7e44c894b53b2604ee3bc29781e75c22 WHIRLPOOL 5b99c387e999b894bdb89e5c1087a3d31abadf04d3f47e79830d836cab29301f9e6a0513069d5ba6eb220cc0f8965e5c90121dbb7c2de9d6ef8afca5f473a3f7
MISC metadata.xml 692 SHA256 d46beb748667144ea36ba0b32f8f7c27ca0e10faec80809852cb81fb3b798e5f SHA512 db21e2d66d280757c98065433ebb66720db113ee70807c1e69c21b782dc8c9832981098ffedd962839089f174c8b0545de717d5cd2969b8e7ae4640a382a3de1 WHIRLPOOL 7fc05ab8e50cfe9904f3f97123a16fa7e6f051d45e7c6c2616b0254529864cb7b029a329bda8102bf01bfeef287215f6536caca9090e22e7b0c7c59af8994951
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUpopTAAoJELp701BxlEWfCO0P/idLVoHUEjHXmL+FgcpaXlXu
-14+Yuxp/GmBTkeJB4EVbaLoHe7OdgXKukbaI9tqcafpPUUVQa+boAwS2Dy6ZRA/y
-NNmhofeWdWj0CZM6TDBqrFyWI+CMLQ72eviUxyYlBfINFR83TLdVKn7Do81x9d6/
-26a6CSDuGbU4B45tgnE6O0TZBxCCa4vRV2AiKitRBpCPp/Sw9ZxsdsUssYtqspjc
-tXzNCn5D1fwsXzKAr4VLK0ogfm1V2XwfMWbVw0BxhIU6zIG/TH7UKTwMjL+0QWFl
-40tzSvoK3mg2YNQi4UMiF4OPfwdoXa3yEZOoQ4Y9OHuDhNqHLzltdafj13AgbidP
-Yw7tNuEUY+tdw89t86u145RIfJ+DUNZXNhvr7E5vOCGwVvf8cCA/sqC29kQze3hO
-1z5z1Phze1uJwbbwm1y9RztZ3ALrG3uD9+0/2+bQINQfz2T8F1L6SdaBZkAOEQhA
-PCmX9upJFaaI6JyDLmCkeVaFG/Jgdonm1zGaygYmo9coh+G8HuqX3G23fguZY8A0
-Lr+GSqkG15CFPRRo+xrz1kPgQbgJNB+2FaGiHiWL2dm5Ew7xcE+LjqIKV+3c4/PS
-I2fNj6e47LmSgL4elmvjhHtGHEb4x8z341kNSXQlTjphY94WBkzoVhI/+Ksiy1LV
-pKd9jPzGKph89hvTvfBS
-=fNs3
+iEYEAREIAAYFAlS/dRIACgkQCaWpQKGI+9RH3gCfWdYO8Q0nnd2lhVpuF8AuBEXy
+W0IAn2QUaCrT8NhJ2lMRBwi0Owh/B+1X
+=KeXM
-----END PGP SIGNATURE-----
+++ /dev/null
-From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
-From: Daniel Gryniewicz <dang@gentoo.org>
-Date: Sun, 24 Nov 2013 19:46:13 +0100
-Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
-
-Gentoo bug #184301, Gnome bug #107626.
----
- gmodule/gmodule-dl.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index a606f17..57fc41b 100644
---- a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -107,6 +107,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
-@@ -122,6 +123,9 @@ _g_module_self (void)
- g_module_set_error (fetch_dlerror (TRUE));
-
- return handle;
-+#else
-+ return RTLD_DEFAULT;
-+#endif
- }
-
- static void
---
-1.8.3.2
-
+++ /dev/null
-From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Sep 2013 13:59:18 -0400
-Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete
-
-Since the type system does not support reloading its data and assumes
-that libgobject remains loaded for the lifetime of the process, we
-should link libgobject with a flag indicating that it can't be unloaded.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=707298
----
- configure.ac | 24 ++++++++++++++++++++++++
- gobject/Makefile.am | 1 +
- 2 files changed, 25 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 907c534..266c45d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3669,6 +3669,30 @@ fi
- AC_SUBST(GLIB_LINK_FLAGS)
-
- dnl
-+dnl Check for -z,nodelete linker flag: the type system assumes that
-+dnl libgobject stays loaded for the lifetime of the process
-+dnl
-+
-+AC_ARG_ENABLE([znodelete],
-+ [AS_HELP_STRING([--disable-znodelete],
-+ [avoid linking with -z,nodelete])],,
-+ [SAVED_LDFLAGS="${LDFLAGS}"
-+ AC_MSG_CHECKING([for -z,nodelete linker flag])
-+ LDFLAGS=-Wl,-z,nodelete
-+ AC_TRY_LINK([], [int main (void) { return 0; }],
-+ AC_MSG_RESULT(yes)
-+ enable_znodelete=yes,
-+ AC_MSG_RESULT(no)
-+ enable_znodelete=no)
-+ LDFLAGS="${SAVED_LDFLAGS}"])
-+
-+if test "x${enable_znodelete}" = "xyes"; then
-+ GOBJECT_LINK_FLAGS=-Wl,-z,nodelete
-+fi
-+
-+AC_SUBST(GOBJECT_LINK_FLAGS)
-+
-+dnl
- dnl Check for -fvisibility=hidden to determine if we can do GNU-style
- dnl visibility attributes for symbol export control
- dnl
-diff --git a/gobject/Makefile.am b/gobject/Makefile.am
-index 1509616..181ad7d 100644
---- a/gobject/Makefile.am
-+++ b/gobject/Makefile.am
-@@ -45,6 +45,7 @@ endif
-
- libgobjectincludedir = $(includedir)/glib-2.0/gobject
- libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
-+ $(GOBJECT_LINK_FLAGS) \
- $(gobject_win32_res_ldflag) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -export-dynamic $(no_undefined)
---
-1.8.3.2
-
+++ /dev/null
-From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH 3/4] Split out gdbus codegen
-
----
- configure.ac | 17 ++++++++---------
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 797cb92..907c534 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
-- AS_HELP_STRING([--with-python=PATH],
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-- [PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
-- AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+# [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+# AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 112626b..8ddcdbc 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -151,8 +151,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 717419f..808b5dd 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 7224124..5c8baaa 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
- nodist_gdbus_test_codegen_SOURCES = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
-
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-1.8.3.2
-
+++ /dev/null
-From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
-From: Patrick Welche <prlw1@cam.ac.uk>
-Date: Thu, 07 Nov 2013 10:58:46 +0000
-Subject: configure: test(1) uses = to test for string equality
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711600
----
-(limited to 'm4macros/glibtests.m4')
-
-diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
-index 27e9024..7d5920a 100644
---- a/m4macros/glibtests.m4
-+++ b/m4macros/glibtests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
- esac])
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
-- if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+ if test "$ENABLE_INSTALLED_TESTS" = "1"; then
- AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
- AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
- fi
---
-cgit v0.9.2
+++ /dev/null
-From 81d0ebe29ccd852e969acda7394969e3f13eb136 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 31 Oct 2013 11:43:14 +0100
-Subject: [PATCH] gmain: Fix use of uninitialized memory in sigaction structure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711754
-
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 9c37bb2..608c1a5 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -4978,6 +4978,7 @@ unref_unix_signal_handler_unlocked (int signum)
- if (unix_signal_refcount[signum] == 0)
- {
- struct sigaction action;
-+ memset (&action, 0, sizeof (action));
- action.sa_handler = SIG_DFL;
- sigemptyset (&action.sa_mask);
- sigaction (signum, &action, NULL);
---
-Gitg
-
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.15 2014/07/17 15:12:26 ssuominen Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-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"
-
-# FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960
-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}]
- || (
- >=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12
- >=sys-freebsd/freebsd-lib-9.2_rc1
- )
- selinux? ( sys-libs/libselinux )
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
- utils? (
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-libs/libxslt-1.0
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.15
- systemtap? ( >=dev-util/systemtap-1.3 )
- test? (
- sys-devel/gdb
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- >=sys-apps/dbus-1.2.14 )
- !<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
- !<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- export IPV6_DISABLED="yes"
- fi
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
- # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
- epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
- if use test; then
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
- sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
- sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- ewarn "Some tests will be skipped due to missing terminal program"
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- fi
-
- # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
- if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
- ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
- ewarn "not being present on your system, think on installing them to get these tests run."
- sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
- sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
- sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
- sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
- sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
- sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
- # needed to prevent gdbus-threading from asserting
- ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
- fi
-
- # Some tests need ipv6, upstream bug #667468
- if [[ -n "${IPV6_DISABLED}" ]]; then
- sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
- sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
- sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
- fi
-
- # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
- sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
- fi
-
- # thread test fails, upstream bug #679306
- epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
- # gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.37.x-external-gdbus-codegen.patch"
-
- # do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
- epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
-
- # patches from 2.39.x / 2.40.x
- epatch "${FILESDIR}/${PN}-2.38.2-sigaction.patch" #501330
-
- # leave python shebang alone
- sed -e '/${PYTHON}/d' \
- -i glib/Makefile.{am,in} || die
-
- # Gentoo handles completions in a different directory
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- gio/Makefile.am || die
-
- # Support compilation in clang until upstream solves this, upstream bug #691608
- append-flags -Wno-format-nonliteral
-
- epatch "${FILESDIR}"/${P}-configure.patch #500996
-
- epatch_user
-
- # Needed for the punt-python-check patch, disabling timeout test
- # Also needed to prevent cross-compile failures, see bug #267603
- # Also needed for the no-gdbus-codegen patch
- eautoreconf
-
- # FIXME: Really needed when running eautoreconf before? bug#????
- #[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
- epunt_cxx
-}
-
-multilib_src_configure() {
- # Avoid circular depend with dev-util/pkgconfig and
- # native builds (cross-compiles won't need pkg-config
- # in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
- if has_version sys-apps/dbus; then
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
- fi
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
- export LIBFFI_LIBS="-lffi"
- fi
-
- local myconf
-
- case "${CHOST}" in
- *-mingw*) myconf="${myconf} --with-threads=win32" ;;
- *) myconf="${myconf} --with-threads=posix" ;;
- esac
-
- # Building with --disable-debug highly unrecommended. It will build glib in
- # an unusable form as it disables some commonly used API. Please do not
- # convert this to the use_enable form, as it results in a broken build.
- use debug && myconf="--enable-debug"
-
- # Only used by the gresource bin
- multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
- # FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
- if multilib_is_native_abi; then
- myconf="${myconf} $(use_enable selinux)"
- else
- myconf="${myconf} --disable-selinux"
- fi
-
- # Always use internal libpcre, bug #254659
- ECONF_SOURCE="${S}" econf ${myconf} \
- $(use_enable xattr) \
- $(use_enable fam) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_enable systemtap dtrace) \
- $(use_enable systemtap systemtap) \
- --disable-compile-warnings \
- --enable-man \
- --with-pcre=internal \
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
- 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_install_all() {
- einstalldocs
-
- if use utils ; then
- python_replicate_script "${ED}"/usr/bin/gtester-report
- else
- rm "${ED}usr/bin/gtester-report"
- rm "${ED}usr/share/man/man1/gtester-report.1"
- fi
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
- # Completely useless with or without USE static-libs, people need to use
- # pkg-config
- prune_libtool_files --modules
-}
-
-multilib_src_test() {
- gnome2_environment_reset
-
- unset DBUS_SESSION_BUS_ADDRESS
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- unset GSETTINGS_BACKEND # bug 352451
- export LC_TIME=C # bug #411967
- python_export_best
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- Xemake check
-}
-
-pkg_postinst() {
- if has_version '<x11-libs/gtk+-3.0.12:3'; then
- # To have a clear upgrade path for gtk+-3.0.x users, have to resort to
- # a warning instead of a blocker
- ewarn
- ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
- ewarn "You should upgrade to a newer version of gtk+:3 immediately."
- fi
-}
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.14 2014/10/27 01:54:36 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-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"
-
-# FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960
-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}]
- || (
- >=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12
- >=sys-freebsd/freebsd-lib-9.2_rc1
- )
- selinux? ( sys-libs/libselinux )
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
- utils? (
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-libs/libxslt-1.0
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.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
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- export IPV6_DISABLED="yes"
- fi
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
- # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
- epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
- if use test; then
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
- sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
- sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- ewarn "Some tests will be skipped due to missing terminal program"
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- fi
-
- # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
- if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
- ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
- ewarn "not being present on your system, think on installing them to get these tests run."
- sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
- sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
- sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
- sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
- sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
- sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
- # needed to prevent gdbus-threading from asserting
- ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
- fi
-
- # Some tests need ipv6, upstream bug #667468
- if [[ -n "${IPV6_DISABLED}" ]]; then
- sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
- sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
- sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
- fi
-
- # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
- sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-
- # thread test fails, upstream bug #679306
- epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
- 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"
-
- # do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
- epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
-
- # leave python shebang alone
- sed -e '/${PYTHON}/d' \
- -i glib/Makefile.{am,in} || die
-
- # Gentoo handles completions in a different directory
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- gio/Makefile.am || die
-
- # Support compilation in clang until upstream solves this, upstream bug #691608
- append-flags -Wno-format-nonliteral
-
- epatch_user
-
- # Needed for the punt-python-check patch, disabling timeout test
- # Also needed to prevent cross-compile failures, see bug #267603
- # Also needed for the no-gdbus-codegen patch
- eautoreconf
-
- # FIXME: Really needed when running eautoreconf before? bug#????
- #[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
- epunt_cxx
-}
-
-multilib_src_configure() {
- # Avoid circular depend with dev-util/pkgconfig and
- # native builds (cross-compiles won't need pkg-config
- # in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
- if has_version sys-apps/dbus; then
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
- fi
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
- export LIBFFI_LIBS="-lffi"
- fi
-
- local myconf
-
- case "${CHOST}" in
- *-mingw*) myconf="${myconf} --with-threads=win32" ;;
- *) myconf="${myconf} --with-threads=posix" ;;
- esac
-
- # Building with --disable-debug highly unrecommended. It will build glib in
- # an unusable form as it disables some commonly used API. Please do not
- # convert this to the use_enable form, as it results in a broken build.
- use debug && myconf="--enable-debug"
-
- # Only used by the gresource bin
- multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
- # FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
- if multilib_is_native_abi; then
- myconf="${myconf} $(use_enable selinux)"
- else
- myconf="${myconf} --disable-selinux"
- fi
-
- # Always use internal libpcre, bug #254659
- ECONF_SOURCE="${S}" econf ${myconf} \
- $(use_enable xattr) \
- $(use_enable fam) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_enable systemtap dtrace) \
- $(use_enable systemtap systemtap) \
- --disable-compile-warnings \
- --enable-man \
- --with-pcre=internal \
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
- 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_install_all() {
- einstalldocs
-
- if use utils ; then
- python_replicate_script "${ED}"/usr/bin/gtester-report
- else
- rm "${ED}usr/bin/gtester-report"
- rm "${ED}usr/share/man/man1/gtester-report.1"
- fi
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
- # Completely useless with or without USE static-libs, people need to use
- # pkg-config
- prune_libtool_files --modules
-}
-
-multilib_src_test() {
- gnome2_environment_reset
-
- unset DBUS_SESSION_BUS_ADDRESS
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- unset GSETTINGS_BACKEND # bug 352451
- export LC_TIME=C # bug #411967
- python_export_best
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- Xemake check
-}
-
-pkg_postinst() {
- if has_version '<x11-libs/gtk+-3.0.12:3'; then
- # To have a clear upgrade path for gtk+-3.0.x users, have to resort to
- # a warning instead of a blocker
- ewarn
- ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
- ewarn "You should upgrade to a newer version of gtk+:3 immediately."
- fi
-}
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.1.ebuild,v 1.1 2014/12/14 22:37:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.1.ebuild,v 1.2 2015/01/21 09:44:49 pacho Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
# different g-i and glib major versions
PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+ gnome-base/dconf
mime? ( x11-misc/shared-mime-info )
"
# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf needed, bug #498436
# Earlier versions of gvfs do not work with glib
pkg_setup() {
# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
- # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
- # Upstream doesn't even know if this is needed, looks like openBSD
- # people is not needing it
- #epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
if use test; then
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
projects / gentoo.git / commitdiff