commit:     eafd62380dc5ea6dae3b12fc691a6cf563975e07
Author:     RĂ©mi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 10:17:02 2018 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 10:17:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=eafd6238

dev-libs/glib: bump to 2.56.1

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE0663D48103108F8

 ...56.1-external-gdbus-codegen-for-autotools.patch | 133 +++++++++
 dev-libs/glib/glib-2.56.1.ebuild                   | 301 +++++++++++++++++++++
 2 files changed, 434 insertions(+)

diff --git 
a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch 
b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
new file mode 100644
index 00000000..7e73f748
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
@@ -0,0 +1,133 @@
+From db0a3301203e0c62db274bde8ac20cbfbb71889f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sob...@gentoo.org>
+Date: Fri, 23 Feb 2018 15:27:33 +0330
+Subject: [PATCH 2/2] glib-2.54.3-external-gdbus-codegen-for-autotools
+
+---
+ configure.ac                                    | 17 ++++++++---------
+ docs/reference/gio/Makefile.am                  |  1 -
+ gio/Makefile.am                                 | 12 ++++--------
+ gio/tests/Makefile.am                           |  6 ++----
+ .../gdbus-object-manager-example/Makefile.am    |  6 ++----
+ 5 files changed, 16 insertions(+), 26 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2013d198e..7d2d686c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -360,14 +360,14 @@ AC_CHECK_PROGS(PERL, [perl5 perl])
+ # 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.7,,PYTHON="python2.7")
++#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.7,,PYTHON="python2.7")
+ 
+ 
+ dnl ***********************
+@@ -3567,7 +3567,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 e04ab6843..3a518af02 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -178,7 +178,6 @@ man_MANS +=                                \
+       gsettings.1                     \
+       gresource.1                     \
+       gdbus.1                         \
+-      gdbus-codegen.1                 \
+       gio.1                           \
+       $(NULL)
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 67b7fa966..334c6e32d 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
+@@ -101,10 +101,8 @@ GDBUS_PYTHON_DEPS =                                       
\
+       $(builddir)/gdbus-2.0/codegen/config.py         \
+       $(srcdir)/gdbus-2.0/codegen/utils.py
+ 
+-gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml 
$(GDBUS_PYTHON_DEPS)
+-      $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-              UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-              $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
++gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml
++      $(AM_V_GEN) gdbus-codegen \
+               --interface-prefix org. \
+               --generate-c-code gdbus-daemon-generated \
+               --c-namespace _G \
+@@ -375,9 +373,7 @@ portal_interfaces = \
+ EXTRA_DIST += $(portal_interfaces)
+ 
+ $(xdp_dbus_built_sources) : $(portal_interfaces)
+-      $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir)               \
+-              UNINSTALLED_GLIB_BUILDDIR=$(top_builddir)               \
+-              $(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in  \
++      $(AM_V_GEN) gdbus-codegen       \
+               --interface-prefix org.freedesktop.portal.              \
+               --c-namespace GXdp                                      \
+               --generate-c-code $(builddir)/xdp-dbus                  \
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 14cd928d2..2fd7a6e41 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -483,10 +483,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
+-gdbus-test-codegen-generated.h: 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: 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 1d0464c5c..0603d9b0a 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 \
+-- 
+2.17.0
+

diff --git a/dev-libs/glib/glib-2.56.1.ebuild b/dev-libs/glib/glib-2.56.1.ebuild
new file mode 100644
index 00000000..06c64dfa
--- /dev/null
+++ b/dev-libs/glib/glib-2.56.1.ebuild
@@ -0,0 +1,301 @@
+# 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.1+"
+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
+
+       # gdbus-codegen is a separate package
+       eapply 
"${FILESDIR}"/${PN}-2.56.1-external-gdbus-codegen-for-autotools.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
+       sed -e 's:@PYTHON@:python:' \
+               -i gobject/glib-{genmarshal.in,mkenums.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
+}

Reply via email to