diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/glib/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/glib/files/gengiotypefuncs.py | 45 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch | 116 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.54.3-r4.ebuild | 301 |
4 files changed, 464 insertions, 0 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest new file mode 100644 index 00000000..28493390 --- /dev/null +++ b/dev-libs/glib/Manifest @@ -0,0 +1,2 @@ +DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d +DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 diff --git a/dev-libs/glib/files/gengiotypefuncs.py b/dev-libs/glib/files/gengiotypefuncs.py new file mode 100644 index 00000000..9732d789 --- /dev/null +++ b/dev-libs/glib/files/gengiotypefuncs.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import sys +import re +import os + +debug = os.getenv('GIO_GENTYPEFUNCS_DEBUG') is not None + +out_file = sys.argv[1] +in_files = sys.argv[2:] + +funcs = [] + + +if debug: print ('Output file: ', out_file) + +if debug: print (len(in_files), 'input files') + +for filename in in_files: + if debug: print ('Input file: ', filename) + with open(filename, "r") as f: + for line in f: + line = line.rstrip('\n').rstrip('\r') + # print line + match = re.search(r'\bg_[a-zA-Z0-9_]*_get_type\b', line) + if match: + func = match.group(0) + if not func in funcs: + funcs.append(func) + if debug: print ('Found ', func) + +file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n' + +funcs = sorted(funcs) + +for f in funcs: + if f not in ['g_io_extension_get_type', 'g_settings_backend_get_type']: + file_output += '*tp++ = {0} ();\n'.format(f) + +if debug: print (len(funcs), 'functions') + +ofile = open(out_file, "w") +ofile.write(file_output) +ofile.close() diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch new file mode 100644 index 00000000..45025b65 --- /dev/null +++ b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch @@ -0,0 +1,116 @@ +From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhan@gentoo.org> +Date: Fri, 23 Feb 2018 15:27:33 +0330 +Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools + +--- + configure.ac | 17 ++++++++--------- + docs/reference/gio/Makefile.am | 1 - + gio/Makefile.am | 2 +- + gio/tests/Makefile.am | 6 ++---- + gio/tests/gdbus-object-manager-example/Makefile.am | 8 +++----- + 5 files changed, 14 insertions(+), 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0457c90..07166c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -382,14 +382,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 +-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 *********************** +@@ -3469,7 +3469,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 5741a3e..d38e768 100644 +--- a/docs/reference/gio/Makefile.am ++++ b/docs/reference/gio/Makefile.am +@@ -177,7 +177,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 b2db995..53d7162 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 + if !OS_COCOA +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am +index acc1da4..7c51eab 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am +@@ -460,10 +460,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 1d0464c..f390dca 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 \ +@@ -46,4 +44,4 @@ EXTRA_DIST += gdbus-example-objectmanager.xml + + CLEANFILES += $(GDBUS_GENERATED) + +-check-TESTS: +\ No newline at end of file ++check-TESTS: +-- +2.16.1 + diff --git a/dev-libs/glib/glib-2.54.3-r4.ebuild b/dev-libs/glib/glib-2.54.3-r4.ebuild new file mode 100644 index 00000000..db057e34 --- /dev/null +++ b/dev-libs/glib/glib-2.54.3-r4.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.54.3-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 +} |