From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/
Date: Fri, 3 Feb 2012 08:32:47 +0000 (UTC) [thread overview]
Message-ID: <8e81454604c3ccb1e82d78b01f4462a347368c56.plaes@gentoo> (raw)
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
next reply other threads:[~2012-02-03 8:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 8:32 Priit Laes [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
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
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=8e81454604c3ccb1e82d78b01f4462a347368c56.plaes@gentoo \
--to=plaes@plaes.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