Date: Sunday, November 1, 2015 @ 14:12:48 Author: foutrelis Revision: 145440
Fix build with FreeType 2.6.1 Added: xulrunner/trunk/freetype261.patch Modified: xulrunner/trunk/PKGBUILD Deleted: xulrunner/trunk/freetype-headers.patch ------------------------+ PKGBUILD | 5 +++ freetype-headers.patch | 66 ----------------------------------------------- freetype261.patch | 31 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 66 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-11-01 13:04:56 UTC (rev 145439) +++ PKGBUILD 2015-11-01 13:12:48 UTC (rev 145440) @@ -14,6 +14,7 @@ url="http://wiki.mozilla.org/XUL:Xul_Runner"; source=(https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.xz mozconfig + freetype261.patch mozilla-pkgconfig.patch shared-libs.patch) options=('!emptydirs' '!makeflags' 'staticlibs') @@ -20,6 +21,7 @@ replaces=('xulrunner-oss') sha256sums=('f7abb2e2989779305ab1f80d30caf9fc55d96c7e66d1394e2cc9639442e2b864' 'df0e663e7f9246b84936882e564270fac541c6bb39450b759abe686e5c27a052' + '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6' '1aa9ebe67542a2b8c28905d070829ada5b29438c6a7961f2b0cdd6b92d8b9f5c' '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40') @@ -27,6 +29,9 @@ cd "$srcdir/mozilla-release" cp "$srcdir/mozconfig" .mozconfig + # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520 + patch -Np1 -i ../freetype261.patch + # fix libdir/sdkdir - fedora patch -Np1 -i ../mozilla-pkgconfig.patch patch -Np1 -i ../shared-libs.patch Deleted: freetype-headers.patch =================================================================== --- freetype-headers.patch 2015-11-01 13:04:56 UTC (rev 145439) +++ freetype-headers.patch 2015-11-01 13:12:48 UTC (rev 145440) @@ -1,66 +0,0 @@ -diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers ---- mozilla-release.orig/config/system-headers -+++ mozilla-release/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 -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers ---- mozilla-release.orig/js/src/config/system-headers -+++ mozilla-release/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 Added: freetype261.patch =================================================================== --- freetype261.patch (rev 0) +++ freetype261.patch 2015-11-01 13:12:48 UTC (rev 145440) @@ -0,0 +1,31 @@ + +# HG changeset patch +# User Mike Hommey <mh+mozi...@glandium.org> +# Date 1439509838 -32400 +# Node ID af40750720b59cb7af58c32f4f3325d6e03bbbc4 +# Parent e578cc44a96a2a953e75e295b0d8954f467d5cff +Bug 1194520 - Add a system header wrapper for <freetype/ftfntfmt.h>. r=mshal + + +diff --git a/config/system-headers b/config/system-headers +--- 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 +
