summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-12-31 17:06:07 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-12-31 17:06:07 +0000
commit0e00999a334fff7e676d48c73bc02dbd79f90f2d (patch)
treec5c1777f7dd241795cec1ec8aad9f222a9a6fed5 /www-client/seamonkey
parent[QA] Remove unused files. (diff)
downloadgentoo-2-0e00999a334fff7e676d48c73bc02dbd79f90f2d.tar.gz
gentoo-2-0e00999a334fff7e676d48c73bc02dbd79f90f2d.tar.bz2
gentoo-2-0e00999a334fff7e676d48c73bc02dbd79f90f2d.zip
Fixed compilation with >=freetype-2.5.1
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'www-client/seamonkey')
-rw-r--r--www-client/seamonkey/ChangeLog6
-rw-r--r--www-client/seamonkey/files/seamonkey-freetype251.patch75
-rw-r--r--www-client/seamonkey/seamonkey-2.22.1.ebuild3
3 files changed, 82 insertions, 2 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 753e180bb1bd..920c526923d7 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/seamonkey
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.474 2013/12/17 11:30:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.475 2013/12/31 17:06:07 polynomial-c Exp $
+
+ 31 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.22.1.ebuild,
+ +files/seamonkey-freetype251.patch:
+ Fixed compilation with >=freetype-2.5.1
17 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.23.ebuild:
Update to latest patchset.
diff --git a/www-client/seamonkey/files/seamonkey-freetype251.patch b/www-client/seamonkey/files/seamonkey-freetype251.patch
new file mode 100644
index 000000000000..62f35fdd1671
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-freetype251.patch
@@ -0,0 +1,75 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1386020061 -32400
+# Node ID d6f47a333fe1827bbbfdbce7b107d07b7af46bd3
+# Parent f047d2032ad765859e40be7dc6197957207f1f0e
+Bug 944454 - Wrap non-prefixed freetype headers from newer freetype versions. r=ted
+
+diff --git a/config/system-headers b/config/system-headers
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- a/js/src/config/system-headers
++++ b/js/src/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
+
diff --git a/www-client/seamonkey/seamonkey-2.22.1.ebuild b/www-client/seamonkey/seamonkey-2.22.1.ebuild
index 5a3c0716c238..921aa44565ca 100644
--- a/www-client/seamonkey/seamonkey-2.22.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.22.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.22.1.ebuild,v 1.3 2013/12/01 12:19:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.22.1.ebuild,v 1.4 2013/12/31 17:06:07 polynomial-c Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -129,6 +129,7 @@ src_prepare() {
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
+ epatch "${FILESDIR}/${PN}-freetype251.patch"
popd &>/dev/null || die
# drop -Wl,--build-id from LDFLAGS, bug #465466