diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-12-28 11:37:40 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-12-28 11:37:40 +0000 |
| commit | f1560e8620cd85ae433dd798a25db7532b389868 (patch) | |
| tree | 3d62dd0dc68ea5bb4b91ed4416fe8378cdb1c2ef /media-gfx/graphite2 | |
| parent | Actually use the init scripts. (diff) | |
| download | gentoo-2-f1560e8620cd85ae433dd798a25db7532b389868.tar.gz gentoo-2-f1560e8620cd85ae433dd798a25db7532b389868.tar.bz2 gentoo-2-f1560e8620cd85ae433dd798a25db7532b389868.zip | |
Fixed and keyworded for ~x64-solaris
(Portage version: 2.2.01.21418-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'media-gfx/graphite2')
| -rw-r--r-- | media-gfx/graphite2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch | 22 | ||||
| -rw-r--r-- | media-gfx/graphite2/graphite2-1.2.0.ebuild | 5 |
3 files changed, 30 insertions, 3 deletions
diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog index f50cb4d002a0..e1f6551f4363 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.38 2012/12/24 04:04:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.39 2012/12/28 11:37:40 grobian Exp $ + + 28 Dec 2012; Fabian Groffen <grobian@gentoo.org> + +files/graphite2-1.2.0-solaris.patch, graphite2-1.2.0.ebuild: + Fixed and keyworded for ~x64-solaris 24 Dec 2012; Jeroen Roovers <jer@gentoo.org> graphite2-1.2.0.ebuild: Marked ~hppa (bug #447854). diff --git a/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch new file mode 100644 index 000000000000..c3bbe51e8695 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch @@ -0,0 +1,22 @@ +Bidi: undef conflicting constants + +On Solaris ES and CS are already defined, resulting in compilation +errors. Since we won't need Solaris' ones here, simply undef them. + +--- graphite2-1.2.0/src/Bidi.cpp ++++ graphite2-1.2.0/src/Bidi.cpp +@@ -30,6 +30,14 @@ + + using namespace graphite2; + ++/* Solaris' headers define these */ ++#ifdef ES ++# undef ES ++#endif ++#ifdef CS ++# undef CS ++#endif ++ + enum DirCode { // Hungarian: dirc + Unk = -1, + N = 0, // other neutrals (default) - ON diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild index 2ef9813ccece..c76fc59039ee 100644 --- a/media-gfx/graphite2/graphite2-1.2.0.ebuild +++ b/media-gfx/graphite2/graphite2-1.2.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.2.0.ebuild,v 1.5 2012/12/24 04:04:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.6 2012/12/28 11:37:40 grobian Exp $ EAPI=4 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="perl test" RDEPEND=" @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.1.0-includes-libs-perl.patch" "${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch" "${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch" + "${FILESDIR}/${PN}-1.2.0-solaris.patch" ) pkg_setup() { |