commit: 2609c818f49e98b940e1eb6a14e4c6964903b8d1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 19:09:10 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 19:09:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2609c818
dev-libs/glib: sync
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4
dev-libs/glib/Manifest | 4 +-
dev-libs/glib/glib-1.2.10-r6.ebuild | 77 ------------
.../{glib-2.46.2-r1.ebuild => glib-2.52.3.ebuild} | 134 ++++++++++-----------
3 files changed, 64 insertions(+), 151 deletions(-)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 76db1b5042..4ec3c10153 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,4 @@
DIST 07d4a86e74b9b12a562b57ce5fa3a275bf0fe774.zip 13852 SHA256
decff3d1b7f259154940153cc65994fdc9d6a6ffe32e0e99334fe2163844ac4f SHA512
971a0519b53e066adcce27176bc134f6ccd6660d85113d5be10fa7cd421ef1e089a1780459de63234de618abd68df62d308f409a7097fe6a9e91e20510af40b9
WHIRLPOOL
0d2908fdd3c355479886387fd2619ae16470e971948a1af4a4a499a3d00dcbaeaf3b0dbe6115f06eca74bb99a40ce5e670bc8c14a1deb15450fd4a06aa642320
-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.46.2.tar.xz 7344636 SHA256
5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512
8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588
WHIRLPOOL
700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
DIST glib-2.50.2.tar.xz 7582312 SHA256
be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 SHA512
63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771
WHIRLPOOL
f7a005c0ad0edd0a9010aec60c4df907f79c45948b7bb583d70c378557c2a2f63383ebbaded9074b319a669bdf0532d78ce41a4f98d80d53a3a151a4a69be2a2
+DIST glib-2.52.3.tar.xz 7679972 SHA256
25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128 SHA512
a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
WHIRLPOOL
733ab64abbd60c633833d662d6b58e011478f85d1b0ab48a4af4cbe79e6c9973ccc86247dec2897a0c7663edeee516a3f034c14ac9b5e7a3dba97a04a88298f0
DIST pkg-config-0.28.tar.gz 1931203 SHA256
6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512
6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
WHIRLPOOL
db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
diff --git a/dev-libs/glib/glib-1.2.10-r6.ebuild
b/dev-libs/glib/glib-1.2.10-r6.ebuild
deleted file mode 100644
index 4a098907d4..0000000000
--- a/dev-libs/glib/glib-1.2.10-r6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-1.2.10-r6.ebuild,v 1.8
2015/07/17 15:32:53 ago Exp $
-
-EAPI=5
-GNOME_TARBALL_SUFFIX="gz"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 libtool flag-o-matic portability
multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/";
-SRC_URI="${SRC_URI}
- mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris"
-IUSE="hardened static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-MULTILIB_CHOST_TOOLS=(/usr/bin/glib-config)
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-automake.patch
- epatch "${FILESDIR}"/${P}-m4.patch
- epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
-
- # Allow glib to build with gcc-3.4.x #47047
- epatch "${FILESDIR}"/${P}-gcc34-fix.patch
-
- # Fix for -Wl,--as-needed (bug #133818)
- epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
-
- # build failure with automake-1.13
- epatch "${FILESDIR}/${P}-automake-1.13.patch"
-
- use ppc64 && use hardened && replace-flags -O[2-3] -O1
- sed -i "/libglib_la_LDFLAGS/i libglib_la_LIBADD = $(dlopen_lib)"
Makefile.am || die
-
- rm -f acinclude.m4 #168198
-
- mv configure.in configure.ac || die
-
- eautoreconf
- elibtoolize
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # Bug 48839: pam fails to build on ia64
- # The problem is that it attempts to link a shared object against
- # libglib.a; this library needs to be built with -fPIC. Since
- # this package doesn't contain any significant binaries, build the
- # whole thing with -fPIC (23 Apr 2004 agriffis)
- append-flags -fPIC
-
- ECONF_SOURCE="${S}" \
- gnome2_src_configure \
- --with-threads=posix \
- --enable-debug=yes \
- $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- gnome2_src_install
-
- chmod 755 "${ED}"/usr/$(get_libdir)/libgmodule-1.2.so.* || die
-}
-
-multilib_src_install_all() {
- einstalldocs
- dohtml -r docs
-}
diff --git a/dev-libs/glib/glib-2.46.2-r1.ebuild
b/dev-libs/glib/glib-2.52.3.ebuild
similarity index 69%
rename from dev-libs/glib/glib-2.46.2-r1.ebuild
rename to dev-libs/glib/glib-2.52.3.ebuild
index 779e00a982..29b94af7ff 100644
--- a/dev-libs/glib/glib-2.46.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -1,60 +1,57 @@
# Copyright 1999-2017 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"
+EAPI=6
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
+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}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"; #
pkg.m4 for eautoreconf
-
+ https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"; #
pkg.m4 for eautoreconf
CYGWINPORTS_GITREV="07d4a86e74b9b12a562b57ce5fa3a275bf0fe774"
[[ -n ${CYGWINPORTS_GITREV} ]] &&
SRC_URI+=" elibc_Cygwin? (
https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip )"
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils
xattr"
+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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
~x86-winnt"
+
+# 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}]
- kernel_linux? ( || (
- >=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12
- >=sys-freebsd/freebsd-lib-9.2_rc1
- ) )
+ virtual/libelf:0=
)
"
DEPEND="${RDEPEND}
@@ -70,9 +67,6 @@ DEPEND="${RDEPEND}
>=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 )
@@ -82,13 +76,13 @@ PDEPEND="!<gnome-base/gvfs-1.6.4-r990
# Earlier versions of gvfs do not work with glib
MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules
+ /usr/bin/gio-querymodules$(get_exeext)
)
pkg_setup() {
if use kernel_linux ; then
CONFIG_CHECK="~INOTIFY_USER"
- if use test; then
+ if use test ; then
CONFIG_CHECK="~IPV6"
WARNING_IPV6="Your kernel needs IPV6 support for
running some tests, skipping them."
fi
@@ -116,40 +110,23 @@ src_prepare() {
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
+ # 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
- # This test is prone to fail, bug #504024, upstream bug #723719
- sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || 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
- epatch "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
+ eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch
- # leave python shebang alone
+ # 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
@@ -159,12 +136,12 @@ src_prepare() {
eval "$(sed -ne '/PATCH_URI="/,/"/p' <
"${d}"/glib2.0.cygport)"
echo ${PATCH_URI}
); do
+ # Cygwin hasn't updated to 2.50.2 yet, which has patches
merged.
+ [[ ${p} == 2.46-glocalfilemonitor.patch ]] && continue
epatch "${d}/${p}"
done
fi
- epatch_user
-
# make default sane for us
if use prefix ; then
sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c
|| die
@@ -172,6 +149,16 @@ src_prepare() {
export PERL=perl
fi
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # fix standards conflicts
+ sed -i \
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
+ -e '/\<_XOPEN_SOURCE\>/s/ 2,/600,/' \
+ configure.ac || die
+ sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+ glib/giounix.c || die
+ fi
+
# Also needed to prevent cross-compile failures, see bug #267603
eautoreconf
@@ -189,8 +176,10 @@ multilib_src_configure() {
export DBUS1_CFLAGS="-I${EPREFIX}/usr/include/dbus-1.0
-I${EPREFIX}/usr/$(get_libdir)/dbus-1.0/include"
export DBUS1_LIBS="-ldbus-1"
fi
- export LIBFFI_CFLAGS="-I$(echo
"${EPREFIX}"/usr/$(get_libdir)/libffi-*/include)"
+ export LIBFFI_CFLAGS="-I$(echo
${EPREFIX}/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.
@@ -223,12 +212,12 @@ multilib_src_configure() {
append-libs "-L${EPREFIX}/usr/$(get_libdir)"
fi
- # 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} \
+ $(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) \
@@ -236,7 +225,7 @@ multilib_src_configure() {
$(multilib_native_use_enable utils libelf) \
--disable-compile-warnings \
--enable-man \
- --with-pcre=internal \
+ --with-pcre=system \
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
if multilib_is_native_abi; then
@@ -249,10 +238,11 @@ multilib_src_configure() {
multilib_src_test() {
export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
- export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:"${EPREFIX}"/usr/share
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:/usr/share
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
export LC_TIME=C # bug #411967
- python_export_best
+ unset GSETTINGS_BACKEND # bug #596380
+ python_setup
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -265,7 +255,7 @@ multilib_src_test() {
fi
# Need X for dbus-launch session X11 initialization
- Xemake check
+ virtx emake check
}
multilib_src_install() {
@@ -274,7 +264,6 @@ multilib_src_install() {
}
multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog* NEWS* README"
einstalldocs
if use utils ; then
@@ -305,7 +294,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
@@ -314,7 +303,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() {
@@ -327,14 +320,13 @@ pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
- multilib_foreach_abi multilib_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."
+ 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
}
@@ -343,7 +335,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
