diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-03-29 14:13:29 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-03-29 14:13:29 +0000 |
commit | 562014c37459807e232d7fcd0d0dcf69a49269bc (patch) | |
tree | 5dc392b42a79339a9d16e41b01673894182baf7f /dev-util | |
parent | Stable for ia64, wrt bug #458984 (diff) | |
download | gentoo-2-562014c37459807e232d7fcd0d0dcf69a49269bc.tar.gz gentoo-2-562014c37459807e232d7fcd0d0dcf69a49269bc.tar.bz2 gentoo-2-562014c37459807e232d7fcd0d0dcf69a49269bc.zip |
Forgot to commit ebuild using updated patch (#463656 by Maciej Piechotka)
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/gdbus-codegen/ChangeLog | 6 | ||||
-rwxr-xr-x | dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch | 31 | ||||
-rw-r--r-- | dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild | 4 |
3 files changed, 38 insertions, 3 deletions
diff --git a/dev-util/gdbus-codegen/ChangeLog b/dev-util/gdbus-codegen/ChangeLog index db5353882efc..bb679d6090a8 100644 --- a/dev-util/gdbus-codegen/ChangeLog +++ b/dev-util/gdbus-codegen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/gdbus-codegen # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.44 2013/03/28 16:03:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.45 2013/03/29 14:13:29 pacho Exp $ + + 29 Mar 2013; Pacho Ramos <pacho@gentoo.org> + +files/gdbus-codegen-2.36.0-sitedir.patch, gdbus-codegen-2.36.0.ebuild: + Forgot to commit ebuild using updated patch (#463656 by Maciej Piechotka) *gdbus-codegen-2.36.0 (28 Mar 2013) diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch new file mode 100755 index 000000000000..795d8395032e --- /dev/null +++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch @@ -0,0 +1,31 @@ +From 626f79dcfb1f26997f2807829c6fa19f6c3303f5 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> +Date: Sun, 20 Jan 2013 20:25:13 +0330 +Subject: [PATCH] glib-2.35.4-external-gdbus-codegen + +--- + gio/gdbus-2.0/codegen/gdbus-codegen.in | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in +index 253d151..2295481 100644 +--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in ++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in +@@ -29,13 +29,7 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None) + + if srcdir is not None: + path = os.path.join(srcdir, 'gio', 'gdbus-2.0') +-elif os.name == 'nt': +- # Makes gdbus-codegen 'relocatable' at runtime on Windows. +- path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0') + else: +- path = os.path.join('@datadir@', 'glib-2.0') +- +-sys.path.insert(0, os.path.abspath(path)) +-from codegen import codegen_main ++ from gdbus_codegen import codegen_main + + sys.exit(codegen_main.codegen_main()) +-- +1.8.1 + diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild index 793e119e871d..1eb8a17ad4f4 100644 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild,v 1.1 2013/03/28 16:03:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.0.ebuild,v 1.2 2013/03/29 14:13:29 pacho Exp $ EAPI="5" GNOME_ORG_MODULE="glib" @@ -26,7 +26,7 @@ PDEPEND=">=dev-libs/glib-${PV}:2" S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" python_prepare_all() { - epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch" + epatch "${FILESDIR}/${PN}-2.36.0-sitedir.patch" sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \ -i config.py || die "sed config.py failed" |