mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-07 05:57:07 -08:00
dev-libs/glib: remove old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
This commit is contained in:
Mart Raudsepp
@@ -1,4 +1,3 @@
|
||||
DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
|
||||
DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
|
||||
DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
|
||||
DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
From ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4 Mon Sep 17 00:00:00 2001
|
||||
From: Iain Lane <iain@orangesquash.org.uk>
|
||||
Date: Mon, 13 Mar 2017 16:52:11 +0000
|
||||
Subject: [PATCH] tests/gdatetime: Use a real rather than invented timezone
|
||||
|
||||
The tzdata maintainers had previously invented abbreviations for
|
||||
timezones. As of their 2017a release, the one we were testing ("BRT")
|
||||
has been dropped.
|
||||
|
||||
Switch to testing PST, which is a real timezone abbreviation.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=779799
|
||||
---
|
||||
glib/tests/gdatetime.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
|
||||
index dcb8a8f..c54031d 100644
|
||||
--- a/glib/tests/gdatetime.c
|
||||
+++ b/glib/tests/gdatetime.c
|
||||
@@ -635,22 +635,22 @@ test_GDateTime_new_full (void)
|
||||
g_date_time_unref (dt);
|
||||
|
||||
#ifdef G_OS_UNIX
|
||||
- tz = g_time_zone_new ("America/Recife");
|
||||
+ tz = g_time_zone_new ("America/Tijuana");
|
||||
#elif defined G_OS_WIN32
|
||||
- tz = g_time_zone_new ("E. South America Standard Time");
|
||||
+ tz = g_time_zone_new ("Pacific Standard Time");
|
||||
#endif
|
||||
- dt = g_date_time_new (tz, 2010, 5, 24, 8, 4, 0);
|
||||
+ dt = g_date_time_new (tz, 2010, 11, 24, 8, 4, 0);
|
||||
g_time_zone_unref (tz);
|
||||
g_assert_cmpint (2010, ==, g_date_time_get_year (dt));
|
||||
- g_assert_cmpint (5, ==, g_date_time_get_month (dt));
|
||||
+ g_assert_cmpint (11, ==, g_date_time_get_month (dt));
|
||||
g_assert_cmpint (24, ==, g_date_time_get_day_of_month (dt));
|
||||
g_assert_cmpint (8, ==, g_date_time_get_hour (dt));
|
||||
g_assert_cmpint (4, ==, g_date_time_get_minute (dt));
|
||||
g_assert_cmpint (0, ==, g_date_time_get_second (dt));
|
||||
#ifdef G_OS_UNIX
|
||||
- g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt));
|
||||
+ g_assert_cmpstr ("PST", ==, g_date_time_get_timezone_abbreviation (dt));
|
||||
#elif defined G_OS_WIN32
|
||||
- g_assert_cmpstr ("E. South America Standard Time", ==,
|
||||
+ g_assert_cmpstr ("Pacific Standard Time", ==,
|
||||
g_date_time_get_timezone_abbreviation (dt));
|
||||
#endif
|
||||
g_assert (!g_date_time_is_daylight_savings (dt));
|
||||
--
|
||||
2.10.1
|
||||
|
||||
@@ -1,303 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
|
||||
# adding new dependencies end up making stage3 to grow. Every addition needs
|
||||
# then to be think very closely.
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
# Completely useless with or without USE static-libs, people need to use
|
||||
# pkg-config
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
|
||||
multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
|
||||
|
||||
DESCRIPTION="The GLib library of C routines"
|
||||
HOMEPAGE="https://www.gtk.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="2"
|
||||
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
|
||||
REQUIRED_USE="
|
||||
utils? ( ${PYTHON_REQUIRED_USE} )
|
||||
test? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
|
||||
# Added util-linux multilib dependency to have libmount support (which
|
||||
# is always turned on on linux systems, unless explicitly disabled, but
|
||||
# this ebuild does not do that anyway) (bug #599586)
|
||||
|
||||
RDEPEND="
|
||||
!<dev-util/gdbus-codegen-${PV}
|
||||
>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
|
||||
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
|
||||
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
|
||||
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
|
||||
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
|
||||
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
|
||||
utils? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
|
||||
virtual/libelf:0=
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
>=dev-libs/libxslt-1.0
|
||||
>=sys-devel/gettext-0.11
|
||||
>=dev-util/gtk-doc-am-1.20
|
||||
systemtap? ( >=dev-util/systemtap-1.3 )
|
||||
test? (
|
||||
sys-devel/gdb
|
||||
${PYTHON_DEPS}
|
||||
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
|
||||
>=sys-apps/dbus-1.2.14 )
|
||||
!<dev-util/gtk-doc-1.15-r2
|
||||
"
|
||||
PDEPEND="!<gnome-base/gvfs-1.6.4-r990
|
||||
dbus? ( gnome-base/dconf )
|
||||
mime? ( x11-misc/shared-mime-info )
|
||||
"
|
||||
# shared-mime-info needed for gio/xdgmime, bug #409481
|
||||
# dconf is needed to be able to save settings, bug #498436
|
||||
# Earlier versions of gvfs do not work with glib
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gio-querymodules$(get_exeext)
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use kernel_linux ; then
|
||||
CONFIG_CHECK="~INOTIFY_USER"
|
||||
if use test ; then
|
||||
CONFIG_CHECK="~IPV6"
|
||||
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
|
||||
fi
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
|
||||
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
|
||||
|
||||
if use test; then
|
||||
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
|
||||
if ! has_version dev-util/desktop-file-utils ; then
|
||||
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
|
||||
ewarn "think on installing it to get these tests run."
|
||||
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
|
||||
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
|
||||
fi
|
||||
|
||||
# gdesktopappinfo requires existing terminal (gnome-terminal or any
|
||||
# other), falling back to xterm if one doesn't exist
|
||||
if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
|
||||
ewarn "Some tests will be skipped due to missing terminal program"
|
||||
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
|
||||
fi
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
|
||||
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
|
||||
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
|
||||
|
||||
ewarn "Tests for search-utils have been skipped"
|
||||
sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
|
||||
else
|
||||
# Don't build tests, also prevents extra deps, bug #512022
|
||||
sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
|
||||
fi
|
||||
|
||||
# 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.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
|
||||
# arg, but that would mean a build dep on python when USE=utils.
|
||||
sed -e '/${PYTHON}/d' \
|
||||
-i glib/Makefile.{am,in} || die
|
||||
|
||||
# Also needed to prevent cross-compile failures, see bug #267603
|
||||
eautoreconf
|
||||
|
||||
gnome2_src_prepare
|
||||
|
||||
epunt_cxx
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Avoid circular depend with dev-util/pkgconfig and
|
||||
# native builds (cross-compiles won't need pkg-config
|
||||
# in the target ROOT to work here)
|
||||
if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
|
||||
if has_version sys-apps/dbus; then
|
||||
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
|
||||
export DBUS1_LIBS="-ldbus-1"
|
||||
fi
|
||||
export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
|
||||
export LIBFFI_LIBS="-lffi"
|
||||
export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
|
||||
export PCRE_LIBS="-lpcre"
|
||||
fi
|
||||
|
||||
# These configure tests don't work when cross-compiling.
|
||||
if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
case ${CHOST} in
|
||||
hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
*) export glib_cv_stack_grows=no ;;
|
||||
esac
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756474
|
||||
export glib_cv_uscore=no
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756475
|
||||
export ac_cv_func_posix_get{pwuid,grgid}_r=yes
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
case "${CHOST}" in
|
||||
*-mingw*) myconf="${myconf} --with-threads=win32" ;;
|
||||
*) myconf="${myconf} --with-threads=posix" ;;
|
||||
esac
|
||||
|
||||
# libelf used only by the gresource bin
|
||||
ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
|
||||
$(usex debug --enable-debug=yes ' ') \
|
||||
$(use_enable xattr) \
|
||||
$(use_enable fam) \
|
||||
$(use_enable kernel_linux libmount) \
|
||||
$(use_enable selinux) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable systemtap dtrace) \
|
||||
$(use_enable systemtap systemtap) \
|
||||
$(multilib_native_use_enable utils libelf) \
|
||||
--disable-compile-warnings \
|
||||
--enable-man \
|
||||
--with-pcre=system \
|
||||
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
local d
|
||||
for d in glib gio gobject; do
|
||||
ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
export XDG_CONFIG_DIRS=/etc/xdg
|
||||
export XDG_DATA_DIRS=/usr/local/share:/usr/share
|
||||
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
|
||||
export LC_TIME=C # bug #411967
|
||||
unset GSETTINGS_BACKEND # bug #596380
|
||||
python_setup
|
||||
|
||||
# Related test is a bit nitpicking
|
||||
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
|
||||
|
||||
# Hardened: gdb needs this, bug #338891
|
||||
if host-is-pax ; then
|
||||
pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
|
||||
|| die "Hardened adjustment failed"
|
||||
fi
|
||||
|
||||
# Need X for dbus-launch session X11 initialization
|
||||
virtx emake check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
gnome2_src_install completiondir="$(get_bashcompdir)"
|
||||
keepdir /usr/$(get_libdir)/gio/modules
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if use utils ; then
|
||||
python_replicate_script "${ED}"/usr/bin/gtester-report
|
||||
else
|
||||
rm "${ED}usr/bin/gtester-report"
|
||||
rm "${ED}usr/share/man/man1/gtester-report.1"
|
||||
fi
|
||||
|
||||
# Do not install charset.alias even if generated, leave it to libiconv
|
||||
rm -f "${ED}/usr/lib/charset.alias"
|
||||
|
||||
# Don't install gdb python macros, bug 291328
|
||||
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
|
||||
# Make gschemas.compiled belong to glib alone
|
||||
local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"/${cache} || die
|
||||
fi
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make giomodule.cache belong to glib alone
|
||||
local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"/${cache} || die
|
||||
fi
|
||||
}
|
||||
|
||||
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
|
||||
# file due to inability to create it and GIO might not look at any of the modules there
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_preinst
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# force (re)generation of gschemas.compiled
|
||||
GNOME2_ECLASS_GLIB_SCHEMAS="force"
|
||||
|
||||
gnome2_pkg_postinst
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_giomodule_cache_update \
|
||||
|| die "Update GIO modules cache failed (for ${ABI})"
|
||||
}
|
||||
if ! tc-is-cross-compiler ; then
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
else
|
||||
ewarn "Updating of GIO modules cache skipped due to cross-compilation."
|
||||
ewarn "You might want to run gio-querymodules manually on the target for"
|
||||
ewarn "your final image for performance reasons and re-run it when packages"
|
||||
ewarn "installing GIO modules get upgraded or added to the image."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_pkg_postrm
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user