diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-06-17 08:17:22 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-06-17 08:17:22 +0000 |
| commit | 2d67eb415ad3e1eb582071d299a62072878d16b4 (patch) | |
| tree | fc17dd852dafc1d49600b2b0f5051c8a29464ef6 | |
| parent | Adjust patch name (#421523 by Juergen Rose) (diff) | |
| download | gentoo-2-2d67eb415ad3e1eb582071d299a62072878d16b4.tar.gz gentoo-2-2d67eb415ad3e1eb582071d299a62072878d16b4.tar.bz2 gentoo-2-2d67eb415ad3e1eb582071d299a62072878d16b4.zip | |
Update patch comments (committed upstream), use get_modname for module extension name
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
| -rw-r--r-- | x11-libs/pango/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch | 1 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.30.1.ebuild | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 933aae787217..9dc8cd2c4ac9 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/pango # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.349 2012/06/16 09:24:59 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.350 2012/06/17 08:17:22 grobian Exp $ + + 17 Jun 2012; Fabian Groffen <grobian@gentoo.org> + files/pango-1.30.1-config_get_key_system-declaration.patch, + pango-1.30.1.ebuild: + Update patch comments (committed upstream), use get_modname for module + extension name 16 Jun 2012; Fabian Groffen <grobian@gentoo.org> +files/pango-1.30.1-config_get_key_system-declaration.patch, diff --git a/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch b/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch index 0294fcc3b9a6..c7000f6d8586 100644 --- a/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch +++ b/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch @@ -1,4 +1,5 @@ https://bugzilla.gnome.org/show_bug.cgi?id=667960#c5 +http://git.gnome.org/browse/pango/commit/?id=ee3537107a0bc41d5e5b2dc5c71106dec42ad144 --- pango/pango-utils.h +++ pango/pango-utils.h diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild index d7b5bd1abdc4..4f1889dad2d9 100644 --- a/x11-libs/pango/pango-1.30.1.ebuild +++ b/x11-libs/pango/pango-1.30.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/x11-libs/pango/pango-1.30.1.ebuild,v 1.2 2012/06/16 09:24:59 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.3 2012/06/17 08:17:22 grobian Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -61,7 +61,8 @@ src_prepare() { # In next release epatch "${FILESDIR}/${P}-coretext-hash.patch" - # missing declaration causing QA abort on x64-macos, notified upstream + # missing declaration causing QA abort on x64-macos, should be in next + # release epatch "${FILESDIR}"/${P}-config_get_key_system-declaration.patch # make config file location host specific so that a 32bit and 64bit pango @@ -87,7 +88,7 @@ pkg_postinst() { # be atomic! if pango-querymodules --system \ - "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ + "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \ > "${tmp_file}"; then cat "${tmp_file}" > "${pango_conf}" || { rm "${tmp_file}"; die; } |