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

(-)editors/openoffice-4/files/patch-nss-gcc46 (+27 lines)
Line 0 Link Here
1
--- nss/makefile.mk.orig	2013-08-13 11:46:06.000000000 +0000
2
+++ nss/makefile.mk	2014-01-01 18:13:26.000000000 +0000
3
@@ -44,6 +44,10 @@
4
 TARFILE_ROOTDIR=nss-3.12.6
5
 PATCH_FILES=nss.patch
6
 
7
+.IF "$(OS)"=="FREEBSD"
8
+PATCH_FILES+=nss_freebsd.patch
9
+.ENDIF # "$(OS)"=="FREEBSD"
10
+
11
 .IF "$(OS)"=="MACOSX"
12
 MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
13
 .EXPORT : MACOS_SDK_DIR
14
--- nss/nss_freebsd.patch.orig	1970-01-01 00:00:00.000000000 +0000
15
+++ nss/nss_freebsd.patch	2014-01-01 18:08:20.000000000 +0000
16
@@ -0,0 +1,11 @@
17
+--- misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk.orig	2009-08-22 05:33:09.000000000 +0000
18
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk	2014-01-01 13:47:48.000000000 +0000
19
+@@ -38,7 +38,7 @@
20
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
21
+ 
22
+ DEFAULT_COMPILER	= gcc
23
+-CC			= gcc
24
++#CC			= gcc
25
+ CCC			= g++
26
+ RANLIB			= ranlib
27
+ 
(-)editors/openoffice-4/files/patch-vcl_source_glyphs_graphite_adaptors.cxx (+11 lines)
Line 0 Link Here
1
--- vcl/source/glyphs/graphite_adaptors.cxx.orig	2013-08-13 11:45:43.000000000 +0000
2
+++ vcl/source/glyphs/graphite_adaptors.cxx	2013-12-31 16:39:41.000000000 +0000
3
@@ -45,7 +45,7 @@
4
 
5
 #include <salgdi.hxx>
6
 
7
-#include <freetype/ftsynth.h>
8
+#include <ftsynth.h>
9
 
10
 // Module
11
 #include "gcach_ftyp.hxx"
(-)editors/openoffice-4/files/patch-moz-freetype_header_relocation (+73 lines)
Line 0 Link Here
1
--- moz/makefile.mk.orig	2013-08-13 11:49:32.000000000 +0000
2
+++ moz/makefile.mk	2014-01-01 20:09:17.000000000 +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_header_relocation.patch
10
 
11
 .IF "$(OS)"=="LINUX"
12
 PATCH_FILES+=patches/nss_linux.patch
13
--- moz/patches/freetype_header_relocation.patch.orig	1970-01-01 00:00:00.000000000 +0000
14
+++ moz/patches/freetype_header_relocation.patch	2014-01-01 20:50:11.000000000 +0000
15
@@ -0,0 +1,58 @@
16
+--- misc/build/mozilla/config/system-headers.orig	2007-11-19 21:36:18.000000000 +0100
17
++++ misc/build/mozilla/config/system-headers	2014-01-01 20:47:56.000000000 +0100
18
+@@ -193,12 +193,12 @@
19
+ fpieee.h
20
+ frame/log.h
21
+ frame/req.h
22
+-freetype/freetype.h
23
+-freetype/ftcache.h
24
+-freetype/ftglyph.h
25
+-freetype/ftoutln.h
26
+-freetype/ttnameid.h
27
+-freetype/tttables.h
28
++freetype.h
29
++ftcache.h
30
++ftglyph.h
31
++ftoutln.h
32
++ttnameid.h
33
++tttables.h
34
+ fribidi/fribidi.h
35
+ FSp_fopen.h
36
+ fstream.h
37
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2008-01-29 19:31:08.000000000 +0000
38
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2014-01-01 20:43:42.000000000 +0000
39
+@@ -67,8 +67,8 @@
40
+ #include "nsFontConfigUtils.h"
41
+ 
42
+ #include <gdk/gdkx.h>
43
+-#include <freetype/tttables.h>
44
+-#include <freetype/freetype.h>
45
++#include <tttables.h>
46
++#include <freetype.h>
47
+ 
48
+ #define FORCE_PR_LOG
49
+ #include "prlog.h"
50
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2008-01-29 19:31:08.000000000 +0000
51
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2014-01-01 20:44:06.000000000 +0000
52
+@@ -58,7 +58,7 @@
53
+ #include <fontconfig/fontconfig.h>
54
+ #include <gdk/gdk.h>
55
+ #include <gdk/gdkx.h>
56
+-#include <freetype/tttables.h>
57
++#include <tttables.h>
58
+ 
59
+ #include "mozilla-decoder.h"
60
+ 
61
+--- misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp.orig	2008-01-29 19:31:08.000000000 +0000
62
++++ misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp	2014-01-01 20:44:34.000000000 +0000
63
+@@ -67,8 +67,8 @@
64
+ #include "nsFontConfigUtils.h"
65
+ 
66
+ #include <gdk/gdkx.h>
67
+-#include <freetype/tttables.h>
68
+-#include <freetype/freetype.h>
69
++#include <tttables.h>
70
++#include <freetype.h>
71
+ 
72
+ #define FORCE_PR_LOG
73
+ #include "prlog.h"

Return to bug 185401