diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-02-17 09:59:58 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-02-17 09:59:58 +0000 |
| commit | 7d6941cedc75e8695e5741c6a560558de0ac55d6 (patch) | |
| tree | f54bbf4cedf13981c52273d7f909502881742afb /media-gfx/graphite2 | |
| parent | x86 stable wrt bug #402115 (diff) | |
| download | gentoo-2-7d6941cedc75e8695e5741c6a560558de0ac55d6.tar.gz gentoo-2-7d6941cedc75e8695e5741c6a560558de0ac55d6.tar.bz2 gentoo-2-7d6941cedc75e8695e5741c6a560558de0ac55d6.zip | |
Add one more patch and bit more fun for perl.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/graphite2')
| -rw-r--r-- | media-gfx/graphite2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/graphite2/files/graphite2-1.1.0-fix-perl-includes.patch | 23 | ||||
| -rw-r--r-- | media-gfx/graphite2/graphite2-1.1.0.ebuild | 6 |
3 files changed, 33 insertions, 2 deletions
diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog index f82ecb5233e6..58b271a258b7 100644 --- a/media-gfx/graphite2/ChangeLog +++ b/media-gfx/graphite2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/graphite2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.21 2012/02/16 08:24:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.22 2012/02/17 09:59:58 scarabeus Exp $ + + 17 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-1.1.0.ebuild, + +files/graphite2-1.1.0-fix-perl-includes.patch: + Add one more patch and bit more fun for perl. 16 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> files/graphite2-1.1.0-includes-libs-perl.patch: diff --git a/media-gfx/graphite2/files/graphite2-1.1.0-fix-perl-includes.patch b/media-gfx/graphite2/files/graphite2-1.1.0-fix-perl-includes.patch new file mode 100644 index 000000000000..ae7982872427 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-1.1.0-fix-perl-includes.patch @@ -0,0 +1,23 @@ +diff -r 1c3dbe83fabb -r b8f3904f93dc contrib/perl/lib/Text/Gr2.xs +--- a/contrib/perl/lib/Text/Gr2.xs ++++ b/contrib/perl/lib/Text/Gr2.xs +@@ -6,7 +6,7 @@ + + #include <graphite2/Font.h> + #include <graphite2/Segment.h> +-#include <graphite2/XmlLog.h> ++#include <graphite2/Log.h> + + typedef gr_face Text_Graphite2_Face; + typedef gr_font Text_Graphite2_Font; +diff -r 1c3dbe83fabb -r b8f3904f93dc src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -54,6 +54,7 @@ + ../include/graphite2/Font.h + ../include/graphite2/Segment.h + ../include/graphite2/Types.h ++ ../include/graphite2/Log.h + ) + + file(GLOB PRIVATE_HEADERS inc/*.h) diff --git a/media-gfx/graphite2/graphite2-1.1.0.ebuild b/media-gfx/graphite2/graphite2-1.1.0.ebuild index f39c117fb0eb..ec72abb3b8bd 100644 --- a/media-gfx/graphite2/graphite2-1.1.0.ebuild +++ b/media-gfx/graphite2/graphite2-1.1.0.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/media-gfx/graphite2/graphite2-1.1.0.ebuild,v 1.1 2012/02/15 12:09:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.0.ebuild,v 1.2 2012/02/17 09:59:58 scarabeus Exp $ EAPI=4 @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}/${PN}-fix_wrong_linker_opts.patch" "${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch" "${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch" + "${FILESDIR}/${P}-fix-perl-includes.patch" ) pkg_setup() { @@ -41,6 +42,9 @@ pkg_setup() { src_prepare() { base_src_prepare + # move the wrong file only in 1.1.0 release + mv src/inc/Log.h include/ + # fix perl linking if use perl; then _check_build_dir init |