* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2011-12-20 15:29 Priit Laes
0 siblings, 0 replies; 19+ messages in thread
From: Priit Laes @ 2011-12-20 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 6dd4675ffc793cb79e7ec2d5b36b60c67eedbd76
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Dec 20 15:09:11 2011 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Dec 20 15:09:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6dd4675f
dev-libs/glib: Added 2.31.6 to overlay
---
dev-libs/glib/files/glib-2.30.1-homedir-env.patch | 61 --------------------
.../glib/{glib-9999.ebuild => glib-2.31.6.ebuild} | 23 ++------
dev-libs/glib/glib-9999.ebuild | 3 -
3 files changed, 6 insertions(+), 81 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
deleted file mode 100644
index 30d4499..0000000
--- a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Handle the G_HOME environment variable to override the passwd entry
- This will allow to fix various kinds of build failures due to restricted
- build environments.
-Author: Josselin Mouette <joss@debian.org>
-Origin: vendor
-
---- a/docs/reference/glib/running.sgml
-+++ b/docs/reference/glib/running.sgml
-@@ -213,6 +213,22 @@
- </para>
- </formalpara>
-
-+<formalpara id="G_HOME">
-+ <title><envar>G_HOME</envar></title>
-+
-+ <para>
-+ For various reasons, GLib applications ignore the <envar>HOME</envar>
-+ environment variable on Unix systems and will use the user directory
-+ as specified by the <filename>passwd</filename> entry, which is more
-+ reliable.
-+ </para>
-+ <para>
-+ The <envar>G_HOME</envar> environment variable will override any
-+ other setting for the home directory. It is not meant for daily usage,
-+ but it is useful in testing or building environments.
-+ </para>
-+</formalpara>
-+
- </refsect2>
-
- <refsect2 id="setlocale">
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1626,11 +1626,14 @@
- }
- #endif /* !G_OS_WIN32 */
-
-+ g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+
- #ifdef G_OS_WIN32
- /* We check $HOME first for Win32, though it is a last resort for Unix
- * where we prefer the results of getpwuid().
- */
-- g_home_dir = g_strdup (g_getenv ("HOME"));
-+ if (!g_home_dir)
-+ g_home_dir = g_strdup (g_getenv ("HOME"));
-
- /* Only believe HOME if it is an absolute path and exists */
- if (g_home_dir)
-@@ -1926,6 +1929,11 @@
- * homedir = g_get_home_dir (<!-- -->);
- * ]|
- *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * entry.
-+ *
- * Returns: the current user's home directory
- */
- G_CONST_RETURN gchar*
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-2.31.6.ebuild
similarity index 92%
copy from dev-libs/glib/glib-9999.ebuild
copy to dev-libs/glib/glib-2.31.6.ebuild
index 28ffe51..9955567 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-2.31.6.ebuild
@@ -1,15 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.2 2011/11/14 19:06:22 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
# Avoid runtime dependency on python when USE=test
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
@@ -19,11 +16,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="2"
IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
RDEPEND="virtual/libiconv
virtual/libffi
@@ -36,6 +29,7 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.15
doc? (
>=dev-libs/libxslt-1.0
+ >=dev-util/gdbus-codegen-${PV}
>=dev-util/gtk-doc-1.15
~app-text/docbook-xml-dtd-4.1.2 )
systemtap? ( >=dev-util/systemtap-1.3 )
@@ -56,7 +50,6 @@ pkg_setup() {
}
src_prepare() {
- [[ ${PV} = 9999 ]] && gnome2-live_src_prepare
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
if use ia64 ; then
@@ -82,7 +75,8 @@ src_prepare() {
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- if ! use test; then
+ # need to build tests if USE=doc for bug #387385
+ if ! use test && ! use doc; then
# don't waste time building tests
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
else
@@ -115,9 +109,6 @@ src_prepare() {
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
- # Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
- epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
-
# disable pyc compiling
ln -sfn $(type -P true) py-compile
@@ -181,8 +172,6 @@ src_install() {
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
- # This is there for git snapshots and the live ebuild, bug 351966
- emake README || die "emake README failed"
dodoc AUTHORS ChangeLog* NEWS* README
insinto /usr/share/bash-completion
@@ -193,7 +182,7 @@ src_install() {
# Completely useless with or without USE static-libs, people need to use
# pkg-config
- find "${E}" -name '*.la' -exec rm -f {} +
+ find "${D}" -name '*.la' -exec rm -f {} +
}
src_test() {
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 28ffe51..6e2b02b 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -115,9 +115,6 @@ src_prepare() {
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
- # Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
- epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
-
# disable pyc compiling
ln -sfn $(type -P true) py-compile
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2018-08-20 8:33 Mart Raudsepp
0 siblings, 0 replies; 19+ messages in thread
From: Mart Raudsepp @ 2018-08-20 8:33 UTC (permalink / raw
To: gentoo-commits
commit: bb6944d17f7fff869982b57c67a89c45257cb2d0
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 20 08:30:31 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 08:30:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bb6944d1
dev-libs/glib: remove old; 2.56.2 available in main tree
2.56.2 in main tree has split glib-utils - use that.
9999 remains as an example for initial meson conversion, but it
collides with glib-utils from main tree and needs ebuild sync
and updates
Package-Manager: Portage-2.3.47, Repoman-2.3.10
.../files/glib-2.40.0-external-gdbus-codegen.patch | 95 -------
...54.3-external-gdbus-codegen-for-autotools.patch | 116 --------
...56.1-external-gdbus-codegen-for-autotools.patch | 86 ------
dev-libs/glib/glib-2.54.3-r2.ebuild | 302 ---------------------
dev-libs/glib/glib-2.54.3-r4.ebuild | 301 --------------------
dev-libs/glib/glib-2.56.1-r1.ebuild | 300 --------------------
6 files changed, 1200 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
deleted file mode 100644
index 50a9370e..00000000
--- a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a01e58d..59d4527 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -367,14 +367,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.5,,PYTHON="/usr/bin/env python2.5")
-+# 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.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3580,7 +3580,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 47fdd38..c7eb136 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -157,8 +157,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e993e2f..025ad94 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
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 2c54e59..3cd3c5a 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -437,10 +437,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 d6d1412..62ef706 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 \
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
deleted file mode 100644
index 45025b65..00000000
--- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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/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
deleted file mode 100644
index a27966e0..00000000
--- a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 | 1 -
- docs/reference/gio/Makefile.am | 1 -
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0457c90..07166c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -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 \
---
-2.16.1
-
diff --git a/dev-libs/glib/glib-2.54.3-r2.ebuild b/dev-libs/glib/glib-2.54.3-r2.ebuild
deleted file mode 100644
index 8f25e3c9..00000000
--- a/dev-libs/glib/glib-2.54.3-r2.ebuild
+++ /dev/null
@@ -1,302 +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 bash-completion-r1 epunt-cxx flag-o-matic gnome-meson 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
- # Copy missing gengiotypefuncs.py
- cp "${FILESDIR}"/gengiotypefuncs.py "${S}"/gio/tests/ || die
-
- # We need gengiotypefuncs
- 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.2-external-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
-
- gnome-meson_src_prepare
-
- epunt_cxx
-}
-
-multilib_src_configure() {
- # TODO is this still relevent?
- # 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
-
- # FIXME multilib automagic for libelf
- # FIXME set systemtap/tapse/static-lib install dir and test it.
- # FIXME no selinux, fam, xattr for now.
- # FIXME enable docs if possible.
-
- use static-libs && myconf="-Ddefault_library='static'"
- use debug && myconf="$myconf -Dbuildtype='debug'"
-
- gnome-meson_src_configure \
- ${myconf} \
- -Denable-libmount=$(usex kernel_linux yes no) \
- $(meson_use systemtap enable-dtrace) \
- $(meson_use systemtap enable-systemtap) \
- -Dwith-pcre=system \
- -Dwith-docs=no \
- -Dwith-man=yes
-
- 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_compile() {
- gnome-meson_src_compile
-}
-# FIXME
-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 meson_src_test
-}
-
-multilib_src_install() {
- chmod +x glib-gettextize || die
- gnome-meson_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() {
- gnome-meson_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"
-
- gnome-meson_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() {
- gnome-meson_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-r4.ebuild b/dev-libs/glib/glib-2.54.3-r4.ebuild
deleted file mode 100644
index db057e34..00000000
--- a/dev-libs/glib/glib-2.54.3-r4.ebuild
+++ /dev/null
@@ -1,301 +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.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
-}
diff --git a/dev-libs/glib/glib-2.56.1-r1.ebuild b/dev-libs/glib/glib-2.56.1-r1.ebuild
deleted file mode 100644
index 8ff7a9f9..00000000
--- a/dev-libs/glib/glib-2.56.1-r1.ebuild
+++ /dev/null
@@ -1,300 +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=( python{2_7,3_5,3_6} )
-# 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-single-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="
- ${PYTHON_REQUIRED_USE}
- test? ( ${PYTHON_REQUIRED_USE} )
-" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson
-
-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}] )
- ${PYTHON_DEPS}
- utils? (
- >=dev-util/gdbus-codegen-${PV}
- 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}
- >=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
- # FIXME: Move python deps that are only required at build time of other packages to a split package
- python-single-r1_pkg_setup
-}
-
-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 gtester-report python shebang alone - handled by python_fix_shebang
- 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) \
- --with-python=${EPYTHON} \
- --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_fix_shebang "${ED}"/usr/bin/gtester-report
- else
- # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
- 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
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2018-06-24 14:05 Sobhan Mohammadpour
0 siblings, 0 replies; 19+ messages in thread
From: Sobhan Mohammadpour @ 2018-06-24 14:05 UTC (permalink / raw
To: gentoo-commits
commit: d07dc3eec37ee1ce3a2e5b047f2e067dffab6ebd
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 14:04:18 2018 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 14:04:18 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d07dc3ee
dev-libs/glib: import the fixes from the main tree
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1
...56.1-external-gdbus-codegen-for-autotools.patch | 83 +++++-----------------
.../{glib-2.56.1.ebuild => glib-2.56.1-r1.ebuild} | 29 ++++----
2 files changed, 32 insertions(+), 80 deletions(-)
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
index 7e73f748..a27966e0 100644
--- 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
@@ -1,44 +1,21 @@
-From db0a3301203e0c62db274bde8ac20cbfbb71889f Mon Sep 17 00:00:00 2001
+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 2/2] glib-2.54.3-external-gdbus-codegen-for-autotools
+Subject: [PATCH] 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(-)
+ configure.ac | 1 -
+ docs/reference/gio/Makefile.am | 1 -
+ gio/Makefile.am | 2 +-
+ gio/tests/Makefile.am | 6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
+ 5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 2013d198e..7d2d686c5 100644
+index 0457c90..07166c9 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
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
gobject/tests/Makefile
gthread/Makefile
gio/Makefile
@@ -47,10 +24,10 @@ index 2013d198e..7d2d686c5 100644
gio/gnetworking.h
gio/xdgmime/Makefile
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index e04ab6843..3a518af02 100644
+index 5741a3e..d38e768 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
-@@ -178,7 +178,6 @@ man_MANS += \
+@@ -177,7 +177,6 @@ man_MANS += \
gsettings.1 \
gresource.1 \
gdbus.1 \
@@ -59,7 +36,7 @@ index e04ab6843..3a518af02 100644
$(NULL)
diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 67b7fa966..334c6e32d 100644
+index b2db995..53d7162 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -1,6 +1,6 @@
@@ -69,36 +46,12 @@ index 67b7fa966..334c6e32d 100644
+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 \
+ if !OS_COCOA
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 14cd928d2..2fd7a6e41 100644
+index acc1da4..7c51eab 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -483,10 +483,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica
+@@ -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
@@ -112,7 +65,7 @@ index 14cd928d2..2fd7a6e41 100644
--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
+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 = \
@@ -129,5 +82,5 @@ index 1d0464c5c..0603d9b0a 100644
--c-namespace Example \
--c-generate-object-manager \
--
-2.17.0
+2.16.1
diff --git a/dev-libs/glib/glib-2.56.1.ebuild b/dev-libs/glib/glib-2.56.1-r1.ebuild
similarity index 91%
rename from dev-libs/glib/glib-2.56.1.ebuild
rename to dev-libs/glib/glib-2.56.1-r1.ebuild
index 06c64dfa..8ff7a9f9 100644
--- a/dev-libs/glib/glib-2.56.1.ebuild
+++ b/dev-libs/glib/glib-2.56.1-r1.ebuild
@@ -6,13 +6,13 @@
# then to be think very closely.
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
# 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
+ multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="https://www.gtk.org/"
@@ -23,9 +23,9 @@ 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} )
+ ${PYTHON_REQUIRED_USE}
test? ( ${PYTHON_REQUIRED_USE} )
-"
+" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson
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"
@@ -44,9 +44,9 @@ RDEPEND="
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}] )
+ ${PYTHON_DEPS}
utils? (
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ >=dev-util/gdbus-codegen-${PV}
virtual/libelf:0=
)
"
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
test? (
sys-devel/gdb
${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ >=dev-util/gdbus-codegen-${PV}
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2
"
@@ -84,6 +84,8 @@ pkg_setup() {
fi
linux-info_pkg_setup
fi
+ # FIXME: Move python deps that are only required at build time of other packages to a split package
+ python-single-r1_pkg_setup
}
src_prepare() {
@@ -119,14 +121,9 @@ src_prepare() {
# gdbus-codegen is a separate package
eapply "${FILESDIR}"/${PN}-2.56.1-external-gdbus-codegen-for-autotools.patch
+ # Leave gtester-report python shebang alone - handled by python_fix_shebang
+ sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die
- # 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
@@ -181,6 +178,7 @@ multilib_src_configure() {
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
$(multilib_native_use_enable utils libelf) \
+ --with-python=${EPYTHON} \
--disable-compile-warnings \
--enable-man \
--with-pcre=system \
@@ -225,8 +223,9 @@ multilib_src_install_all() {
einstalldocs
if use utils ; then
- python_replicate_script "${ED}"/usr/bin/gtester-report
+ python_fix_shebang "${ED}"/usr/bin/gtester-report
else
+ # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
rm "${ED}usr/bin/gtester-report"
rm "${ED}usr/share/man/man1/gtester-report.1"
fi
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2018-01-02 15:17 Sobhan Mohammadpour
0 siblings, 0 replies; 19+ messages in thread
From: Sobhan Mohammadpour @ 2018-01-02 15:17 UTC (permalink / raw
To: gentoo-commits
commit: c7531c44e7b7be5ee795894aa6de15c182ef0f15
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 15:16:57 2018 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 15:16:57 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c7531c44
dev-libs/glib: add 2.54.1
used ebuild and patch from https://github.com/mattst88/gentoo/tree/gnome/dev-libs/glib
fixed the ebuild
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --force
Manifest-Sign-Key: 0x7DF238CF0AA182E1
.../files/glib-2.54.1-external-gdbus-codegen.patch | 93 +++++++
dev-libs/glib/glib-2.54.1.ebuild | 302 +++++++++++++++++++++
2 files changed, 395 insertions(+)
diff --git a/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch
new file mode 100644
index 00000000..162d7fa7
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.54.1-external-gdbus-codegen.patch
@@ -0,0 +1,93 @@
+diff --git a/configure.ac b/configure.ac
+index 9cd151075..2b907f66b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -372,14 +372,14 @@ AC_SUBST(REBUILD)
+ # 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 ***********************
+@@ -3475,7 +3475,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 5741a3edc..d38e768ff 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 1ffe0cc6f..bfd7b535e 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
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 4e269dc26..0bcc16899 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -461,10 +461,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..b0ce60ca7 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 \
diff --git a/dev-libs/glib/glib-2.54.1.ebuild b/dev-libs/glib/glib-2.54.1.ebuild
new file mode 100644
index 00000000..857d07cc
--- /dev/null
+++ b/dev-libs/glib/glib-2.54.1.ebuild
@@ -0,0 +1,302 @@
+# 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 ~sparc-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.1-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
+
+ sed -e 's:@PYTHON@:python:' \
+ -i gobject/glib-{genmarshal,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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2017-12-18 13:50 Sobhan Mohammadpour
0 siblings, 0 replies; 19+ messages in thread
From: Sobhan Mohammadpour @ 2017-12-18 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 14aadaaa2a8eaf806d3cdaf4708855fca846ab04
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 13:50:10 2017 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 13:50:10 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=14aadaaa
dev-libs/glib: Bump to 2.54.2
Bump to 2.54.2. this ebuild uses meson, fam, xattr, selinux,
systemtap need checking.
Package-Manager: Portage-2.3.18, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1
dev-libs/glib/files/gengiotypefuncs.py | 45 +++
.../glib/files/glib-2.54.2-external-codegen.patch | 101 +++++++
dev-libs/glib/glib-2.54.2.ebuild | 304 +++++++++++++++++++++
3 files changed, 450 insertions(+)
diff --git a/dev-libs/glib/files/gengiotypefuncs.py b/dev-libs/glib/files/gengiotypefuncs.py
new file mode 100755
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.2-external-codegen.patch b/dev-libs/glib/files/glib-2.54.2-external-codegen.patch
new file mode 100644
index 00000000..3c654216
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.54.2-external-codegen.patch
@@ -0,0 +1,101 @@
+From d4a7cb8d053daab95b8d250af6b21c81bc860777 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <mohammadpour.sobhan@gmail.com>
+Date: Sat, 16 Dec 2017 21:30:22 +0330
+Subject: [PATCH] glib-2.54.2 external codegen
+
+---
+ docs/reference/gio/meson.build | 4 +---
+ gio/meson.build | 6 +++---
+ gio/tests/gdbus-object-manager-example/meson.build | 2 +-
+ gio/tests/meson.build | 2 +-
+ 4 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
+index 7f04677..71b5e0c 100644
+--- a/docs/reference/gio/meson.build
++++ b/docs/reference/gio/meson.build
+@@ -121,7 +121,6 @@ if get_option('with-docs') != 'no'
+ 'gsettings.xml',
+ 'gresource.xml',
+ 'gdbus.xml',
+- 'gdbus-codegen.xml',
+ ],
+ expand_content_files : [
+ 'overview.xml',
+@@ -129,7 +128,6 @@ if get_option('with-docs') != 'no'
+ 'migrating-gnome-vfs.xml',
+ 'migrating-gconf.xml',
+ 'migrating-gdbus.xml',
+- 'gdbus-codegen.xml',
+ ],
+ html_assets : [
+ 'gvfs-overview.png',
+@@ -149,7 +147,7 @@ endif
+ if get_option('with-man') != 'no' and xsltproc.found()
+ manpages = ['gapplication', 'gio-querymodules', 'glib-compile-schemas',
+ 'glib-compile-resources', 'gsettings', 'gresource', 'gdbus',
+- 'gio', 'gdbus-codegen']
++ 'gio']
+ foreach page : manpages
+ custom_target(page + '-man',
+ input: page + '.xml',
+diff --git a/gio/meson.build b/gio/meson.build
+index 3252636..3c566ed 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -165,7 +165,7 @@ gdbus_sources = [
+ ]
+
+ # Generate gdbus-codegen
+-subdir('gdbus-2.0/codegen')
++#subdir('gdbus-2.0/codegen')
+
+ # Generate xdp-dbus.{c,h}
+ xdp_dbus_generated = custom_target('xdp-dbus',
+@@ -174,7 +174,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
+ 'org.freedesktop.portal.NetworkMonitor.xml',
+ 'org.freedesktop.portal.ProxyResolver.xml'],
+ output : ['xdp-dbus.h', 'xdp-dbus.c'],
+- command : [python, gdbus_codegen,
++ command : [find_program('gdbus-codegen'),
+ '--interface-prefix', 'org.freedesktop.portal.',
+ '--output-directory', '@OUTDIR@',
+ '--generate-c-code', 'xdp-dbus',
+@@ -193,7 +193,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
+ gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
+ input : ['dbus-daemon.xml'],
+ output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
+- command : [python, gdbus_codegen,
++ command : [find_program('gdbus-codegen'),
+ '--interface-prefix', 'org.',
+ '--output-directory', '@OUTDIR@',
+ '--generate-c-code', 'gdbus-daemon-generated',
+diff --git a/gio/tests/gdbus-object-manager-example/meson.build b/gio/tests/gdbus-object-manager-example/meson.build
+index 6303573..499bb9a 100644
+--- a/gio/tests/gdbus-object-manager-example/meson.build
++++ b/gio/tests/gdbus-object-manager-example/meson.build
+@@ -5,7 +5,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
+ 'gdbus-example-objectmanager-generated.c',
+ 'gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
+ 'gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
+- command : [python, gdbus_codegen,
++ command : [find_program('gdbus-codegen'),
+ '--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
+ '--c-namespace', 'Example',
+ '--c-generate-object-manager',
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index e149a4b..69a161e 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -145,7 +145,7 @@ if host_machine.system() != 'windows'
+ input : ['test-codegen.xml'],
+ output : ['gdbus-test-codegen-generated.h',
+ 'gdbus-test-codegen-generated.c'],
+- command : [python, gdbus_codegen,
++ command : [find_program('gdbus-codegen'),
+ '--interface-prefix', 'org.project.',
+ '--output-directory', '@OUTDIR@',
+ '--generate-c-code', 'gdbus-test-codegen-generated',
+--
+2.15.1
+
diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.2.ebuild
new file mode 100644
index 00000000..45b1f9de
--- /dev/null
+++ b/dev-libs/glib/glib-2.54.2.ebuild
@@ -0,0 +1,304 @@
+# 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 bash-completion-r1 epunt-cxx flag-o-matic gnome-meson 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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-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
+ # Copy missing gengiotypefuncs.py
+ cp "${FILESDIR}"/gengiotypefuncs.py "${S}"/gio/tests/ || die
+
+ # We need gengiotypefuncs
+ 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.2-external-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
+
+ gnome-meson_src_prepare
+
+ epunt_cxx
+}
+
+multilib_src_configure() {
+ # TODO is this still relevent?
+ # 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
+
+ # FIXME multilib automagic for libelf
+ # FIXME set systemtap/tapse/static-lib install dir and test it.
+ # FIXME no selinux, fam, xattr for now.
+ # FIXME is this still valid.
+ # libelf used only by the gresource bin ??
+ # FIXME enable docs if possible.
+
+ use static-libs && myconf="-Ddefault_library='static'"
+ use debug && myconf="$myconf -Dbuildtype='debug'"
+
+ gnome-meson_src_configure \
+ ${myconf} \
+ -Denable-libmount=$(usex kernel_linux yes no) \
+ $(gnome-meson_use systemtap dtrace) \
+ $(gnome-meson_use systemtap) \
+ -Dwith-pcre=system \
+ -Dwith-docs=no \
+ -Dwith-man=yes
+
+ 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_compile() {
+ gnome-meson_src_compile
+}
+# FIXME
+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 meson_src_test
+}
+
+# FIXME completentiondir
+multilib_src_install() {
+ gnome-meson_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() {
+ gnome-meson_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
+ gnome-meson_ECLASS_GLIB_SCHEMAS="force"
+
+ gnome-meson_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() {
+ gnome-meson_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
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2014-04-15 22:05 Gilles Dartiguelongue
0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-15 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 6a71ca5f6badd289042d2480c6744e5852728416
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 22:25:34 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:59:00 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6a71ca5f
dev-libs/glib: QAed
---
.../files/glib-2.37.x-external-gdbus-codegen.patch | 111 ---------------------
dev-libs/glib/files/glib-2.38.2-configure.patch | 24 -----
dev-libs/glib/files/glib-2.38.2-sigaction.patch | 23 -----
dev-libs/glib/glib-2.40.0.ebuild | 6 +-
dev-libs/glib/glib-9999.ebuild | 6 +-
5 files changed, 6 insertions(+), 164 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
deleted file mode 100644
index f87c146..0000000
--- a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH 3/4] Split out gdbus codegen
-
----
- configure.ac | 17 ++++++++---------
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 797cb92..907c534 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -378,14 +378,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.5,,PYTHON="/usr/bin/env python2.5")
-+# 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.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3784,7 +3784,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 112626b..8ddcdbc 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -151,8 +151,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 717419f..808b5dd 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
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 7224124..5c8baaa 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
- nodist_gdbus_test_codegen_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 gdbus-test-codegen-generated.c: 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 gdbus-test-codegen-generated.c: 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 d6d1412..62ef706 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 \
---
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch b/dev-libs/glib/files/glib-2.38.2-configure.patch
deleted file mode 100644
index 8f08ca0..0000000
--- a/dev-libs/glib/files/glib-2.38.2-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
-From: Patrick Welche <prlw1@cam.ac.uk>
-Date: Thu, 07 Nov 2013 10:58:46 +0000
-Subject: configure: test(1) uses = to test for string equality
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711600
----
-(limited to 'm4macros/glibtests.m4')
-
-diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
-index 27e9024..7d5920a 100644
---- a/m4macros/glibtests.m4
-+++ b/m4macros/glibtests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
- esac])
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
-- if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+ if test "$ENABLE_INSTALLED_TESTS" = "1"; then
- AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
- AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
- fi
---
-cgit v0.9.2
diff --git a/dev-libs/glib/files/glib-2.38.2-sigaction.patch b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
deleted file mode 100644
index f87e224..0000000
--- a/dev-libs/glib/files/glib-2.38.2-sigaction.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 81d0ebe29ccd852e969acda7394969e3f13eb136 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 31 Oct 2013 11:43:14 +0100
-Subject: [PATCH] gmain: Fix use of uninitialized memory in sigaction structure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711754
-
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 9c37bb2..608c1a5 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -4978,6 +4978,7 @@ unref_unix_signal_handler_unlocked (int signum)
- if (unix_signal_refcount[signum] == 0)
- {
- struct sigaction action;
-+ memset (&action, 0, sizeof (action));
- action.sa_handler = SIG_DFL;
- sigemptyset (&action.sa_mask);
- sigaction (signum, &action, NULL);
---
-Gitg
-
diff --git a/dev-libs/glib/glib-2.40.0.ebuild b/dev-libs/glib/glib-2.40.0.ebuild
index 55d0f08..dbef917 100644
--- a/dev-libs/glib/glib-2.40.0.ebuild
+++ b/dev-libs/glib/glib-2.40.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.5 2014/03/28 02:11:52 jer Exp $
+# $Header: $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2+"
SLOT="2"
IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
RDEPEND="
@@ -43,7 +43,7 @@ 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.15
+ >=dev-util/gtk-doc-am-1.20
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 788bd03..fbf4f7a 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -51,7 +51,7 @@ 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.15
+ >=dev-util/gtk-doc-am-1.20
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
@@ -75,7 +75,7 @@ if [[ ${PV} = 9999 ]]; then
${PYTHON_DEPS}
doc? (
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- >=dev-util/gtk-doc-1.15 )
+ >=dev-util/gtk-doc-1.20 )
"
fi
@@ -154,7 +154,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.37.x-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2014-04-15 22:05 Gilles Dartiguelongue
0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-15 22:05 UTC (permalink / raw
To: gentoo-commits
commit: a73aef3bfd56434bbc405d8c45dc4b2c67a84478
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 13:09:15 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:58:59 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a73aef3b
dev-libs/glib: 2.38.2-r1 → 2.40.0
Bump glib to 2.40.0, remove two 2.38 patches that were backported from 2.39/2.40 and fix the external-gdbus-codegen patch to work on 2.40.0. No other ebuild/dependency changes.
---
dev-libs/glib/files/glib-2.38.2-configure.patch | 24 ++
dev-libs/glib/files/glib-2.38.2-sigaction.patch | 23 ++
.../files/glib-2.40.0-external-gdbus-codegen.patch | 95 ++++++++
dev-libs/glib/glib-2.40.0.ebuild | 269 +++++++++++++++++++++
4 files changed, 411 insertions(+)
diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch b/dev-libs/glib/files/glib-2.38.2-configure.patch
new file mode 100644
index 0000000..8f08ca0
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.38.2-configure.patch
@@ -0,0 +1,24 @@
+From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
+From: Patrick Welche <prlw1@cam.ac.uk>
+Date: Thu, 07 Nov 2013 10:58:46 +0000
+Subject: configure: test(1) uses = to test for string equality
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711600
+---
+(limited to 'm4macros/glibtests.m4')
+
+diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
+index 27e9024..7d5920a 100644
+--- a/m4macros/glibtests.m4
++++ b/m4macros/glibtests.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+ esac])
+ AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+- if test "$ENABLE_INSTALLED_TESTS" == "1"; then
++ if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+ AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+ AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+ fi
+--
+cgit v0.9.2
diff --git a/dev-libs/glib/files/glib-2.38.2-sigaction.patch b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
new file mode 100644
index 0000000..f87e224
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
@@ -0,0 +1,23 @@
+From 81d0ebe29ccd852e969acda7394969e3f13eb136 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Thu, 31 Oct 2013 11:43:14 +0100
+Subject: [PATCH] gmain: Fix use of uninitialized memory in sigaction structure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711754
+
+
+diff --git a/glib/gmain.c b/glib/gmain.c
+index 9c37bb2..608c1a5 100644
+--- a/glib/gmain.c
++++ b/glib/gmain.c
+@@ -4978,6 +4978,7 @@ unref_unix_signal_handler_unlocked (int signum)
+ if (unix_signal_refcount[signum] == 0)
+ {
+ struct sigaction action;
++ memset (&action, 0, sizeof (action));
+ action.sa_handler = SIG_DFL;
+ sigemptyset (&action.sa_mask);
+ sigaction (signum, &action, NULL);
+--
+Gitg
+
diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
new file mode 100644
index 0000000..50a9370
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
@@ -0,0 +1,95 @@
+diff --git a/configure.ac b/configure.ac
+index a01e58d..59d4527 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -367,14 +367,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.5,,PYTHON="/usr/bin/env python2.5")
++# 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.5,,PYTHON="/usr/bin/env python2.5")
+
+
+ dnl ***********************
+@@ -3580,7 +3580,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 47fdd38..c7eb136 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -157,8 +157,7 @@ man_MANS += \
+ glib-compile-resources.1 \
+ gsettings.1 \
+ gresource.1 \
+- gdbus.1 \
+- gdbus-codegen.1
++ gdbus.1
+
+ XSLTPROC_FLAGS = \
+ --nonet \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index e993e2f..025ad94 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
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 2c54e59..3cd3c5a 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -437,10 +437,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 d6d1412..62ef706 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 \
diff --git a/dev-libs/glib/glib-2.40.0.ebuild b/dev-libs/glib/glib-2.40.0.ebuild
new file mode 100644
index 0000000..55d0f08
--- /dev/null
+++ b/dev-libs/glib/glib-2.40.0.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.5 2014/03/28 02:11:52 jer Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+# Avoid runtime dependency on python when USE=test
+
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
+RDEPEND="
+ virtual/libiconv[${MULTILIB_USEDEP}]
+ virtual/libffi[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/elfutils-0.142
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ selinux? ( sys-libs/libselinux )
+ xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+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.15
+ 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-libs/gobject-introspection-1.$(get_version_component_range 2)
+ !<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="x11-misc/shared-mime-info
+ !<gnome-base/gvfs-1.6.4-r990"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# Earlier versions of gvfs do not work with glib
+
+DOCS="AUTHORS ChangeLog* NEWS* README"
+
+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."
+ export IPV6_DISABLED="yes"
+ 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
+
+ # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
+ epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+ if use test; then
+ # Do not try to remove files on live filesystem, upstream bug #619274
+ sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
+ # 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 "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+ sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+ sed -i -e "/desktop-app-info\/lastused/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
+
+ # 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
+ if [[ -n "${IPV6_DISABLED}" ]]; then
+ sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+ fi
+
+ # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+ sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
+ fi
+
+ # thread test fails, upstream bug #679306
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+ # gdbus-codegen is a separate package
+ epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+
+ # do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+ epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
+
+ # leave python shebang alone
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
+
+ # Gentoo handles completions in a different directory
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ gio/Makefile.am || die
+
+ # Support compilation in clang until upstream solves this, upstream bug #691608
+ append-flags -Wno-format-nonliteral
+
+ epatch_user
+
+ # Needed for the punt-python-check patch, disabling timeout test
+ # Also needed to prevent cross-compile failures, see bug #267603
+ # Also needed for the no-gdbus-codegen patch
+ eautoreconf
+
+ # FIXME: Really needed when running eautoreconf before? bug#????
+ #[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+ 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"
+ fi
+
+ local myconf
+
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
+ # 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.
+ use debug && myconf="--enable-debug"
+
+ # Only used by the gresource bin
+ multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+ # FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
+ if multilib_is_native_abi; then
+ myconf="${myconf} $(use_enable selinux)"
+ else
+ myconf="${myconf} --disable-selinux"
+ fi
+
+ # Always use internal libpcre, bug #254659
+ ECONF_SOURCE="${S}" econf ${myconf} \
+ $(use_enable xattr) \
+ $(use_enable fam) \
+ $(use_enable selinux) \
+ $(use_enable static-libs static) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable systemtap systemtap) \
+ --disable-compile-warnings \
+ --enable-man \
+ --with-pcre=internal \
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+}
+
+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/"
+
+ # Completely useless with or without USE static-libs, people need to use
+ # pkg-config
+ prune_libtool_files --modules
+}
+
+multilib_src_test() {
+ gnome2_environment_reset
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ export XDG_CONFIG_DIRS=/etc/xdg
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+ unset GSETTINGS_BACKEND # bug 352451
+ export LC_TIME=C # bug #411967
+ python_export_best
+
+ # 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
+ Xemake check
+}
+
+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."
+ fi
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2013-11-24 19:34 Gilles Dartiguelongue
0 siblings, 0 replies; 19+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-24 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 1b55928304378a14ae0206974d7c91d59c01f68c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 18:04:08 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:16:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b559283
dev-libs/glib: 2.36.4-r1 → 2.38.2
---
dev-libs/glib/files/glib-2.12.12-fbsd.patch | 24 ++-
dev-libs/glib/files/glib-2.32.4-bashcomp.patch | 27 ---
...ib-2.34.0-testsuite-skip-gdbus-auth-tests.patch | 62 -------
.../files/glib-2.34.0-testsuite-skip-thread4.patch | 16 +-
dev-libs/glib/files/glib-2.36.4-znodelete.patch | 65 +++++++
...ch => glib-2.37.x-external-gdbus-codegen.patch} | 41 +++--
.../{glib-2.35.8.ebuild => glib-2.38.2.ebuild} | 196 ++++++++++-----------
dev-libs/glib/glib-9999.ebuild | 173 ++++++++++--------
8 files changed, 307 insertions(+), 297 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
index bba6329..5aca695 100644
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
@@ -1,7 +1,18 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
---- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400
-+++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400
-@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
+From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
+From: Daniel Gryniewicz <dang@gentoo.org>
+Date: Sun, 24 Nov 2013 19:46:13 +0100
+Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
+
+Gentoo bug #184301, Gnome bug #107626.
+---
+ gmodule/gmodule-dl.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
+index a606f17..57fc41b 100644
+--- a/gmodule/gmodule-dl.c
++++ b/gmodule/gmodule-dl.c
+@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name,
static gpointer
_g_module_self (void)
{
@@ -9,7 +20,7 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodul
gpointer handle;
/* to query symbols from the program itself, special link options
-@@ -117,6 +118,9 @@ _g_module_self (void)
+@@ -122,6 +123,9 @@ _g_module_self (void)
g_module_set_error (fetch_dlerror (TRUE));
return handle;
@@ -19,3 +30,6 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodul
}
static void
+--
+1.8.3.2
+
diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
deleted file mode 100644
index 33abffc..0000000
--- a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Jul 2012 22:30:07 -0400
-Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp
-
-In Gentoo, we use /usr/share/bash-completion, not
-/usr/share/bash-completion/completions.
----
- gio/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 704367c..bee9dc6 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la
-
--completiondir = $(datadir)/bash-completion/completions
-+completiondir = $(datadir)/bash-completion
- completion_DATA = \
- completion/gdbus \
- completion/gsettings \
---
-1.7.8.6
-
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
deleted file mode 100644
index aff75cb..0000000
--- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 3 Jul 2012 12:50:44 +0300
-Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1
- tests
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679308
----
- gio/tests/gdbus-auth.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
-index 737770e..9f42c24 100644
---- a/gio/tests/gdbus-auth.c
-+++ b/gio/tests/gdbus-auth.c
-@@ -89,11 +89,14 @@ auth_client_external (void)
- auth_client_mechanism ("EXTERNAL");
- }
-
-+#if 0
-+// https://bugzilla.gnome.org/show_bug.cgi?id=679308
- static void
- auth_client_dbus_cookie_sha1 (void)
- {
- auth_client_mechanism ("DBUS_COOKIE_SHA1");
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -250,11 +253,13 @@ auth_server_external (void)
- auth_server_mechanism ("EXTERNAL");
- }
-
-+#if 0
- static void
- auth_server_dbus_cookie_sha1 (void)
- {
- auth_server_mechanism ("DBUS_COOKIE_SHA1");
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -272,10 +277,14 @@ main (int argc,
- session_bus_up ();
-
- g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external);
-+#if 0
- g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);
-+#endif
- g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous);
- g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external);
-+#if 0
- g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1);
-+#endif
-
- ret = g_test_run();
-
---
-1.7.8.6
-
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
index f409094..584b56f 100644
--- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
+++ b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
@@ -1,15 +1,15 @@
-From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 Mon Sep 17 00:00:00 2001
+From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Tue, 3 Jul 2012 11:21:56 +0300
-Subject: [PATCH] Gentoo: skip over thread/thread4 test failure
+Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure
https://bugzilla.gnome.org/show_bug.cgi?id=679306
---
- glib/tests/thread.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ glib/tests/thread.c | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/glib/tests/thread.c b/glib/tests/thread.c
-index 29b3850..ffe8087 100644
+index 539782e..179ec06 100644
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
@@ -124,6 +124,8 @@ test_thread3 (void)
@@ -21,7 +21,7 @@ index 29b3850..ffe8087 100644
/* test that thread creation fails as expected,
* by setting RLIMIT_NPROC ridiculously low
*/
-@@ -152,6 +154,7 @@ test_thread4 (void)
+@@ -158,6 +160,7 @@ test_thread4 (void)
g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
#endif
}
@@ -29,7 +29,7 @@ index 29b3850..ffe8087 100644
static void
test_thread5 (void)
-@@ -195,7 +198,9 @@ main (int argc, char *argv[])
+@@ -203,7 +206,9 @@ main (int argc, char *argv[])
g_test_add_func ("/thread/thread1", test_thread1);
g_test_add_func ("/thread/thread2", test_thread2);
g_test_add_func ("/thread/thread3", test_thread3);
@@ -40,5 +40,5 @@ index 29b3850..ffe8087 100644
g_test_add_func ("/thread/thread6", test_thread6);
--
-1.7.8.6
+1.8.3.2
diff --git a/dev-libs/glib/files/glib-2.36.4-znodelete.patch b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
new file mode 100644
index 0000000..b936fbd
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
@@ -0,0 +1,65 @@
+From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 2 Sep 2013 13:59:18 -0400
+Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete
+
+Since the type system does not support reloading its data and assumes
+that libgobject remains loaded for the lifetime of the process, we
+should link libgobject with a flag indicating that it can't be unloaded.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=707298
+---
+ configure.ac | 24 ++++++++++++++++++++++++
+ gobject/Makefile.am | 1 +
+ 2 files changed, 25 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 907c534..266c45d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3669,6 +3669,30 @@ fi
+ AC_SUBST(GLIB_LINK_FLAGS)
+
+ dnl
++dnl Check for -z,nodelete linker flag: the type system assumes that
++dnl libgobject stays loaded for the lifetime of the process
++dnl
++
++AC_ARG_ENABLE([znodelete],
++ [AS_HELP_STRING([--disable-znodelete],
++ [avoid linking with -z,nodelete])],,
++ [SAVED_LDFLAGS="${LDFLAGS}"
++ AC_MSG_CHECKING([for -z,nodelete linker flag])
++ LDFLAGS=-Wl,-z,nodelete
++ AC_TRY_LINK([], [int main (void) { return 0; }],
++ AC_MSG_RESULT(yes)
++ enable_znodelete=yes,
++ AC_MSG_RESULT(no)
++ enable_znodelete=no)
++ LDFLAGS="${SAVED_LDFLAGS}"])
++
++if test "x${enable_znodelete}" = "xyes"; then
++ GOBJECT_LINK_FLAGS=-Wl,-z,nodelete
++fi
++
++AC_SUBST(GOBJECT_LINK_FLAGS)
++
++dnl
+ dnl Check for -fvisibility=hidden to determine if we can do GNU-style
+ dnl visibility attributes for symbol export control
+ dnl
+diff --git a/gobject/Makefile.am b/gobject/Makefile.am
+index 1509616..181ad7d 100644
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am
+@@ -45,6 +45,7 @@ endif
+
+ libgobjectincludedir = $(includedir)/glib-2.0/gobject
+ libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
++ $(GOBJECT_LINK_FLAGS) \
+ $(gobject_win32_res_ldflag) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -export-dynamic $(no_undefined)
+--
+1.8.3.2
+
diff --git a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
similarity index 78%
rename from dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
rename to dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
index a7fb019..f87c146 100644
--- a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
@@ -1,7 +1,7 @@
-From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001
+From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH] Split out gdbus codegen
+Subject: [PATCH 3/4] Split out gdbus codegen
---
configure.ac | 17 ++++++++---------
@@ -12,10 +12,10 @@ Subject: [PATCH] Split out gdbus codegen
5 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
-index f734b7c..8076e7f 100644
+index 797cb92..907c534 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -374,14 +374,14 @@ AC_SUBST(PERL_PATH)
+@@ -378,14 +378,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
@@ -38,7 +38,7 @@ index f734b7c..8076e7f 100644
dnl ***********************
-@@ -3697,7 +3697,6 @@ gobject/glib-mkenums
+@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
gobject/tests/Makefile
gthread/Makefile
gio/Makefile
@@ -47,10 +47,10 @@ index f734b7c..8076e7f 100644
gio/gnetworking.h
gio/xdgmime/Makefile
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 99606d3..067cd50 100644
+index 112626b..8ddcdbc 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
-@@ -152,8 +152,7 @@ man_MANS += \
+@@ -151,8 +151,7 @@ man_MANS += \
glib-compile-resources.1 \
gsettings.1 \
gresource.1 \
@@ -61,12 +61,11 @@ index 99606d3..067cd50 100644
XSLTPROC_FLAGS = \
--nonet \
diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 94d7f59..c07d00d 100644
+index 717419f..808b5dd 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
-
- NULL =
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
-SUBDIRS = gdbus-2.0/codegen
+SUBDIRS =
@@ -74,28 +73,28 @@ index 94d7f59..c07d00d 100644
if OS_UNIX
SUBDIRS += xdgmime
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index c8a4090..feece02 100644
+index 7224124..5c8baaa 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h
- gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
+@@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
+ nodist_gdbus_test_codegen_SOURCES = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: 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 gdbus-test-codegen-generated.c : test-codegen.xml Makefile
++gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: 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 6875210..264c3c1 100644
+index d6d1412..62ef706 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
+@@ -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
@@ -108,5 +107,5 @@ index 6875210..264c3c1 100644
--c-namespace Example \
--c-generate-object-manager \
--
-1.8.1.2
+1.8.3.2
diff --git a/dev-libs/glib/glib-2.35.8.ebuild b/dev-libs/glib/glib-2.38.2.ebuild
similarity index 60%
rename from dev-libs/glib/glib-2.35.8.ebuild
rename to dev-libs/glib/glib-2.38.2.ebuild
index 1d7a2ae..6533ac6 100644
--- a/dev-libs/glib/glib-2.35.8.ebuild
+++ b/dev-libs/glib/glib-2.38.2.ebuild
@@ -3,38 +3,42 @@
# $Header: $
EAPI="5"
-PYTHON_DEPEND="utils? 2"
+PYTHON_COMPAT=( python2_{6,7} )
# Avoid runtime dependency on python when USE=test
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2+"
SLOT="2"
IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="virtual/libiconv
- virtual/libffi
- sys-libs/zlib
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
+RDEPEND="
+ virtual/libiconv[${MULTILIB_USEDEP}]
+ virtual/libffi[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
|| (
>=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12 )
- xattr? ( sys-apps/attr )
- fam? ( virtual/fam )
- utils? ( >=dev-util/gdbus-codegen-${PV} )"
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ selinux? ( sys-libs/libselinux )
+ xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-libs/libxslt-1.0
@@ -43,46 +47,39 @@ DEPEND="${RDEPEND}
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
- =dev-lang/python-2*
- >=dev-util/gdbus-codegen-${PV}
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2"
+ !<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
+ !<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
PDEPEND="x11-misc/shared-mime-info
!<gnome-base/gvfs-1.6.4-r990"
# shared-mime-info needed for gio/xdgmime, bug #409481
# Earlier versions of gvfs do not work with glib
-# For safety, generate sources using the gdbus-codegen from glib git tree
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? (
- >=dev-util/gdbus-codegen-${PV}
- >=dev-util/gtk-doc-1.15 )
- =dev-lang/python-2*"
-fi
+DOCS="AUTHORS ChangeLog* NEWS* README"
pkg_setup() {
- # Needed for gio/tests/gdbus-testserver.py
- if use test || [[ ${PV} = 9999 ]]; then
- python_set_active_version 2
- python_pkg_setup
- if [[ ${PV} = 9999 ]]; then
- # Make gdbus-codegen from ${S} work despite all our patches
- MAKEOPTS="${MAKEOPTS} PYTHON=$(PYTHON -2 -a)"
- fi
- fi
-
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."
+ export IPV6_DISABLED="yes"
+ fi
linux-info_pkg_setup
fi
}
src_prepare() {
- [[ ${PV} = 9999 ]] && gnome2-live_src_prepare
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
- # Fix gmodule issues on fbsd; bug #184301
+ # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
if use test; then
@@ -90,7 +87,7 @@ src_prepare() {
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+ # 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."
@@ -122,31 +119,51 @@ src_prepare() {
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
fi
- epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+ # Some tests need ipv6, upstream bug #667468
+ if [[ -n "${IPV6_DISABLED}" ]]; then
+ sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+ fi
+
+ # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+ sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
fi
+ # thread test fails, upstream bug #679306
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.37.x-external-gdbus-codegen.patch"
- # bashcomp goes in /usr/share/bash-completion
- epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+ # do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+ epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
- epatch_user
+ # leave python shebang alone
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
- # disable pyc compiling
- use test && python_clean_py-compile_files
+ # Gentoo handles completions in a different directory
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ gio/Makefile.am || die
+
+ # Support compilation in clang until upstream solves this, upstream bug #691608
+ append-flags -Wno-format-nonliteral
+
+ epatch_user
# Needed for the punt-python-check patch, disabling timeout test
- # Also needed to prevent croscompile failures, see bug #267603
+ # Also needed to prevent cross-compile failures, see bug #267603
# Also needed for the no-gdbus-codegen patch
- AT_M4DIR="${WORKDIR}" eautoreconf
+ eautoreconf
- [[ ${CHOST} == *-freebsd* ]] && elibtoolize
+ # FIXME: Really needed when running eautoreconf before? bug#????
+ #[[ ${CHOST} == *-freebsd* ]] && elibtoolize
epunt_cxx
}
-src_configure() {
+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)
@@ -161,47 +178,48 @@ src_configure() {
local myconf
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
# 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.
- # -- compnerd (3/27/06)
use debug && myconf="--enable-debug"
- if use test; then
- myconf="${myconf} --enable-modular-tests"
+ # Only used by the gresource bin
+ multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+ # FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
+ if multilib_is_native_abi; then
+ myconf="${myconf} $(use_enable selinux)"
else
- if [[ ${PV} = 9999 ]] && use doc; then
- # need to build tests if USE=doc for bug #387385
- myconf="${myconf} --enable-modular-tests"
- else
- myconf="${myconf} --disable-modular-tests"
- fi
+ myconf="${myconf} --disable-selinux"
fi
- [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
-
# Always use internal libpcre, bug #254659
- econf ${myconf} \
+ ECONF_SOURCE="${S}" econf ${myconf} \
$(use_enable xattr) \
$(use_enable fam) \
$(use_enable selinux) \
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
+ --disable-compile-warnings \
--enable-man \
--with-pcre=internal \
- --with-threads=posix \
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
}
-src_install() {
- local f
-
- # install-exec-hook substitutes ${PYTHON} in glib/gtester-report
- emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
+multilib_src_install_all() {
+ einstalldocs
- if ! use utils; then
+ 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
@@ -210,16 +228,12 @@ src_install() {
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
- # This is there for git snapshots and the live ebuild, bug 351966
- [[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
- dodoc AUTHORS ChangeLog* NEWS* README
-
# Completely useless with or without USE static-libs, people need to use
# pkg-config
prune_libtool_files --modules
}
-src_test() {
+multilib_src_test() {
gnome2_environment_reset
unset DBUS_SESSION_BUS_ADDRESS
@@ -228,6 +242,7 @@ src_test() {
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
unset GSETTINGS_BACKEND # bug 352451
export LC_TIME=C # bug #411967
+ python_export_best
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -235,7 +250,7 @@ src_test() {
# Hardened: gdb needs this, bug #338891
if host-is-pax ; then
- pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
|| die "Hardened adjustment failed"
fi
@@ -243,26 +258,7 @@ src_test() {
Xemake check
}
-pkg_preinst() {
- # Only give the introspection message if:
- # * The user has gobject-introspection
- # * Has glib already installed
- # * Previous version was different from new version
- # TODO: add a subslotted virtual to trigger this automatically
- if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
- ewarn "You must rebuild gobject-introspection so that the installed"
- ewarn "typelibs and girs are regenerated for the new APIs in glib"
- fi
-}
-
pkg_postinst() {
- # Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
- # TODO: add a subslotted virtual to trigger this automatically
- if has_version dev-libs/dbus-glib; then
- ewarn "If you experience a breakage after updating dev-libs/glib try"
- ewarn "rebuilding dev-libs/dbus-glib"
- fi
-
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
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 1d7a2ae..aeb044b 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -3,10 +3,10 @@
# $Header: $
EAPI="5"
-PYTHON_DEPEND="utils? 2"
+PYTHON_COMPAT=( python2_{6,7} )
# Avoid runtime dependency on python when USE=test
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -14,7 +14,7 @@ fi
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2+"
SLOT="2"
@@ -23,18 +23,30 @@ if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
-RDEPEND="virtual/libiconv
- virtual/libffi
- sys-libs/zlib
+# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
+RDEPEND="
+ virtual/libiconv[${MULTILIB_USEDEP}]
+ virtual/libffi[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
|| (
>=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12 )
- xattr? ( sys-apps/attr )
- fam? ( virtual/fam )
- utils? ( >=dev-util/gdbus-codegen-${PV} )"
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ selinux? ( sys-libs/libselinux )
+ xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-libs/libxslt-1.0
@@ -43,10 +55,15 @@ DEPEND="${RDEPEND}
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
- =dev-lang/python-2*
- >=dev-util/gdbus-codegen-${PV}
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2"
+ !<dev-libs/gobject-introspection-9999
+ !<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
PDEPEND="x11-misc/shared-mime-info
!<gnome-base/gvfs-1.6.4-r990"
# shared-mime-info needed for gio/xdgmime, bug #409481
@@ -55,34 +72,34 @@ PDEPEND="x11-misc/shared-mime-info
# For safety, generate sources using the gdbus-codegen from glib git tree
if [[ ${PV} = 9999 ]]; then
DEPEND="${DEPEND}
+ ${PYTHON_DEPS}
doc? (
- >=dev-util/gdbus-codegen-${PV}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=dev-util/gtk-doc-1.15 )
- =dev-lang/python-2*"
+ "
fi
-pkg_setup() {
- # Needed for gio/tests/gdbus-testserver.py
- if use test || [[ ${PV} = 9999 ]]; then
- python_set_active_version 2
- python_pkg_setup
- if [[ ${PV} = 9999 ]]; then
- # Make gdbus-codegen from ${S} work despite all our patches
- MAKEOPTS="${MAKEOPTS} PYTHON=$(PYTHON -2 -a)"
- fi
- fi
+DOCS="AUTHORS ChangeLog* NEWS*"
+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."
+ export IPV6_DISABLED="yes"
+ fi
linux-info_pkg_setup
fi
}
src_prepare() {
[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
- # Fix gmodule issues on fbsd; bug #184301
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+ # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
if use test; then
@@ -90,7 +107,7 @@ src_prepare() {
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+ # 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."
@@ -122,31 +139,51 @@ src_prepare() {
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
fi
- epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+ # Some tests need ipv6, upstream bug #667468
+ if [[ -n "${IPV6_DISABLED}" ]]; then
+ sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+ fi
+
+ # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+ sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
fi
+ # thread test fails, upstream bug #679306
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
- # bashcomp goes in /usr/share/bash-completion
- epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+ # do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+ epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
- epatch_user
+ # leave python shebang alone
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
+
+ # Gentoo handles completions in a different directory
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ gio/Makefile.am || die
- # disable pyc compiling
- use test && python_clean_py-compile_files
+ # Support compilation in clang until upstream solves this, upstream bug #691608
+ append-flags -Wno-format-nonliteral
+
+ epatch_user
# Needed for the punt-python-check patch, disabling timeout test
- # Also needed to prevent croscompile failures, see bug #267603
+ # Also needed to prevent cross-compile failures, see bug #267603
# Also needed for the no-gdbus-codegen patch
- AT_M4DIR="${WORKDIR}" eautoreconf
+ eautoreconf
- [[ ${CHOST} == *-freebsd* ]] && elibtoolize
+ # FIXME: Really needed when running eautoreconf before? bug#????
+ #[[ ${CHOST} == *-freebsd* ]] && elibtoolize
epunt_cxx
}
-src_configure() {
+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)
@@ -161,47 +198,50 @@ src_configure() {
local myconf
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
# 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.
- # -- compnerd (3/27/06)
use debug && myconf="--enable-debug"
- if use test; then
- myconf="${myconf} --enable-modular-tests"
+ # Only used by the gresource bin
+ multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+ # FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
+ if multilib_is_native_abi; then
+ myconf="${myconf} $(use_enable selinux)"
else
- if [[ ${PV} = 9999 ]] && use doc; then
- # need to build tests if USE=doc for bug #387385
- myconf="${myconf} --enable-modular-tests"
- else
- myconf="${myconf} --disable-modular-tests"
- fi
+ myconf="${myconf} --disable-selinux"
fi
[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
# Always use internal libpcre, bug #254659
- econf ${myconf} \
+ ECONF_SOURCE="${S}" econf ${myconf} \
$(use_enable xattr) \
$(use_enable fam) \
$(use_enable selinux) \
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
+ --disable-compile-warnings \
--enable-man \
--with-pcre=internal \
- --with-threads=posix \
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
}
-src_install() {
- local f
-
- # install-exec-hook substitutes ${PYTHON} in glib/gtester-report
- emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
+multilib_src_install_all() {
+ einstalldocs
- if ! use utils; then
+ 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
@@ -210,16 +250,12 @@ src_install() {
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
- # This is there for git snapshots and the live ebuild, bug 351966
- [[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
- dodoc AUTHORS ChangeLog* NEWS* README
-
# Completely useless with or without USE static-libs, people need to use
# pkg-config
prune_libtool_files --modules
}
-src_test() {
+multilib_src_test() {
gnome2_environment_reset
unset DBUS_SESSION_BUS_ADDRESS
@@ -228,6 +264,7 @@ src_test() {
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
unset GSETTINGS_BACKEND # bug 352451
export LC_TIME=C # bug #411967
+ python_export_best
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -235,7 +272,7 @@ src_test() {
# Hardened: gdb needs this, bug #338891
if host-is-pax ; then
- pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
|| die "Hardened adjustment failed"
fi
@@ -243,18 +280,6 @@ src_test() {
Xemake check
}
-pkg_preinst() {
- # Only give the introspection message if:
- # * The user has gobject-introspection
- # * Has glib already installed
- # * Previous version was different from new version
- # TODO: add a subslotted virtual to trigger this automatically
- if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
- ewarn "You must rebuild gobject-introspection so that the installed"
- ewarn "typelibs and girs are regenerated for the new APIs in glib"
- fi
-}
-
pkg_postinst() {
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
# TODO: add a subslotted virtual to trigger this automatically
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2013-02-28 10:37 Priit Laes
0 siblings, 0 replies; 19+ messages in thread
From: Priit Laes @ 2013-02-28 10:37 UTC (permalink / raw
To: gentoo-commits
commit: a3f3569b1de3a29b783fe220d66f5b2ab44e12ff
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Feb 28 10:37:03 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Feb 28 10:37:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a3f3569b
dev-libs/glib: Add 2.35.8 to overlay
---
.../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 ------------
...ch => glib-2.35.x-external-gdbus-codegen.patch} | 64 ++++++++++++--------
.../glib/{glib-9999.ebuild => glib-2.35.8.ebuild} | 11 +++-
dev-libs/glib/glib-9999.ebuild | 11 +++-
4 files changed, 59 insertions(+), 66 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e33..0000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- gint val)
- {
-- return __sync_fetch_and_add (atomic, val);
-+ return __sync_fetch_and_add_si (atomic, val);
- }
-
- void
- g_atomic_int_add (volatile gint *atomic,
- gint val)
- {
-- __sync_fetch_and_add (atomic, val);
-+ __sync_fetch_and_add_si (atomic, val);
- }
-
- gboolean
-@@ -429,7 +429,7 @@
- gint oldval,
- gint newval)
- {
-- return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-
- gboolean
-@@ -437,7 +437,7 @@
- gpointer oldval,
- gpointer newval)
- {
-- return __sync_bool_compare_and_swap ((long *)atomic,
-+ return __sync_bool_compare_and_swap_di ((long *)atomic,
- (long)oldval, (long)newval);
- }
-
diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
similarity index 54%
rename from dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
rename to dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
index bd3afee..a7fb019 100644
--- a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
@@ -1,42 +1,56 @@
-From 457ac2926e754bbebd72ee3606ad405ccfd2e952 Mon Sep 17 00:00:00 2001
+From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
-Date: Fri, 3 Feb 2012 09:08:28 +0200
+Date: Thu, 28 Feb 2013 08:28:01 +0200
Subject: [PATCH] Split out gdbus codegen
---
- configure.ac | 3 +--
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 7 insertions(+), 13 deletions(-)
+ configure.ac | 17 ++++++++---------
+ docs/reference/gio/Makefile.am | 3 +--
+ gio/Makefile.am | 2 +-
+ gio/tests/Makefile.am | 6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
+ 5 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 833891b..697ce60 100644
+index f734b7c..8076e7f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -380,7 +380,7 @@ fi
- AC_SUBST(PERL_PATH)
-
- # Need suitable python path for greport
+@@ -374,14 +374,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.5,,PYTHON="/usr/bin/env python2.5")
++# 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.5,,PYTHON="/usr/bin/env python2.5")
dnl ***********************
-@@ -3561,7 +3561,6 @@ gobject/glib-mkenums
+@@ -3697,7 +3697,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
- gio/inotify/Makefile
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 7d2d264..7cac0b2 100644
+index 99606d3..067cd50 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
-@@ -148,8 +148,7 @@ man_MANS = \
+@@ -152,8 +152,7 @@ man_MANS += \
glib-compile-resources.1 \
gsettings.1 \
gresource.1 \
@@ -44,10 +58,10 @@ index 7d2d264..7cac0b2 100644
- gdbus-codegen.1
+ gdbus.1
- if ENABLE_MAN
-
+ XSLTPROC_FLAGS = \
+ --nonet \
diff --git a/gio/Makefile.am b/gio/Makefile.am
-index dae04b4..835ccc7 100644
+index 94d7f59..c07d00d 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
@@ -60,11 +74,11 @@ index dae04b4..835ccc7 100644
if OS_UNIX
SUBDIRS += xdgmime
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index c5cf59d..be9e48c 100644
+index c8a4090..feece02 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -293,10 +293,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
- gdbus_close_pending_LDADD = $(progs_ldadd)
+@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h
+ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
if OS_UNIX
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
@@ -77,7 +91,7 @@ index c5cf59d..be9e48c 100644
--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 9861d0e..9ca6eb9 100644
+index 6875210..264c3c1 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -21,10 +21,8 @@ GDBUS_GENERATED = \
@@ -94,5 +108,5 @@ index 9861d0e..9ca6eb9 100644
--c-namespace Example \
--c-generate-object-manager \
--
-1.7.8.6
+1.8.1.2
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-2.35.8.ebuild
similarity index 94%
copy from dev-libs/glib/glib-9999.ebuild
copy to dev-libs/glib/glib-2.35.8.ebuild
index f55ba9c..1d7a2ae 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-2.35.8.ebuild
@@ -100,6 +100,13 @@ src_prepare() {
sed -i -e "/desktop-app-info\/lastused/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
+
# 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"
@@ -114,10 +121,12 @@ src_prepare() {
# needed to prevent gdbus-threading from asserting
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
fi
+
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
# bashcomp goes in /usr/share/bash-completion
epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index f55ba9c..1d7a2ae 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -100,6 +100,13 @@ src_prepare() {
sed -i -e "/desktop-app-info\/lastused/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
+
# 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"
@@ -114,10 +121,12 @@ src_prepare() {
# needed to prevent gdbus-threading from asserting
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
fi
+
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
# bashcomp goes in /usr/share/bash-completion
epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-09-25 15:46 Alexandre Rostovtsev
0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-25 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 5d26556b01275161af0683711069e88d86fa8735
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 15:26:33 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 15:26:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5d26556b
dev-libs/glib: 2.34.0 now in gx86
Sync live ebuild with gx86; we always want to install man pages.
---
...b-2.34.0-testsuite-skip-gdbus-auth-tests.patch} | 0
...ch => glib-2.34.0-testsuite-skip-thread4.patch} | 0
dev-libs/glib/glib-2.33.14.ebuild | 265 --------------------
dev-libs/glib/glib-9999.ebuild | 31 +--
4 files changed, 11 insertions(+), 285 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
similarity index 100%
rename from dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.patch
rename to dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
diff --git a/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
similarity index 100%
rename from dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch
rename to dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
diff --git a/dev-libs/glib/glib-2.33.14.ebuild b/dev-libs/glib/glib-2.33.14.ebuild
deleted file mode 100644
index 8df7fe7..0000000
--- a/dev-libs/glib/glib-2.33.14.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-PYTHON_DEPEND="utils? 2"
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="2"
-IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="virtual/libiconv
- virtual/libffi
- sys-libs/zlib
- || (
- >=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.12 )
- xattr? ( sys-apps/attr )
- fam? ( virtual/fam )
- utils? ( >=dev-util/gdbus-codegen-${PV} )"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.15
- doc? (
- >=dev-libs/libxslt-1.0
- >=dev-util/gdbus-codegen-${PV}
- >=dev-util/gtk-doc-1.15
- app-text/docbook-xml-dtd:4.1.2 )
- systemtap? ( >=dev-util/systemtap-1.3 )
- test? (
- sys-devel/gdb
- =dev-lang/python-2*
- >=dev-util/gdbus-codegen-${PV}
- >=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2"
-PDEPEND="x11-misc/shared-mime-info
- !<gnome-base/gvfs-1.6.4-r990"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-# For safety, generate sources using the gdbus-codegen from glib git tree
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- =dev-lang/python-2*"
-fi
-
-pkg_setup() {
- # Needed for gio/tests/gdbus-testserver.py
- if use test || [[ ${PV} = 9999 ]]; then
- python_set_active_version 2
- python_pkg_setup
- if [[ ${PV} = 9999 ]]; then
- # Make gdbus-codegen from ${S} work despite all our patches
- MAKEOPTS="${MAKEOPTS} PYTHON=$(PYTHON -2 -a)"
- fi
- fi
-
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- [[ ${PV} = 9999 ]] && gnome2-live_src_prepare
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
- if use ia64 ; then
- # Only apply for < 4.1
- local major=$(gcc-major-version)
- local minor=$(gcc-minor-version)
- if (( major < 4 || ( major == 4 && minor == 0 ) )); then
- epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
- fi
- fi
-
- # Fix gmodule issues on fbsd; bug #184301
- epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
- # need to build tests if USE=doc for bug #387385
- if ! use test && ! use doc; then
- # don't waste time building tests
- sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
- else
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
- 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 "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
- sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
- sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.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:2' ; then
- ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
- 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
- fi
-
- # gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
-
- # bashcomp goes in /usr/share/bash-completion
- epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=679306
- epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-thread4.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=679308
- epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-gdbus-auth-tests.patch"
-
- # disable pyc compiling
- use test && python_clean_py-compile_files
-
- # Needed for the punt-python-check patch, disabling timeout test
- # Also needed to prevent croscompile failures, see bug #267603
- # Also needed for the no-gdbus-codegen patch
- AT_M4DIR="${WORKDIR}" eautoreconf
-
- [[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
- epunt_cxx
-}
-
-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"
- fi
-
- local myconf
-
- # 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.
- # -- compnerd (3/27/06)
- use debug && myconf="--enable-debug"
-
- # Always use internal libpcre, bug #254659
- econf ${myconf} \
- $(use_enable xattr) \
- $(use_enable doc man) \
- $(use_enable doc gtk-doc) \
- $(use_enable fam) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_enable systemtap dtrace) \
- $(use_enable systemtap systemtap) \
- $(use_enable test modular-tests) \
- --with-pcre=internal \
- --with-threads=posix
-}
-
-src_install() {
- local f
-
- # install-exec-hook substitutes ${PYTHON} in glib/gtester-report
- emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
- if ! use utils; then
- rm "${ED}usr/bin/gtester-report"
- 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/"
-
- # This is there for git snapshots and the live ebuild, bug 351966
- [[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
- dodoc AUTHORS ChangeLog* NEWS* README
-
- # Completely useless with or without USE static-libs, people need to use
- # pkg-config
- find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-src_test() {
- gnome2_environment_reset
-
- unset DBUS_SESSION_BUS_ADDRESS
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- unset GSETTINGS_BACKEND # bug 352451
- export LC_TIME=C # bug #411967
-
- # 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 "${S}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- Xemake check
-}
-
-pkg_preinst() {
- # Only give the introspection message if:
- # * The user has gobject-introspection
- # * Has glib already installed
- # * Previous version was different from new version
- if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
- ewarn "You must rebuild gobject-introspection so that the installed"
- ewarn "typelibs and girs are regenerated for the new APIs in glib"
- fi
-}
-
-pkg_postinst() {
- # Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
- if has_version dev-libs/dbus-glib; then
- ewarn "If you experience a breakage after updating dev-libs/glib try"
- ewarn "rebuilding dev-libs/dbus-glib"
- fi
-
- 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."
- fi
-}
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 9cb1efa..361d0e7 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gtk.org/"
SRC_URI="${SRC_URI}
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
SLOT="2"
IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
if [[ ${PV} = 9999 ]]; then
@@ -35,13 +35,13 @@ RDEPEND="virtual/libiconv
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
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.15
doc? (
- >=dev-libs/libxslt-1.0
>=dev-util/gdbus-codegen-${PV}
- >=dev-util/gtk-doc-1.15
- app-text/docbook-xml-dtd:4.1.2 )
+ >=dev-util/gtk-doc-1.15 )
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
@@ -81,23 +81,10 @@ src_prepare() {
[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
- if use ia64 ; then
- # Only apply for < 4.1
- local major=$(gcc-major-version)
- local minor=$(gcc-minor-version)
- if (( major < 4 || ( major == 4 && minor == 0 ) )); then
- epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
- fi
- fi
-
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # need to build tests if USE=doc for bug #387385
- if ! use test && ! use doc; then
- # don't waste time building tests
- sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
- else
+ if use test; then
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
@@ -168,17 +155,21 @@ src_configure() {
# -- compnerd (3/27/06)
use debug && myconf="--enable-debug"
+ # need to build tests if USE=doc for bug #387385
+ if use doc || use test; then
+ myconf="${myconf} --enable-modular-tests"
+ fi
+
# Always use internal libpcre, bug #254659
econf ${myconf} \
$(use_enable xattr) \
- $(use_enable doc man) \
$(use_enable doc gtk-doc) \
$(use_enable fam) \
$(use_enable selinux) \
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
- $(use_enable test modular-tests) \
+ --enable-man \
--with-pcre=internal \
--with-threads=posix
}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-07-16 5:53 Alexandre Restovtsev
0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2012-07-16 5:53 UTC (permalink / raw
To: gentoo-commits
commit: 3e6acce8ce4ddf8f32798e44c9b2a84d9c177b40
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 05:52:06 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Jul 16 05:52:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e6acce8
dev-libs/glib: sync with gx86 for bashcomp
Install bash completion in the directory where our "eselect bashcomp"
expects to find it.
---
dev-libs/glib/files/glib-2.32.4-bashcomp.patch | 27 ++++++++++++++++++++++++
dev-libs/glib/glib-2.33.3.ebuild | 5 +++-
dev-libs/glib/glib-9999.ebuild | 5 +++-
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
new file mode 100644
index 0000000..33abffc
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
@@ -0,0 +1,27 @@
+From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 15 Jul 2012 22:30:07 -0400
+Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp
+
+In Gentoo, we use /usr/share/bash-completion, not
+/usr/share/bash-completion/completions.
+---
+ gio/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 704367c..bee9dc6 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la
+
+-completiondir = $(datadir)/bash-completion/completions
++completiondir = $(datadir)/bash-completion
+ completion_DATA = \
+ completion/gdbus \
+ completion/gsettings \
+--
+1.7.8.6
+
diff --git a/dev-libs/glib/glib-2.33.3.ebuild b/dev-libs/glib/glib-2.33.3.ebuild
index 7fe4fca..2c0ccf1 100644
--- a/dev-libs/glib/glib-2.33.3.ebuild
+++ b/dev-libs/glib/glib-2.33.3.ebuild
@@ -22,7 +22,7 @@ IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
fi
RDEPEND="virtual/libiconv
@@ -131,6 +131,9 @@ src_prepare() {
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+ # bashcomp goes in /usr/share/bash-completion
+ epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+
# https://bugzilla.gnome.org/show_bug.cgi?id=679306
epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-thread4.patch"
# https://bugzilla.gnome.org/show_bug.cgi?id=679308
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index ca821e8..c33dc93 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
fi
RDEPEND="virtual/libiconv
@@ -131,6 +131,9 @@ src_prepare() {
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+ # bashcomp goes in /usr/share/bash-completion
+ epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+
# disable pyc compiling
use test && python_clean_py-compile_files
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-07-03 11:10 Priit Laes
0 siblings, 0 replies; 19+ messages in thread
From: Priit Laes @ 2012-07-03 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 8e04aaec5a6b297e83081e819063be4cf560227a
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jul 3 10:40:28 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jul 3 10:40:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8e04aaec
dev-libs/glib: Add 2.33.3 to overlay
---
.../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 ++++++++++++
...karound-gio-test-failure-without-userpriv.patch | 20 ------
.../glib-2.25-skip-tests-with-dbus-keyring.patch | 22 -------
...ib-2.33.x-testsuite-skip-gdbus-auth-tests.patch | 62 ++++++++++++++++++++
.../files/glib-2.33.x-testsuite-skip-thread4.patch | 44 ++++++++++++++
.../glib/{glib-9999.ebuild => glib-2.33.3.ebuild} | 34 +++++++----
dev-libs/glib/glib-9999.ebuild | 29 ++++++----
7 files changed, 186 insertions(+), 64 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
new file mode 100644
index 0000000..0859e33
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
@@ -0,0 +1,39 @@
+From Debian, this one is needed for gcc < 4.1...
+
+--- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
++++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
+@@ -414,14 +414,14 @@
+ g_atomic_int_exchange_and_add (volatile gint *atomic,
+ gint val)
+ {
+- return __sync_fetch_and_add (atomic, val);
++ return __sync_fetch_and_add_si (atomic, val);
+ }
+
+ void
+ g_atomic_int_add (volatile gint *atomic,
+ gint val)
+ {
+- __sync_fetch_and_add (atomic, val);
++ __sync_fetch_and_add_si (atomic, val);
+ }
+
+ gboolean
+@@ -429,7 +429,7 @@
+ gint oldval,
+ gint newval)
+ {
+- return __sync_bool_compare_and_swap (atomic, oldval, newval);
++ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
+ }
+
+ gboolean
+@@ -437,7 +437,7 @@
+ gpointer oldval,
+ gpointer newval)
+ {
+- return __sync_bool_compare_and_swap ((long *)atomic,
++ return __sync_bool_compare_and_swap_di ((long *)atomic,
+ (long)oldval, (long)newval);
+ }
+
diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
deleted file mode 100644
index cabe56f..0000000
--- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Temporary workaround for gio tests failure when ran without FEATURES=userpriv
-until upstream bug #552912 is fixed
-
---- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300
-+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300
-@@ -769,11 +769,14 @@
- if (posix_compat)
- {
- /* target directory is not accessible (no execute flag) */
-+#if 0
-+/* Fails when ran as root */
- do_copy_move (root, item, TEST_DIR_NO_ACCESS,
- TEST_NO_ACCESS);
- /* target directory is readonly */
- do_copy_move (root, item, TEST_DIR_NO_WRITE,
- TEST_NO_ACCESS);
-+#endif
- }
- }
- }
diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
deleted file mode 100644
index baca1ec..0000000
--- a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
-+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
-@@ -1448,7 +1448,7 @@
-
- g_test_add_func ("/gdbus/peer-to-peer", test_peer);
- g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
-- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
-+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
- g_test_add_func ("/gdbus/credentials", test_credentials);
- g_test_add_func ("/gdbus/overflow", test_overflow);
-
---- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
-+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
-@@ -336,7 +336,7 @@
- /* all the tests rely on a shared main loop */
- loop = g_main_loop_new (NULL, FALSE);
-
-- g_test_add_func ("/gdbus/non-socket", test_non_socket);
-+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
-
- ret = g_test_run();
-
diff --git a/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.patch
new file mode 100644
index 0000000..aff75cb
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.patch
@@ -0,0 +1,62 @@
+From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 3 Jul 2012 12:50:44 +0300
+Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1
+ tests
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679308
+---
+ gio/tests/gdbus-auth.c | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
+index 737770e..9f42c24 100644
+--- a/gio/tests/gdbus-auth.c
++++ b/gio/tests/gdbus-auth.c
+@@ -89,11 +89,14 @@ auth_client_external (void)
+ auth_client_mechanism ("EXTERNAL");
+ }
+
++#if 0
++// https://bugzilla.gnome.org/show_bug.cgi?id=679308
+ static void
+ auth_client_dbus_cookie_sha1 (void)
+ {
+ auth_client_mechanism ("DBUS_COOKIE_SHA1");
+ }
++#endif
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
+@@ -250,11 +253,13 @@ auth_server_external (void)
+ auth_server_mechanism ("EXTERNAL");
+ }
+
++#if 0
+ static void
+ auth_server_dbus_cookie_sha1 (void)
+ {
+ auth_server_mechanism ("DBUS_COOKIE_SHA1");
+ }
++#endif
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
+@@ -272,10 +277,14 @@ main (int argc,
+ session_bus_up ();
+
+ g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external);
++#if 0
+ g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);
++#endif
+ g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous);
+ g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external);
++#if 0
+ g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1);
++#endif
+
+ ret = g_test_run();
+
+--
+1.7.8.6
+
diff --git a/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch
new file mode 100644
index 0000000..f409094
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch
@@ -0,0 +1,44 @@
+From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 3 Jul 2012 11:21:56 +0300
+Subject: [PATCH] Gentoo: skip over thread/thread4 test failure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679306
+---
+ glib/tests/thread.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/glib/tests/thread.c b/glib/tests/thread.c
+index 29b3850..ffe8087 100644
+--- a/glib/tests/thread.c
++++ b/glib/tests/thread.c
+@@ -124,6 +124,8 @@ test_thread3 (void)
+ g_assert_cmpint (GPOINTER_TO_INT(result), ==, 9);
+ }
+
++#if 0
++// https://bugzilla.gnome.org/show_bug.cgi?id=679306
+ /* test that thread creation fails as expected,
+ * by setting RLIMIT_NPROC ridiculously low
+ */
+@@ -152,6 +154,7 @@ test_thread4 (void)
+ g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
+ #endif
+ }
++#endif
+
+ static void
+ test_thread5 (void)
+@@ -195,7 +198,9 @@ main (int argc, char *argv[])
+ g_test_add_func ("/thread/thread1", test_thread1);
+ g_test_add_func ("/thread/thread2", test_thread2);
+ g_test_add_func ("/thread/thread3", test_thread3);
++#if 0
+ g_test_add_func ("/thread/thread4", test_thread4);
++#endif
+ g_test_add_func ("/thread/thread5", test_thread5);
+ g_test_add_func ("/thread/thread6", test_thread6);
+
+--
+1.7.8.6
+
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-2.33.3.ebuild
similarity index 89%
copy from dev-libs/glib/glib-9999.ebuild
copy to dev-libs/glib/glib-2.33.3.ebuild
index 1d9fff6..7fe4fca 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-2.33.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="virtual/libiconv
sys-libs/zlib
|| (
>=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.11 )
+ >=dev-libs/libelf-0.8.12 )
xattr? ( sys-apps/attr )
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
@@ -81,14 +81,27 @@ src_prepare() {
[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+ if use ia64 ; then
+ # Only apply for < 4.1
+ local major=$(gcc-major-version)
+ local minor=$(gcc-minor-version)
+ if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+ epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+ fi
+ fi
+
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+ # need to build tests if USE=doc for bug #387385
+ if ! use test && ! use doc; then
+ # don't waste time building tests
+ sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
+ else
+ # Do not try to remove files on live filesystem, upstream bug #619274
+ sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- if use test; then
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
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,"
@@ -118,6 +131,11 @@ src_prepare() {
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=679306
+ epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-thread4.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=679308
+ epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-gdbus-auth-tests.patch"
+
# disable pyc compiling
use test && python_clean_py-compile_files
@@ -187,12 +205,6 @@ src_install() {
[[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
dodoc AUTHORS ChangeLog* NEWS* README
- insinto /usr/share/bash-completion
- for f in gdbus gsettings; do
- newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
- done
- rm -rf "${ED}/etc"
-
# Completely useless with or without USE static-libs, people need to use
# pkg-config
find "${D}" -name '*.la' -exec rm -f {} +
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 1d9fff6..ca821e8 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="virtual/libiconv
sys-libs/zlib
|| (
>=dev-libs/elfutils-0.142
- >=dev-libs/libelf-0.8.11 )
+ >=dev-libs/libelf-0.8.12 )
xattr? ( sys-apps/attr )
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
@@ -81,14 +81,27 @@ src_prepare() {
[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+ if use ia64 ; then
+ # Only apply for < 4.1
+ local major=$(gcc-major-version)
+ local minor=$(gcc-minor-version)
+ if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+ epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+ fi
+ fi
+
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+ # need to build tests if USE=doc for bug #387385
+ if ! use test && ! use doc; then
+ # don't waste time building tests
+ sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
+ else
+ # Do not try to remove files on live filesystem, upstream bug #619274
+ sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- if use test; then
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
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,"
@@ -187,12 +200,6 @@ src_install() {
[[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
dodoc AUTHORS ChangeLog* NEWS* README
- insinto /usr/share/bash-completion
- for f in gdbus gsettings; do
- newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
- done
- rm -rf "${ED}/etc"
-
# Completely useless with or without USE static-libs, people need to use
# pkg-config
find "${D}" -name '*.la' -exec rm -f {} +
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-05-25 9:41 Alexandre Restovtsev
0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2012-05-25 9:41 UTC (permalink / raw
To: gentoo-commits
commit: df87f28dc88c4d268f914338655e5f0a35be909c
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 09:37:53 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri May 25 09:37:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=df87f28d
dev-libs/glib: sync live ebuild with gx86 and fix gdbus-codegen failures
We want to run the in-tree version of gdbus-codegen in the live ebuild
to generate some code that is shipped with glib's tarball releases
(using gdbus-codegen-9999 here is risky IMHO). This means config.py
needs to be properly substituted and PYTHON defined.
Also, sync ebuild with gx86 changes.
---
.../files/glib-2.31.x-external-gdbus-codegen.patch | 27 +++++++++----------
dev-libs/glib/glib-9999.ebuild | 19 +++++++++++--
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
index df1378e..bd3afee 100644
--- a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
@@ -1,21 +1,21 @@
-From 732f04b55f59b8107a7fbe317317edb5f184ea8f Mon Sep 17 00:00:00 2001
+From 457ac2926e754bbebd72ee3606ad405ccfd2e952 Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Fri, 3 Feb 2012 09:08:28 +0200
Subject: [PATCH] Split out gdbus codegen
---
- configure.ac | 4 +---
+ configure.ac | 3 +--
docs/reference/gio/Makefile.am | 3 +--
gio/Makefile.am | 2 +-
gio/tests/Makefile.am | 6 ++----
gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 7 insertions(+), 14 deletions(-)
+ 5 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 4cf04a1..0bb18c8 100644
+index 833891b..697ce60 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -356,7 +356,7 @@ fi
+@@ -380,7 +380,7 @@ fi
AC_SUBST(PERL_PATH)
# Need suitable python path for greport
@@ -24,20 +24,19 @@ index 4cf04a1..0bb18c8 100644
dnl ***********************
-@@ -3525,8 +3525,6 @@ gobject/glib-mkenums
+@@ -3561,7 +3561,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/gdbus-2.0/codegen/config.py
gio/xdgmime/Makefile
gio/inotify/Makefile
- gio/fen/Makefile
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 535aa26..5027dd5 100644
+index 7d2d264..7cac0b2 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
-@@ -144,8 +144,7 @@ man_MANS = \
+@@ -148,8 +148,7 @@ man_MANS = \
glib-compile-resources.1 \
gsettings.1 \
gresource.1 \
@@ -48,7 +47,7 @@ index 535aa26..5027dd5 100644
if ENABLE_MAN
diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 67eeae6..277931b 100644
+index dae04b4..835ccc7 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
@@ -61,10 +60,10 @@ index 67eeae6..277931b 100644
if OS_UNIX
SUBDIRS += xdgmime
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index e987fd1..66af8cf 100644
+index c5cf59d..be9e48c 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
+@@ -293,10 +293,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
gdbus_close_pending_LDADD = $(progs_ldadd)
if OS_UNIX
@@ -95,5 +94,5 @@ index 9861d0e..9ca6eb9 100644
--c-namespace Example \
--c-generate-object-manager \
--
-1.7.8.4
+1.7.8.6
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 73676d1..576d38b 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -22,17 +22,19 @@ IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-linux"
fi
RDEPEND="virtual/libiconv
virtual/libffi
sys-libs/zlib
+ || (
+ >=dev-libs/elfutils-0.142
+ >=dev-libs/libelf-0.8.11 )
xattr? ( sys-apps/attr )
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
DEPEND="${RDEPEND}
- dev-libs/elfutils
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.15
doc? (
@@ -52,11 +54,21 @@ PDEPEND="x11-misc/shared-mime-info
# shared-mime-info needed for gio/xdgmime, bug #409481
# Earlier versions of gvfs do not work with glib
+# For safety, generate sources using the gdbus-codegen from glib git tree
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ =dev-lang/python-2*"
+fi
+
pkg_setup() {
# Needed for gio/tests/gdbus-testserver.py
- if use test ; then
+ if use test || [[ ${PV} = 9999 ]]; then
python_set_active_version 2
python_pkg_setup
+ if [[ ${PV} = 9999 ]]; then
+ # Make gdbus-codegen from ${S} work despite all our patches
+ MAKEOPTS="${MAKEOPTS} PYTHON=$(PYTHON -2 -a)"
+ fi
fi
if use kernel_linux ; then
@@ -194,6 +206,7 @@ src_test() {
export XDG_DATA_DIRS=/usr/local/share:/usr/share
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
unset GSETTINGS_BACKEND # bug 352451
+ export LC_TIME=C # bug #411967
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-05-24 7:33 Alexandre Restovtsev
0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2012-05-24 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 30b674018829b9b8404ddee6d091d8deda6851d6
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 07:25:24 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 07:32:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=30b67401
sys-devel/gcc: update
Requested by Sholy. There is now a configure switch for disabling tests.
Drop ancient ia64 patch (does not apply, and should not be needed for
current stable versions of gcc on ia64). Drop assert-test-failure patch
(fixed upstream).
---
.../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 --------------------
dev-libs/glib/glib-9999.ebuild | 25 ++-----------
2 files changed, 3 insertions(+), 61 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e33..0000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- gint val)
- {
-- return __sync_fetch_and_add (atomic, val);
-+ return __sync_fetch_and_add_si (atomic, val);
- }
-
- void
- g_atomic_int_add (volatile gint *atomic,
- gint val)
- {
-- __sync_fetch_and_add (atomic, val);
-+ __sync_fetch_and_add_si (atomic, val);
- }
-
- gboolean
-@@ -429,7 +429,7 @@
- gint oldval,
- gint newval)
- {
-- return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-
- gboolean
-@@ -437,7 +437,7 @@
- gpointer oldval,
- gpointer newval)
- {
-- return __sync_bool_compare_and_swap ((long *)atomic,
-+ return __sync_bool_compare_and_swap_di ((long *)atomic,
- (long)oldval, (long)newval);
- }
-
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index ac3895a..73676d1 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
>=dev-libs/libxslt-1.0
>=dev-util/gdbus-codegen-${PV}
>=dev-util/gtk-doc-1.15
- ~app-text/docbook-xml-dtd-4.1.2 )
+ app-text/docbook-xml-dtd:4.1.2 )
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
@@ -69,34 +69,14 @@ src_prepare() {
[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
- if use ia64 ; then
- # Only apply for < 4.1
- local major=$(gcc-major-version)
- local minor=$(gcc-minor-version)
- if (( major < 4 || ( major == 4 && minor == 0 ) )); then
- epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
- fi
- fi
-
- # Don't fail gio tests when ran without userpriv, upstream bug 552912
- # This is only a temporary workaround, remove as soon as possible
-# epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # Fix test failure during upgrades, upstream bug 621368
- epatch "${FILESDIR}/${PN}-2.31-assert-test-failure.patch"
-
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- # need to build tests if USE=doc for bug #387385
- if ! use test && ! use doc; then
- # don't waste time building tests
- sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
- else
+ if use test; then
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
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,"
@@ -170,6 +150,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
+ $(use_enable test modular-tests) \
--with-pcre=internal \
--with-threads=posix
}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-03-06 23:29 Alexandre Restovtsev
0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2012-03-06 23:29 UTC (permalink / raw
To: gentoo-commits
commit: 1b396de8552c54725de1e2bc61a10171db62beec
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 23:06:01 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Mar 6 23:17:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b396de8
dev-libs/glib: 2.31.18 → 2.31.20
Test failure patch has been applied upstream.
---
.../glib/files/glib-2.31-assert-test-failure.patch | 29 --------------------
.../{glib-2.31.18.ebuild => glib-2.31.20.ebuild} | 4 ---
dev-libs/glib/glib-9999.ebuild | 1 -
3 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.31-assert-test-failure.patch b/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
deleted file mode 100644
index a272d0e..0000000
--- a/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cf9e76b19482cf494798c24ffe904485a36a0b19 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Tue, 21 Feb 2012 19:42:22 +0530
-Subject: [PATCH] [tests] Run gdb under libtool so that local libraries are used
-
-If this isn't done, the system-wide glib is used for this test,
-and that can cause test failures.
-
-https://bugzilla.gnome.org/621368
----
- tests/run-assert-msg-test.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh
-index 194481e..b6045d6 100755
---- a/tests/run-assert-msg-test.sh
-+++ b/tests/run-assert-msg-test.sh
-@@ -34,7 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
- msg_test="lt-$msg_test"
- fi
- echo_v "Running gdb on assert-msg-test"
--OUT=$(gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
-+OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
- fail "failed to run gdb"
-
- echo_v "Checking if assert message is in __glib_assert_msg"
---
-1.7.3.4
-
diff --git a/dev-libs/glib/glib-2.31.18.ebuild b/dev-libs/glib/glib-2.31.20.ebuild
similarity index 98%
rename from dev-libs/glib/glib-2.31.18.ebuild
rename to dev-libs/glib/glib-2.31.20.ebuild
index a09e59f..0f125d3 100644
--- a/dev-libs/glib/glib-2.31.18.ebuild
+++ b/dev-libs/glib/glib-2.31.20.ebuild
@@ -77,9 +77,6 @@ src_prepare() {
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # Fix test failure during upgrades, upstream bug 621368
- epatch "${FILESDIR}/${PN}-2.31-assert-test-failure.patch"
-
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
@@ -160,7 +157,6 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
- --enable-regex \
--with-pcre=internal \
--with-threads=posix
}
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index a09e59f..bec4dc9 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -160,7 +160,6 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
- --enable-regex \
--with-pcre=internal \
--with-threads=posix
}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-02-25 15:08 Nirbheek Chauhan
0 siblings, 0 replies; 19+ messages in thread
From: Nirbheek Chauhan @ 2012-02-25 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 13f20d4eb802367831b70748259e49555f0b863b
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 14:17:56 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 15:08:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=13f20d4e
dev-libs/glib: fix 9999 build issue reported by Robin Kauffman
---
.../glib/files/glib-2.31-assert-test-failure.patch | 26 +++++++++++++-------
dev-libs/glib/glib-2.31.18.ebuild | 12 ++++++++-
dev-libs/glib/glib-9999.ebuild | 14 ++++++----
3 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.31-assert-test-failure.patch b/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
index 4259dee..a272d0e 100644
--- a/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
+++ b/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
@@ -1,16 +1,21 @@
-Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
-because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
-causes gdb to use the system-wide glib instead, and fail on the test.
+From cf9e76b19482cf494798c24ffe904485a36a0b19 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date: Tue, 21 Feb 2012 19:42:22 +0530
+Subject: [PATCH] [tests] Run gdb under libtool so that local libraries are used
-This patch exports LD_LIBRARY_PATH before running gdb
+If this isn't done, the system-wide glib is used for this test,
+and that can cause test failures.
https://bugzilla.gnome.org/621368
+---
+ tests/run-assert-msg-test.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
-(updated for 2.31.18)
-
---- tests/run-assert-msg-test.sh
-+++ tests/run-assert-msg-test.sh
-@@ -34,7 +34,7 @@
+diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh
+index 194481e..b6045d6 100755
+--- a/tests/run-assert-msg-test.sh
++++ b/tests/run-assert-msg-test.sh
+@@ -34,7 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
msg_test="lt-$msg_test"
fi
echo_v "Running gdb on assert-msg-test"
@@ -19,3 +24,6 @@ https://bugzilla.gnome.org/621368
fail "failed to run gdb"
echo_v "Checking if assert message is in __glib_assert_msg"
+--
+1.7.3.4
+
diff --git a/dev-libs/glib/glib-2.31.18.ebuild b/dev-libs/glib/glib-2.31.18.ebuild
index 9abcd49..a09e59f 100644
--- a/dev-libs/glib/glib-2.31.18.ebuild
+++ b/dev-libs/glib/glib-2.31.18.ebuild
@@ -7,6 +7,9 @@ PYTHON_DEPEND="utils? 2"
# Avoid runtime dependency on python when USE=test
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
@@ -16,7 +19,11 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="2"
IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+fi
RDEPEND="virtual/libiconv
virtual/libffi
@@ -51,6 +58,7 @@ pkg_setup() {
}
src_prepare() {
+ [[ ${PV} = 9999 ]] && gnome2-live_src_prepare
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
if use ia64 ; then
@@ -173,6 +181,8 @@ src_install() {
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+ # This is there for git snapshots and the live ebuild, bug 351966
+ [[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
dodoc AUTHORS ChangeLog* NEWS* README
insinto /usr/share/bash-completion
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 39fc4ec..a09e59f 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.2 2011/11/14 19:06:22 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.15
doc? (
>=dev-libs/libxslt-1.0
+ >=dev-util/gdbus-codegen-${PV}
>=dev-util/gtk-doc-1.15
~app-text/docbook-xml-dtd-4.1.2 )
systemtap? ( >=dev-util/systemtap-1.3 )
@@ -76,14 +77,15 @@ src_prepare() {
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
- epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
+ # Fix test failure during upgrades, upstream bug 621368
+ epatch "${FILESDIR}/${PN}-2.31-assert-test-failure.patch"
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
- if ! use test; then
+ # need to build tests if USE=doc for bug #387385
+ if ! use test && ! use doc; then
# don't waste time building tests
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
else
@@ -180,7 +182,7 @@ src_install() {
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
# This is there for git snapshots and the live ebuild, bug 351966
- emake README || die "emake README failed"
+ [[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; }
dodoc AUTHORS ChangeLog* NEWS* README
insinto /usr/share/bash-completion
@@ -191,7 +193,7 @@ src_install() {
# Completely useless with or without USE static-libs, people need to use
# pkg-config
- find "${E}" -name '*.la' -exec rm -f {} +
+ find "${D}" -name '*.la' -exec rm -f {} +
}
src_test() {
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2012-02-03 8:32 Priit Laes
0 siblings, 0 replies; 19+ messages in thread
From: Priit Laes @ 2012-02-03 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 8e81454604c3ccb1e82d78b01f4462a347368c56
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Feb 3 08:26:33 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Feb 3 08:26:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8e814546
dev-libs/glib: 2.31.12 → 2.31.14
---
.../files/glib-2.30.1-external-gdbus-codegen.patch | 75 ---------------
.../files/glib-2.31.x-external-gdbus-codegen.patch | 99 ++++++++++++++++++++
.../{glib-2.31.12.ebuild => glib-2.31.14.ebuild} | 3 +-
dev-libs/glib/glib-9999.ebuild | 3 +-
4 files changed, 103 insertions(+), 77 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
deleted file mode 100644
index 916b291..0000000
--- a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Use an external gdbus-codegen package
-
---- configure.ac
-+++ configure.ac
-@@ -367,7 +367,7 @@
- AC_SUBST(PERL_PATH)
-
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3857,8 +3857,6 @@
- gthread/Makefile
- gthread/tests/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/libasyncns/Makefile
---- docs/reference/gio/Makefile.am
-+++ docs/reference/gio/Makefile.am
-@@ -138,8 +138,7 @@
- gio-querymodules.1 \
- glib-compile-schemas.1 \
- gsettings.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- if ENABLE_MAN
-
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -2,7 +2,7 @@
-
- NULL =
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
---- gio/tests/gdbus-object-manager-example/Makefile.am
-+++ gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@
- 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 \
---- gio/tests/Makefile.am
-+++ gio/tests/Makefile.am
-@@ -266,10 +266,8 @@
- gdbus_close_pending_LDADD = $(progs_ldadd)
-
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : 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 gdbus-test-codegen-generated.c : 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/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
new file mode 100644
index 0000000..df1378e
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
@@ -0,0 +1,99 @@
+From 732f04b55f59b8107a7fbe317317edb5f184ea8f Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Fri, 3 Feb 2012 09:08:28 +0200
+Subject: [PATCH] Split out gdbus codegen
+
+---
+ configure.ac | 4 +---
+ docs/reference/gio/Makefile.am | 3 +--
+ gio/Makefile.am | 2 +-
+ gio/tests/Makefile.am | 6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
+ 5 files changed, 7 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4cf04a1..0bb18c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -356,7 +356,7 @@ fi
+ AC_SUBST(PERL_PATH)
+
+ # Need suitable python path for greport
+-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
+
+
+ dnl ***********************
+@@ -3525,8 +3525,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/xdgmime/Makefile
+ gio/inotify/Makefile
+ gio/fen/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 535aa26..5027dd5 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -144,8 +144,7 @@ man_MANS = \
+ glib-compile-resources.1 \
+ gsettings.1 \
+ gresource.1 \
+- gdbus.1 \
+- gdbus-codegen.1
++ gdbus.1
+
+ if ENABLE_MAN
+
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 67eeae6..277931b 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
+
+ NULL =
+
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index e987fd1..66af8cf 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
+ gdbus_close_pending_LDADD = $(progs_ldadd)
+
+ if OS_UNIX
+-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : 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 gdbus-test-codegen-generated.c : 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 9861d0e..9ca6eb9 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -21,10 +21,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 \
+--
+1.7.8.4
+
diff --git a/dev-libs/glib/glib-2.31.12.ebuild b/dev-libs/glib/glib-2.31.14.ebuild
similarity index 98%
rename from dev-libs/glib/glib-2.31.12.ebuild
rename to dev-libs/glib/glib-2.31.14.ebuild
index 9955567..1b0c464 100644
--- a/dev-libs/glib/glib-2.31.12.ebuild
+++ b/dev-libs/glib/glib-2.31.14.ebuild
@@ -25,6 +25,7 @@ RDEPEND="virtual/libiconv
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
DEPEND="${RDEPEND}
+ dev-libs/elfutils
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.15
doc? (
@@ -107,7 +108,7 @@ src_prepare() {
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 6e2b02b..39fc4ec 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -32,6 +32,7 @@ RDEPEND="virtual/libiconv
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
DEPEND="${RDEPEND}
+ dev-libs/elfutils
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.15
doc? (
@@ -113,7 +114,7 @@ src_prepare() {
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2011-10-17 19:10 Alexandre Restovtsev
0 siblings, 0 replies; 19+ messages in thread
From: Alexandre Restovtsev @ 2011-10-17 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 2296264ba6c42b9b063d70dd224eccb1c54d2183
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 17:14:18 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 17 19:10:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2296264b
dev-libs/glib: sync with gx86
---
.../glib-2.29.18-external-gdbus-codegen.patch | 95 --------------------
.../files/glib-2.30.1-external-gdbus-codegen.patch | 75 +++++++++++++++
dev-libs/glib/files/glib-2.30.1-homedir-env.patch | 61 +++++++++++++
dev-libs/glib/glib-9999.ebuild | 61 ++++++++-----
4 files changed, 172 insertions(+), 120 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
deleted file mode 100644
index abec0dd..0000000
--- a/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 24 Aug 2011 21:35:59 -0400
-Subject: [PATCH] Use an external gdbus-codegen package
-
----
- configure.ac | 4 +---
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 4 +---
- gio/tests/gdbus-object-manager-example/Makefile.am | 4 +---
- 5 files changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dc23b8b..0bb0c4a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -365,7 +365,7 @@ fi
- AC_SUBST(PERL_PATH)
-
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3858,8 +3858,6 @@ gobject/tests/Makefile
- gthread/Makefile
- gthread/tests/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/libasyncns/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 9eb0fce..511aec9 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -79,8 +79,7 @@ man_MANS = \
- gio-querymodules.1 \
- glib-compile-schemas.1 \
- gsettings.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- if ENABLE_MAN
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 7803bb2..d4a08e5 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
-
- NULL =
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index a85ea4f..8fbe8ec 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
-
- if OS_UNIX
- gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+ $(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 5e6eb9a..8b16926 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -22,9 +22,7 @@ GDBUS_GENERATED = \
- $(NULL)
-
- $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-1.7.6.1
-
diff --git a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
new file mode 100644
index 0000000..916b291
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
@@ -0,0 +1,75 @@
+Use an external gdbus-codegen package
+
+--- configure.ac
++++ configure.ac
+@@ -367,7 +367,7 @@
+ AC_SUBST(PERL_PATH)
+
+ # Need suitable python path for greport
+-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
+
+
+ dnl ***********************
+@@ -3857,8 +3857,6 @@
+ gthread/Makefile
+ gthread/tests/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+-gio/gdbus-2.0/codegen/config.py
+ gio/xdgmime/Makefile
+ gio/inotify/Makefile
+ gio/libasyncns/Makefile
+--- docs/reference/gio/Makefile.am
++++ docs/reference/gio/Makefile.am
+@@ -138,8 +138,7 @@
+ gio-querymodules.1 \
+ glib-compile-schemas.1 \
+ gsettings.1 \
+- gdbus.1 \
+- gdbus-codegen.1
++ gdbus.1
+
+ if ENABLE_MAN
+
+--- gio/Makefile.am
++++ gio/Makefile.am
+@@ -2,7 +2,7 @@
+
+ NULL =
+
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+
+ if OS_UNIX
+ SUBDIRS += libasyncns xdgmime
+--- gio/tests/gdbus-object-manager-example/Makefile.am
++++ gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -21,10 +21,8 @@
+ 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 \
+--- gio/tests/Makefile.am
++++ gio/tests/Makefile.am
+@@ -266,10 +266,8 @@
+ gdbus_close_pending_LDADD = $(progs_ldadd)
+
+ if OS_UNIX
+-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : 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 gdbus-test-codegen-generated.c : 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/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
new file mode 100644
index 0000000..30d4499
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
@@ -0,0 +1,61 @@
+Description: Handle the G_HOME environment variable to override the passwd entry
+ This will allow to fix various kinds of build failures due to restricted
+ build environments.
+Author: Josselin Mouette <joss@debian.org>
+Origin: vendor
+
+--- a/docs/reference/glib/running.sgml
++++ b/docs/reference/glib/running.sgml
+@@ -213,6 +213,22 @@
+ </para>
+ </formalpara>
+
++<formalpara id="G_HOME">
++ <title><envar>G_HOME</envar></title>
++
++ <para>
++ For various reasons, GLib applications ignore the <envar>HOME</envar>
++ environment variable on Unix systems and will use the user directory
++ as specified by the <filename>passwd</filename> entry, which is more
++ reliable.
++ </para>
++ <para>
++ The <envar>G_HOME</envar> environment variable will override any
++ other setting for the home directory. It is not meant for daily usage,
++ but it is useful in testing or building environments.
++ </para>
++</formalpara>
++
+ </refsect2>
+
+ <refsect2 id="setlocale">
+--- a/glib/gutils.c
++++ b/glib/gutils.c
+@@ -1626,11 +1626,14 @@
+ }
+ #endif /* !G_OS_WIN32 */
+
++ g_home_dir = g_strdup (g_getenv ("G_HOME"));
++
+ #ifdef G_OS_WIN32
+ /* We check $HOME first for Win32, though it is a last resort for Unix
+ * where we prefer the results of getpwuid().
+ */
+- g_home_dir = g_strdup (g_getenv ("HOME"));
++ if (!g_home_dir)
++ g_home_dir = g_strdup (g_getenv ("HOME"));
+
+ /* Only believe HOME if it is an absolute path and exists */
+ if (g_home_dir)
+@@ -1926,6 +1929,11 @@
+ * homedir = g_get_home_dir (<!-- -->);
+ * ]|
+ *
++ * However, to allow changing this value for testing and development
++ * purposes, the value of the <envar>G_HOME</envar> environment
++ * variable, if set, will override the <filename>passwd</filename>
++ * entry.
++ *
+ * Returns: the current user's home directory
+ */
+ G_CONST_RETURN gchar*
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index af12ca6..28ffe51 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -3,9 +3,10 @@
# $Header: $
EAPI="4"
+PYTHON_DEPEND="utils? 2"
+# Avoid runtime dependency on python when USE=test
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
-# Do not inherit python.eclass to avoid python runtime dependency; #377549
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -17,18 +18,19 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="2"
-IUSE="debug doc fam selinux +static-libs systemtap test xattr"
+IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
fi
RDEPEND="virtual/libiconv
virtual/libffi
sys-libs/zlib
xattr? ( sys-apps/attr )
- fam? ( virtual/fam )"
+ fam? ( virtual/fam )
+ utils? ( >=dev-util/gdbus-codegen-${PV} )"
DEPEND="${RDEPEND}
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.15
@@ -38,13 +40,20 @@ DEPEND="${RDEPEND}
~app-text/docbook-xml-dtd-4.1.2 )
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
+ sys-devel/gdb
=dev-lang/python-2*
- >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/gdbus-codegen-${PV}
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2"
PDEPEND="!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
-# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
+pkg_setup() {
+ # Needed for gio/tests/gdbus-testserver.py
+ if use test ; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
src_prepare() {
[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
@@ -61,7 +70,7 @@ src_prepare() {
# Don't fail gio tests when ran without userpriv, upstream bug 552912
# This is only a temporary workaround, remove as soon as possible
- epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
+# epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
@@ -87,9 +96,6 @@ src_prepare() {
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
fi
- # Disable flaky gdbus/connection/life-cycle test; bug #384853
- sed -i -e "/connection\/life-cycle/d" gio/tests/gdbus-connection.c || die
-
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
@@ -103,21 +109,18 @@ src_prepare() {
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
- else
- # use python2 for the test server
- sed -i -e 's:/usr/bin/env python$:/usr/bin/env python2:' gio/tests/gdbus-testserver.py || die
fi
fi
# gdbus-codegen is a separate package
- epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
+ epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
+
+ # Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
+ epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
- # python2 needed for gtester-report
- sed -e 's:/usr/bin/env python$:/usr/bin/env python2:' -i glib/gtester-report || die
-
# Needed for the punt-python-check patch, disabling timeout test
# Also needed to prevent croscompile failures, see bug #267603
# Also needed for the no-gdbus-codegen patch
@@ -131,8 +134,10 @@ src_prepare() {
src_configure() {
# Avoid circular depend with dev-util/pkgconfig
if ! has_version dev-util/pkgconfig; then
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
+ 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"
fi
@@ -162,7 +167,13 @@ src_configure() {
src_install() {
local f
- emake DESTDIR="${D}" install || die "Installation failed"
+
+ # install-exec-hook substitutes ${PYTHON} in glib/gtester-report
+ emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
+
+ if ! use utils; then
+ rm "${ED}usr/bin/gtester-report"
+ fi
# Do not install charset.alias even if generated, leave it to libiconv
rm -f "${ED}/usr/lib/charset.alias"
@@ -172,17 +183,17 @@ src_install() {
# This is there for git snapshots and the live ebuild, bug 351966
emake README || die "emake README failed"
- dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+ dodoc AUTHORS ChangeLog* NEWS* README
insinto /usr/share/bash-completion
for f in gdbus gsettings; do
- newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
+ newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
done
rm -rf "${ED}/etc"
# Completely useless with or without USE static-libs, people need to use
# pkg-config
- find "${ED}" -name '*.la' -exec rm -f {} +
+ find "${E}" -name '*.la' -exec rm -f {} +
}
src_test() {
@@ -204,7 +215,7 @@ src_test() {
fi
# Need X for dbus-launch session X11 initialization
- Xemake check || die "tests failed"
+ Xemake check
}
pkg_preinst() {
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
@ 2011-06-18 17:35 Priit Laes
0 siblings, 0 replies; 19+ messages in thread
From: Priit Laes @ 2011-06-18 17:35 UTC (permalink / raw
To: gentoo-commits
commit: bf8f68c0f034d627d23648e7873676b310e01812
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Jun 18 17:34:35 2011 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Jun 18 17:34:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bf8f68c0
dev-libs/glib: Python check is now needed by gdbus-codegen
---
.../glib/files/glib-2.25-punt-python-check.patch | 20 --------------------
dev-libs/glib/glib-9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/dev-libs/glib/files/glib-2.25-punt-python-check.patch b/dev-libs/glib/files/glib-2.25-punt-python-check.patch
deleted file mode 100644
index 077ebf4..0000000
--- a/dev-libs/glib/files/glib-2.25-punt-python-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove python detection from configure.in, we won't be installing the gdb python
-scripts anymore. They use a redhat-specific gdb module that has not been
-upstreamed yet.
-
-https://bugs.gentoo.org/291328
-https://bugzilla.gnome.org/623552
----
---- configure.ac
-+++ configure.ac
-@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
- fi
- AC_SUBST(PERL_PATH)
-
--# Need suitable python path for greport
--AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
--
--
- dnl ***********************
- dnl *** Tests for iconv ***
- dnl ***********************
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 8fbfb8c..917ff0f 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -66,10 +66,6 @@ src_prepare() {
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
- # Don't check for python, hence removing the build-time python dep.
- # We remove the gdb python scripts in src_install due to bug 291328
- epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
-
# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2018-08-20 8:33 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-20 15:29 [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ Priit Laes
-- strict thread matches above, loose matches on Subject: below --
2018-08-20 8:33 Mart Raudsepp
2018-06-24 14:05 Sobhan Mohammadpour
2018-01-02 15:17 Sobhan Mohammadpour
2017-12-18 13:50 Sobhan Mohammadpour
2014-04-15 22:05 Gilles Dartiguelongue
2014-04-15 22:05 Gilles Dartiguelongue
2013-11-24 19:34 Gilles Dartiguelongue
2013-02-28 10:37 Priit Laes
2012-09-25 15:46 Alexandre Rostovtsev
2012-07-16 5:53 Alexandre Restovtsev
2012-07-03 11:10 Priit Laes
2012-05-25 9:41 Alexandre Restovtsev
2012-05-24 7:33 Alexandre Restovtsev
2012-03-06 23:29 Alexandre Restovtsev
2012-02-25 15:08 Nirbheek Chauhan
2012-02-03 8:32 Priit Laes
2011-10-17 19:10 Alexandre Restovtsev
2011-06-18 17:35 Priit Laes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox