commit: 99c02a56812430e58674aed7b02ce074c8babb6b
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Sep 3 14:27:30 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 20:54:09 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=99c02a56
dev-libs/glib: revbump to recent stable
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
dev-libs/glib/Manifest | 6 ++--
...ch => glib-2.50.0-external-gdbus-codegen.patch} | 32 ++++++++---------
.../{glib-2.48.2.ebuild => glib-2.50.3-r1.ebuild} | 42 ++++++++++++++++------
3 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f9f4e55..617e9b2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,8 +1,8 @@
-AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256
d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a SHA512
2f960a53cf51f809af6788664e2cd6d67a29eb58dfe34156f665e2d5ae1fd53a3c792714672fc82dcbfae38e1c793a3eef07116484511ef21d96536559339b00
WHIRLPOOL
39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0
+AUX glib-2.50.0-external-gdbus-codegen.patch 3854 SHA256
c5c96e54a9dfb9b10e9083279ddb3961c324e1ea151772d047ec57e12893c15f SHA512
dd5fb2f7f82be85326c37851cbb5d41307f7efcdd214b523f8ab0adc4e30830234f69b08dfbaa50bf7ace78bb0f07e7d7a6c5f87a2d06d2c11e0ed6f2d1d2045
WHIRLPOOL
79270dd6139bf17e0149c30528ea18bdac6af913cb6733cb0a72b3c44bfd378c05433d3f7abaef088e271e34490c551f0214efbac45db6470e3d83e4ee2b6e6d
AUX glib-2.50.3-fix-gdatetime-tests.patch 2052 SHA256
182695950e34356f3d97005cd0120d3a0ed1e485ec97b86b0c121a72c418c7b5 SHA512
7701cd1116626ef2b5a79e0d31f4c445a609b8b4481745f443fbac290670c776fbf4196a33a80629bf13bd9e405579715758e6c7ffcee72b6129d444d1dfa724
WHIRLPOOL
19f0193c57d2a4de5b1429ee3171c554e43aaadbc53e2f1471803a8b3c32c8ac6cd0ff5d5ed4ff46bb2923b09f97a354b2a3ae0989a633f2757c250a5b80a2f7
AUX gobject_init_on_demand.patch 2113 SHA256
ffb30a240f23ee76dff0fc1ecc155288ea8bb976e814cc52e55c025e7ab792d0 SHA512
4281f0e1405618c593988b549b34f66bc530c2d3196364e0a387ca8f61fdd75065b40b039afc0711f73a8fcf5f9483f1d3c57fe3154bae9bc72243ede3bd239e
WHIRLPOOL
a7090b51c28421e7c600b495665a47866554e317810abce07dfa07070a7887655d09ac12c04b0dbb30ab442b22175849f49e433f25f3ef41b519de6bf49f42a6
AUX quark_init_on_demand.patch 1725 SHA256
e09d8e723752c1f36b7451b244bbe4dd9b5c39ff0dcd5a778ddbfe93c5343ef5 SHA512
29311855d0058b8171914542304d04536c83cca265f094f9d537b6e9c2e2d71a5975967bb2743c4fa3a6c569c058c0c21b78dfaa0c9c3ce8aed7f474678a53d9
WHIRLPOOL
71bb85a258417014cd4ab7dbcc16779ef222408be37e590f9f67dfb2dbbf6bfefb9ce8ac1d0097216b6d92fb69c9c846678d7f71f5f45ab8de07f6b88f6c8ff0
-DIST glib-2.48.2.tar.xz 6408644 SHA256
f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512
2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43
WHIRLPOOL
cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
+DIST glib-2.50.3.tar.xz 7589284 SHA256
82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 SHA512
ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
WHIRLPOOL
fc8effb457005a234ccb164d74026cec4af7f9a70eef0a8d58efebfacdcf0d7f7713042a9476e6a89e4effbdf4b0d59377811790557cc991cf6b397e5e984f93
DIST pkg-config-0.28.tar.gz 1931203 SHA256
6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512
6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
WHIRLPOOL
db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
-EBUILD glib-2.48.2.ebuild 8727 SHA256
a2baeca411a6c6755d42e1ab144466ae71502fbebefdf8c2511b615575c9589a SHA512
3f853481a142967e494fb88b1798c429b05ab81fa6d71e39a0d021ea1bbf24eda73ef5abdac4c4bcb0ebfd170ec261a658a5f4a40802dd5d1dcff4f941efe10a
WHIRLPOOL
6d0063403a73bb3502b58520a349c828ebc991b4f7a2c06f0f5de2a6519e04431f1e0a1a9f7f45df8e149d360ea4f22f8db2f8154ea8f0f9bbe657c2d7e71af4
+EBUILD glib-2.50.3-r1.ebuild 9775 SHA256
97285c8e1abe2bc28c12e4e354531b22979629a3ec6b5f638c21d919650a0e4f SHA512
9b7cd12d08a4c6b001d9b97e0a925d2dcbc5536e7eafbc8738a0a3c434016887853f5f46b0d9c146772acfcd6ec7a32270f9907a27553ba82785b9b7b83a0a1a
WHIRLPOOL
de1b7d1f7bbbcdb331f02965c089de205e0a7e5e844f3f324f7c7442f152493c2cbcddee6059be335f62252178c10a39446c67874f9cd0f0f5ea43950d76380f
MISC metadata.xml 955 SHA256
424ffc685dcfdfa5dcb142046d937915d07945217db814ff759b9b736d67f9e4 SHA512
31b87bd850ffaa3f2263e6435d2929ef9f8f979e6fe6cff86433c8841dc383088bc6d672ac7daf94c1ef660767d0e91a03860267df9c750dcde3204dd6631cb1
WHIRLPOOL
cf59bd50dcfcc466ad19a81f458875b7e62fc569cda4f730defdbed72f0112395b332b52574c5794539c8e0255f7abaa9e7f14a9c5bb5fd6048ad3c4c35991c8
diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
b/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch
similarity index 87%
rename from dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
rename to dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch
index 50a9370..2c942d5 100644
--- a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch
@@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac
-index a01e58d..59d4527 100644
+index e8e7553..216e59d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
+@@ -385,14 +385,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
@@ -25,7 +25,7 @@ index a01e58d..59d4527 100644
dnl ***********************
-@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
+@@ -3453,7 +3453,6 @@ gobject/glib-mkenums
gobject/tests/Makefile
gthread/Makefile
gio/Makefile
@@ -34,21 +34,19 @@ index a01e58d..59d4527 100644
gio/gnetworking.h
gio/xdgmime/Makefile
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 47fdd38..c7eb136 100644
+index 5741a3e..d38e768 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
-@@ -157,8 +157,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
+@@ -177,7 +177,6 @@ man_MANS += \
+ gsettings.1 \
+ gresource.1 \
+ gdbus.1 \
+- gdbus-codegen.1 \
+ gio.1 \
+ $(NULL)
- XSLTPROC_FLAGS = \
- --nonet \
diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e993e2f..025ad94 100644
+index ffe5ee2..929d1b5 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -1,6 +1,6 @@
@@ -60,10 +58,10 @@ index e993e2f..025ad94 100644
if OS_UNIX
SUBDIRS += xdgmime
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 2c54e59..3cd3c5a 100644
+index 749267b..f2a8c63 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -437,10 +437,8 @@ gnotification_SOURCES =
$(gdbus_sessionbus_sources) gnotifica
+@@ -449,10 +449,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
@@ -77,7 +75,7 @@ index 2c54e59..3cd3c5a 100644
--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
+index 1d0464c..0603d9b 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 = \
diff --git a/dev-libs/glib/glib-2.48.2.ebuild
b/dev-libs/glib/glib-2.50.3-r1.ebuild
similarity index 82%
rename from dev-libs/glib/glib-2.48.2.ebuild
rename to dev-libs/glib/glib-2.50.3-r1.ebuild
index 707a4f6..1988bfe 100644
--- a/dev-libs/glib/glib-2.48.2.ebuild
+++ b/dev-libs/glib/glib-2.50.3-r1.ebuild
@@ -11,11 +11,11 @@ PYTHON_COMPAT=( python2_7 )
# pkg-config
GNOME2_LA_PUNT="yes"
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2 libtool
linux-info \
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs
versionator virtualx
+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="http://www.gtk.org/";
+HOMEPAGE="https://www.gtk.org/";
SRC_URI="${SRC_URI}
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"; #
pkg.m4 for eautoreconf
@@ -27,7 +27,11 @@ 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"
+
+# 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}
@@ -36,6 +40,7 @@ RDEPEND="
>=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}] )
@@ -82,6 +87,7 @@ pkg_setup() {
}
src_prepare() {
+
# Fix for MUSL
eapply "${FILESDIR}"/quark_init_on_demand.patch
eapply "${FILESDIR}"/gobject_init_on_demand.patch
@@ -116,10 +122,11 @@ src_prepare() {
sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
fi
- eapply "${FILESDIR}"/${PN}-2.50.3-fix-gdatetime-tests.patch
+ # Fix tests with timezone-data-2017a and newer
+ eapply "${FILESDIR}"/${P}-fix-gdatetime-tests.patch
# gdbus-codegen is a separate package
- eapply "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
+ eapply "${FILESDIR}"/${PN}-2.50.0-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
@@ -146,6 +153,8 @@ multilib_src_configure() {
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.
@@ -173,6 +182,7 @@ multilib_src_configure() {
$(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) \
@@ -196,6 +206,7 @@ multilib_src_test() {
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
@@ -248,7 +259,7 @@ pkg_preinst() {
multilib_pkg_preinst() {
# Make giomodule.cache belong to glib alone
- local cache="usr/$(get_libdir)/gio/giomodule.cache"
+ local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
if [[ -e ${EROOT}${cache} ]]; then
cp "${EROOT}"${cache} "${ED}"/${cache} || die
@@ -257,7 +268,11 @@ pkg_preinst() {
fi
}
- multilib_foreach_abi multilib_pkg_preinst
+ # 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() {
@@ -270,7 +285,14 @@ pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
- multilib_foreach_abi multilib_pkg_postinst
+ 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() {
@@ -278,7 +300,7 @@ pkg_postrm() {
if [[ -z ${REPLACED_BY_VERSION} ]]; then
multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
+ 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
