diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2012-03-26 22:39:45 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2012-03-26 22:39:45 +0000 |
| commit | 7bad3a4583fb158b85af431c78ff26897e12d345 (patch) | |
| tree | b7a0b6b4883ebec14a0046683336b3dcec9e4313 /app-i18n | |
| parent | Add patch from upstream for libmemusage.so on arm targets #409721 by Alexande... (diff) | |
| download | gentoo-2-7bad3a4583fb158b85af431c78ff26897e12d345.tar.gz gentoo-2-7bad3a4583fb158b85af431c78ff26897e12d345.tar.bz2 gentoo-2-7bad3a4583fb158b85af431c78ff26897e12d345.zip | |
Add patch not to loook for ibus-1.0.pc generating GIR. #409191
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/ibus/ChangeLog | 6 | ||||
| -rw-r--r-- | app-i18n/ibus/files/ibus-1.4.1-gir.patch | 11 | ||||
| -rw-r--r-- | app-i18n/ibus/ibus-1.4.1.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog index bb8d9e798ed2..d724ba7357bc 100644 --- a/app-i18n/ibus/ChangeLog +++ b/app-i18n/ibus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/ibus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.105 2012/03/09 19:33:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.106 2012/03/26 22:39:45 naota Exp $ + + 26 Mar 2012; Naohiro Aota <naota@gentoo.org> +files/ibus-1.4.1-gir.patch, + ibus-1.4.1.ebuild: + Add patch not to loook for ibus-1.0.pc generating GIR. #409191 09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> ibus-1.4.1.ebuild, +files/ibus-gconf-2.m4.patch: diff --git a/app-i18n/ibus/files/ibus-1.4.1-gir.patch b/app-i18n/ibus/files/ibus-1.4.1-gir.patch new file mode 100644 index 000000000000..91f06c6768b4 --- /dev/null +++ b/app-i18n/ibus/files/ibus-1.4.1-gir.patch @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -170,7 +170,7 @@ introspection_files = \ + ibusenumtypes.h \ + $(NULL) + IBus-1.0.gir: $(libibus) Makefile +-IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS) ++IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS) + IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0 + IBus_1_0_gir_LIBS = $(libibus) + IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild index 9fe617e2f790..c13c25d6cfa9 100644 --- a/app-i18n/ibus/ibus-1.4.1.ebuild +++ b/app-i18n/ibus/ibus-1.4.1.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/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.6 2012/03/09 19:33:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.7 2012/03/26 22:39:45 naota Exp $ EAPI=4 PYTHON_DEPEND="python? 2:2.5" @@ -87,7 +87,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-gconf-2.m4.patch \ - "${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch + "${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch \ + "${FILESDIR}"/${PN}-1.4.1-gir.patch use gconf || epatch "${FILESDIR}"/${P}-no-gconf.patch |