diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-06-16 09:24:59 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-06-16 09:24:59 +0000 |
| commit | f6faa2bb2deda60e0c7a964f007ac1dc4b727987 (patch) | |
| tree | cce09d35810c7e452833b052d8990a4d53c416c8 /x11-libs/pango | |
| parent | Taking maint. (diff) | |
| download | gentoo-2-f6faa2bb2deda60e0c7a964f007ac1dc4b727987.tar.gz gentoo-2-f6faa2bb2deda60e0c7a964f007ac1dc4b727987.tar.bz2 gentoo-2-f6faa2bb2deda60e0c7a964f007ac1dc4b727987.zip | |
Add patch to fix QA abort on x64-macos due to missing function declaration
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
Diffstat (limited to 'x11-libs/pango')
| -rw-r--r-- | x11-libs/pango/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch | 12 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.30.1.ebuild | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 2fdd972132b3..933aae787217 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -1,6 +1,11 @@ # 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.348 2012/06/07 07:21:33 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.349 2012/06/16 09:24:59 grobian Exp $ + + 16 Jun 2012; Fabian Groffen <grobian@gentoo.org> + +files/pango-1.30.1-config_get_key_system-declaration.patch, + pango-1.30.1.ebuild: + Add patch to fix QA abort on x64-macos due to missing function declaration *pango-1.30.1 (07 Jun 2012) 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 new file mode 100644 index 000000000000..0294fcc3b9a6 --- /dev/null +++ b/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch @@ -0,0 +1,12 @@ +https://bugzilla.gnome.org/show_bug.cgi?id=667960#c5 + +--- pango/pango-utils.h ++++ pango/pango-utils.h +@@ -42,6 +42,7 @@ + int *out); + + #ifdef PANGO_ENABLE_BACKEND ++char * pango_config_key_get_system (const char *key); + char * pango_config_key_get (const char *key); + void pango_lookup_aliases (const char *fontname, + char ***families, diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild index 7f1ceac8fc74..d7b5bd1abdc4 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.1 2012/06/07 07:21:33 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.2 2012/06/16 09:24:59 grobian Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -61,6 +61,9 @@ src_prepare() { # In next release epatch "${FILESDIR}/${P}-coretext-hash.patch" + # missing declaration causing QA abort on x64-macos, notified upstream + epatch "${FILESDIR}"/${P}-config_get_key_system-declaration.patch + # make config file location host specific so that a 32bit and 64bit pango # wont fight with each other on a multilib system. Fix building for # emul-linux-x86-gtklibs |