From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RtEZm-0003nU-1s for garchives@archives.gentoo.org; Fri, 03 Feb 2012 08:32:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8447E062A; Fri, 3 Feb 2012 08:32:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B1F6E062A for ; Fri, 3 Feb 2012 08:32:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0E791B4032 for ; Fri, 3 Feb 2012 08:32:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2F3438004F for ; Fri, 3 Feb 2012 08:32:47 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <8e81454604c3ccb1e82d78b01f4462a347368c56.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch dev-libs/glib/glib-2.31.12.ebuild dev-libs/glib/glib-2.31.14.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 8e81454604c3ccb1e82d78b01f4462a347368c56 Date: Fri, 3 Feb 2012 08:32:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3e1457ae-32ff-460a-b0f1-17ec6b61ad98 X-Archives-Hash: 970d3ddcd1449f3b1269ea4fa9d6e027 commit: 8e81454604c3ccb1e82d78b01f4462a347368c56 Author: Priit Laes plaes org> AuthorDate: Fri Feb 3 08:26:33 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Fri Feb 3 08:26:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8e814546 dev-libs/glib: 2.31.12 =E2=86=92 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 =3D> 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) -=20 - # Need suitable python path for greport --AM_PATH_PYTHON(2.5,,PYTHON=3D"/usr/bin/env python2.5") -+# AM_PATH_PYTHON(2.5,,PYTHON=3D"/usr/bin/env python2.5") -=20 -=20 - 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 -=20 - if ENABLE_MAN -=20 ---- gio/Makefile.am -+++ gio/Makefile.am -@@ -2,7 +2,7 @@ -=20 - NULL =3D -=20 --SUBDIRS =3D gdbus-2.0/codegen -+SUBDIRS =3D -=20 - if OS_UNIX - SUBDIRS +=3D 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.ObjectMana= ger.Cat.xml \ - $(NULL) -=20 --$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_bui= lddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=3D$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=3D$(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 =3D $(progs_ldadd) -=20 - if OS_UNIX --gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-co= degen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=3D$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=3D$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-co= degen.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 +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) +=20 + # Need suitable python path for greport +-AM_PATH_PYTHON(2.5,,PYTHON=3D"/usr/bin/env python2.5") ++# AM_PATH_PYTHON(2.5,,PYTHON=3D"/usr/bin/env python2.5") +=20 +=20 + 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/Makefil= e.am +index 535aa26..5027dd5 100644 +--- a/docs/reference/gio/Makefile.am ++++ b/docs/reference/gio/Makefile.am +@@ -144,8 +144,7 @@ man_MANS =3D \ + glib-compile-resources.1 \ + gsettings.1 \ + gresource.1 \ +- gdbus.1 \ +- gdbus-codegen.1 ++ gdbus.1 +=20 + if ENABLE_MAN +=20 +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 +=20 + NULL =3D +=20 +-SUBDIRS =3D gdbus-2.0/codegen ++SUBDIRS =3D +=20 + if OS_UNIX + SUBDIRS +=3D 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 =3D gdbus-close-pending= .c gdbus-sessionbus.c gdbus-ses + gdbus_close_pending_LDADD =3D $(progs_ldadd) +=20 + if OS_UNIX +-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-co= degen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen +- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=3D$(top_srcdir) \ +- UNINSTALLED_GLIB_BUILDDIR=3D$(top_builddir) \ +- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ ++gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-co= degen.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/te= sts/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 =3D \ + gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectMana= ger.Cat.xml \ + $(NULL) +=20 +-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_bui= lddir)/gio/gdbus-2.0/codegen/gdbus-codegen +- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=3D$(top_srcdir) \ +- UNINSTALLED_GLIB_BUILDDIR=3D$(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 \ +--=20 +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=3D"virtual/libiconv fam? ( virtual/fam ) utils? ( >=3Ddev-util/gdbus-codegen-${PV} )" DEPEND=3D"${RDEPEND} + dev-libs/elfutils >=3Dsys-devel/gettext-0.11 >=3Ddev-util/gtk-doc-am-1.15 doc? ( @@ -107,7 +108,7 @@ src_prepare() { fi =20 # 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" =20 # 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.ebu= ild index 6e2b02b..39fc4ec 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -32,6 +32,7 @@ RDEPEND=3D"virtual/libiconv fam? ( virtual/fam ) utils? ( >=3Ddev-util/gdbus-codegen-${PV} )" DEPEND=3D"${RDEPEND} + dev-libs/elfutils >=3Dsys-devel/gettext-0.11 >=3Ddev-util/gtk-doc-am-1.15 doc? ( @@ -113,7 +114,7 @@ src_prepare() { fi =20 # 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" =20 # disable pyc compiling ln -sfn $(type -P true) py-compile