commit: 3beb1e16ab710d0c017a3171a0d58f2b16196de5 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Sat Aug 18 06:41:07 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Aug 18 09:51:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3beb1e16
dev-libs/glib: remove old and sync PYTHON_COMP .../files/glib-2.50.3-fix-gdatetime-tests.patch | 52 ---- dev-libs/glib/glib-2.50.3-r1.ebuild | 308 --------------------- dev-libs/glib/glib-2.54.3-r6.ebuild | 2 +- 3 files changed, 1 insertion(+), 361 deletions(-) diff --git a/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch b/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch deleted file mode 100644 index 6c41c5c..0000000 --- a/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4 Mon Sep 17 00:00:00 2001 -From: Iain Lane <[email protected]> -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 - diff --git a/dev-libs/glib/glib-2.50.3-r1.ebuild b/dev-libs/glib/glib-2.50.3-r1.ebuild deleted file mode 100644 index 28b779a..0000000 --- a/dev-libs/glib/glib-2.50.3-r1.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2017 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="amd64 arm arm64 ia64 ~mips ppc sh sparc x86" - -# 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() { - - # Fix for MUSL - eapply "${FILESDIR}"/quark_init_on_demand.patch - eapply "${FILESDIR}"/gobject_init_on_demand.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 - - # 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 -} diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild index 9f47cc2..4521ac0 100644 --- a/dev-libs/glib/glib-2.54.3-r6.ebuild +++ b/dev-libs/glib/glib-2.54.3-r6.ebuild @@ -6,7 +6,7 @@ # then to be think very closely. EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) # Completely useless with or without USE static-libs, people need to use # pkg-config GNOME2_LA_PUNT="yes"
