From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
Date: Tue, 15 Apr 2014 22:05:31 +0000 (UTC) [thread overview]
Message-ID: <1397595540.6a71ca5f6badd289042d2480c6744e5852728416.eva@gentoo> (raw)
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"
next reply other threads:[~2014-04-15 22:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 22:05 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-20 8:33 [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ 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
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-12-20 15:29 Priit Laes
2011-10-17 19:10 Alexandre Restovtsev
2011-06-18 17:35 Priit Laes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397595540.6a71ca5f6badd289042d2480c6744e5852728416.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox