View | Details | Raw Unified | Return to bug 185886
Collapse All | Expand All

(-)files/patch-moz-freetype (+73 lines)
Line 0 Link Here
1 
--- moz/makefile.mk.orig	2014-01-19 01:07:07.855312217 +0000
2 
+++ moz/makefile.mk	2014-01-19 01:52:13.738105035 +0000
3 
@@ -99,7 +99,8 @@
4 
     patches/respect_disable_pango.patch \
5 
     patches/arm_build_fix.patch \
6 
     patches/link_fontconfig.patch \
7 
-    patches/brokenmakefile.patch
8 
+    patches/brokenmakefile.patch \
9 
+    patches/freetype-2.5.2.patch
10
11 
 .IF "$(OS)"=="LINUX"
12 
 PATCH_FILES+=patches/nss_linux.patch
13 
--- moz/patches/freetype-2.5.2.patch.orig	2014-01-19 02:08:44.972045426 +0000
14 
+++ moz/patches/freetype-2.5.2.patch	2014-01-19 01:50:19.634112115 +0000
15 
@@ -0,0 +1,58 @@
16 
+--- misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp.orig	2014-01-19 01:36:54.695173876 +0000
17 
++++ misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp	2014-01-19 01:38:33.919160907 +0000
18 
+@@ -67,8 +67,8 @@
19 
+ #include "nsFontConfigUtils.h"
20 
+
21 
+ #include <gdk/gdkx.h>
22 
+-#include <freetype/tttables.h>
23 
+-#include <freetype/freetype.h>
24 
++#include <freetype2/tttables.h>
25 
++#include <freetype2/freetype.h>
26 
+
27 
+ #define FORCE_PR_LOG
28 
+ #include "prlog.h"
29 
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2014-01-19 01:37:10.706181045 +0000
30 
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2014-01-19 01:38:52.345183245 +0000
31 
+@@ -58,7 +58,7 @@
32 
+ #include <fontconfig/fontconfig.h>
33 
+ #include <gdk/gdk.h>
34 
+ #include <gdk/gdkx.h>
35 
+-#include <freetype/tttables.h>
36 
++#include <freetype2/tttables.h>
37 
+
38 
+ #include "mozilla-decoder.h"
39 
+
40 
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2014-01-19 01:37:20.985169675 +0000
41 
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2014-01-19 01:39:00.273161078 +0000
42 
+@@ -67,8 +67,8 @@
43 
+ #include "nsFontConfigUtils.h"
44 
+
45 
+ #include <gdk/gdkx.h>
46 
+-#include <freetype/tttables.h>
47 
+-#include <freetype/freetype.h>
48 
++#include <freetype2/tttables.h>
49 
++#include <freetype2/freetype.h>
50 
+
51 
+ #define FORCE_PR_LOG
52 
+ #include "prlog.h"
53 
+--- misc/build/mozilla/config/system-headers.orig	2014-01-19 01:48:32.986127183 +0000
54 
++++ misc/build/mozilla/config/system-headers	2014-01-19 01:49:12.081124339 +0000
55 
+@@ -193,12 +193,12 @@
56 
+ fpieee.h
57 
+ frame/log.h
58 
+ frame/req.h
59 
+-freetype/freetype.h
60 
+-freetype/ftcache.h
61 
+-freetype/ftglyph.h
62 
+-freetype/ftoutln.h
63 
+-freetype/ttnameid.h
64 
+-freetype/tttables.h
65 
++freetype2/freetype.h
66 
++freetype2/ftcache.h
67 
++freetype2/ftglyph.h
68 
++freetype2/ftoutln.h
69 
++freetype2/ttnameid.h
70 
++freetype2/tttables.h
71 
+ fribidi/fribidi.h
72 
+ FSp_fopen.h
73 
+ fstream.h
(-)files/patch-nss (+28 lines)
Line 0 Link Here
1 
--- nss/makefile.mk.orig	2013-12-10 16:12:48.903023896 +0000
2 
+++ nss/makefile.mk	2013-12-10 16:16:12.910996825 +0000
3 
@@ -71,6 +71,7 @@
4 
 USE_64:=1
5 
 .EXPORT : USE_64
6 
 .ENDIF			# "$(CPU)"=="X"
7 
+PATCH_FILES+=nss_freebsd.patch
8 
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
9
10 
 .IF "$(OS)"=="MACOSX"
11 
--- nss/nss_freebsd.patch.orig	2013-12-10 16:15:49.120991795 +0000
12 
+++ nss/nss_freebsd.patch	2013-12-10 16:31:17.356953373 +0000
13 
@@ -0,0 +1,15 @@
14 
+--- misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk.orig	2009-08-22 07:33:09.000000000 +0200
15 
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk	2010-03-28 23:01:33.000000000 +0200
16 
+@@ -37,9 +37,9 @@
17 
+
18 
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
19 
+
20 
+-DEFAULT_COMPILER	= gcc
21 
+-CC			= gcc
22 
+-CCC			= g++
23 
++DEFAULT_COMPILER	= $(CC)
24 
++CC			?= gcc
25 
++CCC			= $(CXX)
26 
+ RANLIB			= ranlib
27 
+
28 
+ CPU_ARCH		= $(OS_TEST)
(-)files/patch-vcl::source::glyphs::graphite_adaptors.cxx (+11 lines)
Line 0 Link Here
1 
--- vcl/source/glyphs/graphite_adaptors.cxx.orig	2014-01-19 00:20:15.734490860 +0000
2 
+++ vcl/source/glyphs/graphite_adaptors.cxx	2014-01-19 00:20:35.462483753 +0000
3 
@@ -45,7 +45,7 @@
4
5 
 #include <salgdi.hxx>
6
7 
-#include <freetype/ftsynth.h>
8 
+#include <freetype2/ftsynth.h>
9
10 
 // Module
11 
 #include "gcach_ftyp.hxx"

Return to bug 185886