On Tue, 13 Oct 2015, Christian Weisgerber wrote: > David Coppa: > > > New freetype version, new header file layout :( :( > > [...] > > Obviously, I'm expecting some fallouts from a bulk build with this... > > The only initial fallout from this is devel/xulrunner/24. > > However, without xulrunner ~750 further packages aren't built, so > we need a fix for xulrunner before we can see what the overall > breakage is.
diff below. Cheers! David Index: Makefile =================================================================== RCS file: /cvs/ports/devel/xulrunner/24/Makefile,v retrieving revision 1.23 diff -u -p -u -p -r1.23 Makefile --- Makefile 24 Sep 2015 20:19:15 -0000 1.23 +++ Makefile 14 Oct 2015 07:25:24 -0000 @@ -7,8 +7,8 @@ MOZILLA_PROJECT = xulrunner MOZILLA_DIST = firefox PKGSPEC-devel = xulrunner-devel->=24.0,<31.0 PKGSPEC-main = xulrunner->=24.0,<31.0 -REVISION-main = 5 -REVISION-devel = 5 +REVISION-main = 6 +REVISION-devel = 6 SO_VERSION = 0.0 MOZILLA_LIBS = mozgnome mozalloc xul Index: patches/patch-config_system-headers =================================================================== RCS file: /cvs/ports/devel/xulrunner/24/patches/patch-config_system-headers,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-config_system-headers --- patches/patch-config_system-headers 30 Jun 2015 07:08:28 -0000 1.4 +++ patches/patch-config_system-headers 14 Oct 2015 07:25:24 -0000 @@ -1,15 +1,15 @@ $OpenBSD: patch-config_system-headers,v 1.4 2015/06/30 07:08:28 dcoppa Exp $ -Fix building with freetype-2.6 or later -https://hg.mozilla.org/mozilla-central/rev/afd840d66e6a +Fix building with freetype-2.6.1 +https://hg.mozilla.org/mozilla-central/rev/af40750720b5 --- config/system-headers.orig Mon Jun 29 16:25:46 2015 +++ config/system-headers Mon Jun 29 16:28:26 2015 -@@ -415,6 +415,7 @@ freetype/ftbitmap.h - freetype/ftxf86.h - freetype.h - ftcache.h -+ftfntfmt.h - ftglyph.h - ftsynth.h - ftoutln.h +@@ -402,6 +402,7 @@ frame/log.h + frame/req.h + freetype/freetype.h + freetype/ftcache.h ++freetype/ftfntfmt.h + freetype/ftglyph.h + freetype/ftsynth.h + freetype/ftoutln.h Index: patches/patch-js_src_config_system-headers =================================================================== RCS file: /cvs/ports/devel/xulrunner/24/patches/patch-js_src_config_system-headers,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-js_src_config_system-headers --- patches/patch-js_src_config_system-headers 30 Jun 2015 07:08:28 -0000 1.4 +++ patches/patch-js_src_config_system-headers 14 Oct 2015 07:25:24 -0000 @@ -1,15 +1,15 @@ $OpenBSD: patch-js_src_config_system-headers,v 1.4 2015/06/30 07:08:28 dcoppa Exp $ -Fix building with freetype-2.6 or later -https://hg.mozilla.org/mozilla-central/rev/afd840d66e6a +Fix building with freetype-2.6.1 +https://hg.mozilla.org/mozilla-central/rev/af40750720b5 --- js/src/config/system-headers.orig Mon Jun 29 16:35:12 2015 +++ js/src/config/system-headers Mon Jun 29 16:35:14 2015 -@@ -415,6 +415,7 @@ freetype/ftbitmap.h - freetype/ftxf86.h - freetype.h - ftcache.h -+ftfntfmt.h - ftglyph.h - ftsynth.h - ftoutln.h +@@ -402,6 +402,7 @@ frame/log.h + frame/req.h + freetype/freetype.h + freetype/ftcache.h ++freetype/ftfntfmt.h + freetype/ftglyph.h + freetype/ftsynth.h + freetype/ftoutln.h
