summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <idlemoor@slackbuilds.org>2016-01-26 23:20:29 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-05 07:02:36 +0700
commitdcce4546b7e67b4fe1706bbd7b5d6dcd113519e8 (patch)
tree6bc3ad261f0cb60f202d2a2abd66e9ba4e68b05e
parent7482160bd04d3f726a0b299a6e42cf4f8685bd45 (diff)
downloadslackbuilds-dcce4546b7e67b4fe1706bbd7b5d6dcd113519e8.tar.gz
libraries/xulrunner: Patched to fix build failure.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--libraries/xulrunner/ftfntfmt.patch35
-rw-r--r--libraries/xulrunner/xulrunner.SlackBuild4
2 files changed, 39 insertions, 0 deletions
diff --git a/libraries/xulrunner/ftfntfmt.patch b/libraries/xulrunner/ftfntfmt.patch
new file mode 100644
index 0000000000..176360f8a5
--- /dev/null
+++ b/libraries/xulrunner/ftfntfmt.patch
@@ -0,0 +1,35 @@
+From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla@glandium.org>
+Date: Fri, 14 Aug 2015 08:50:38 +0900
+Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
+ <freetype/ftfntfmt.h>
+
+---
+ config/system-headers | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/system-headers b/config/system-headers
+index bee35da..ad1f88d 100644
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -450,16 +450,17 @@ foundation/base64.h
+ foundation/hexdump.h
+ #endif
+ fp.h
+ fpieee.h
+ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+--
+2.5.0.3.ge81d485
+
diff --git a/libraries/xulrunner/xulrunner.SlackBuild b/libraries/xulrunner/xulrunner.SlackBuild
index 05d8269516..5c4fe4273e 100644
--- a/libraries/xulrunner/xulrunner.SlackBuild
+++ b/libraries/xulrunner/xulrunner.SlackBuild
@@ -86,6 +86,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
+# https://bug1194520.bmoattachments.org/attachment.cgi?id=8647805
+patch -p1 < $CWD/ftfntfmt.patch
+
# Don't use --enable-system-cairo
# https://bugzilla.mozilla.org/show_bug.cgi?id=722975
OPTIONS="\