diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-14 19:07:46 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-14 19:07:46 +0000 |
commit | faaa4505b4bc66a5bdf0e9d85e2dd4d49f604efc (patch) | |
tree | 0f8a08f3146e535f257a1c9e68ce365aa7eb9cdc | |
parent | Version bump (bug #415977). (diff) | |
download | gentoo-2-faaa4505b4bc66a5bdf0e9d85e2dd4d49f604efc.tar.gz gentoo-2-faaa4505b4bc66a5bdf0e9d85e2dd4d49f604efc.tar.bz2 gentoo-2-faaa4505b4bc66a5bdf0e9d85e2dd4d49f604efc.zip |
Fix broken pkgconfig file that prevented eog etc. from being built (bug #415961, thanks to pingouin21).
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
-rw-r--r-- | dev-libs/libpeas/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch | 25 | ||||
-rw-r--r-- | dev-libs/libpeas/libpeas-1.4.0-r1.ebuild (renamed from dev-libs/libpeas/libpeas-1.4.0.ebuild) | 5 |
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog index 99eab4bcdd8b..136d3a8f0f4e 100644 --- a/dev-libs/libpeas/ChangeLog +++ b/dev-libs/libpeas/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/libpeas # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.4 2012/04/22 23:28:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.5 2012/05/14 19:07:46 tetromino Exp $ + +*libpeas-1.4.0-r1 (14 May 2012) + + 14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -libpeas-1.4.0.ebuild, +libpeas-1.4.0-r1.ebuild, + +files/libpeas-1.4.0-pkgconfig.patch: + Fix broken pkgconfig file that prevented eog etc. from being built (bug + #415961, thanks to pingouin21). *libpeas-1.4.0 (22 Apr 2012) diff --git a/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch b/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch new file mode 100644 index 000000000000..125af02657b9 --- /dev/null +++ b/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch @@ -0,0 +1,25 @@ +From 2d6ea307cf45af6b92b1cd708d0ee288aca0b3fe Mon Sep 17 00:00:00 2001 +From: Olav Vitters <olav@vitters.nl> +Date: Wed, 28 Mar 2012 15:28:40 +0200 +Subject: [PATCH] fix forgotten @ in pkgconfig file + +--- + data/libpeas-1.0.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/data/libpeas-1.0.pc.in b/data/libpeas-1.0.pc.in +index 9523067..704d686 100644 +--- a/data/libpeas-1.0.pc.in ++++ b/data/libpeas-1.0.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: libpeas + Description: libpeas, a GObject plugins library +-Requires: glib-2.0 >= @GLIB_REQUIRED@, gobject-2.0 >= @GLIB_REQUIRED@, gmodule-2.0 >= @GLIB_REQUIRED@, gio-2.0 >= @GIO_REQUIRED gobject-introspection-1.0 >= @INTROSPECTION_REQUIRED@ ++Requires: glib-2.0 >= @GLIB_REQUIRED@, gobject-2.0 >= @GLIB_REQUIRED@, gmodule-2.0 >= @GLIB_REQUIRED@, gio-2.0 >= @GIO_REQUIRED@ gobject-introspection-1.0 >= @INTROSPECTION_REQUIRED@ + Version: @VERSION@ + Cflags: -I${includedir}/libpeas-1.0 + Libs: -L${libdir} -lpeas-1.0 +-- +1.7.8.6 + diff --git a/dev-libs/libpeas/libpeas-1.4.0.ebuild b/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild index 55dd5bd2d4cb..005bacb78b70 100644 --- a/dev-libs/libpeas/libpeas-1.4.0.ebuild +++ b/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.4.0.ebuild,v 1.1 2012/04/22 23:28:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild,v 1.1 2012/05/14 19:07:46 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -51,6 +51,9 @@ pkg_setup() { } src_prepare() { + # In next release, bug #415961 + epatch "${FILESDIR}/${P}-pkgconfig.patch" + use python && python_clean_py-compile_files gnome2_src_prepare } |