aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice.org-1.1-devel/files/moz-patch
blob: 0d4947d1c5a0632d16ada860f440f561cbbd81ff (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
#iZ 28398
#iZ 11424

http://qa.openoffice.org/issues/show_bug.cgi?id=28398
http://qa.openoffice.org/issues/show_bug.cgi?id=11424

disable freetype2 support since build broken and
this functionality is not used at all.

--- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004
+++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004
@@ -269,8 +269,8 @@
    +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
    +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
 .ELSE
-   +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
-   +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
+   +$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR)
+   +$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR)
 .ENDIF
 
 .IF "$(GUI)"=="UNX"

--- moz/mozilla-source-1.0.patch.org    Tue Feb 10 19:44:34 2004
+++ moz/mozilla-source-1.0.patch    Sat Mar 19 12:51:35 2005
@@ -4471,14 +4471,17 @@
      return NS_OK;
  }
 
---- miss/build/mozilla/.mozconfig  Tue Jul 22 21:52:27 2003
+--- misc/build/mozilla/.mozconfig  Tue Jul 22 21:52:27 2003
 +++ misc/build/mozilla/.mozconfig  Mon Jul 28 15:07:20 2003
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,11 @@
 +ac_add_options --disable-tests
 +ac_add_options --disable-xprint
 +ac_add_options --without-system-zlib
 +ac_add_options --enable-ldap
 +ac_add_options --disable-debug
++ac_add_options --disable-freetype2
++ac_add_options --enable-default-toolkit=xlib
++ac_add_options --disable-pedantic
 +ac_add_options --enable-optimize
 +ac_add_options --enable-crypto
 +ac_add_options --enable-strip
@@ -4497,3 +4500,19 @@
  endif
  
  # Windows equivalents
+
+--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Wed Apr 10 12:38:31 2002
++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Sat Oct 29 12:34:19 2005
+@@ -71,10 +71,10 @@
+  * parens, e.g. XPIDL_WARNING((foo, bar, "sil"))
+  *
+  * Probably best removed when we leave 6.5.  */
+-#define XPIDL_WARNING(x) IDL_tree_warning##x
++#define XPIDL_WARNING(x) IDL_tree_warning x
+ #else
+ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...);
+-#define XPIDL_WARNING(x) xpidl_tree_warning##x
++#define XPIDL_WARNING(x) xpidl_tree_warning x
+ #endif
+ 
+ /*
--- moz/mozilla-source-1.0.patch~   Sun Sep 10 09:28:29 2006
+++ moz/mozilla-source-1.0.patch    Sun Sep 10 12:01:05 2006
@@ -4516,3 +4516,49 @@
  #endif
  
  /*
+*** misc/mozilla/configure Tue May 28 04:29:00 2002
+--- misc/build/mozilla/configure   Sun Sep 10 11:56:33 2006
+***************
+*** 6589,6594 ****
+--- 6589,6596 ----
+  case $target in
+  *-hpux11.*)
+   ;;
++ *-freebsd*)
++  ;;
+  *)
+   echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
+  echo "configure:6595: checking for gethostbyname_r in -lc_r" >&5
+*** misc/mozilla/configure.in  Tue May 28 04:29:12 2002
+--- misc/build/mozilla/configure.in    Sun Sep 10 11:56:18 2006
+***************
+*** 1606,1611 ****
+--- 1606,1613 ----
+  case $target in
+  *-hpux11.*)
+   ;;
++ *-freebsd*)
++  ;;
+  *)
+   AC_CHECK_LIB(c_r, gethostbyname_r)
+   ;;
+*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Apr 10 12:17:35 2002
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c   Sun Sep 10 11:55:27 2006
+***************
+*** 105,111 ****
+  #define _PR_HAVE_GETPROTO_R_INT
+  #endif
+  
+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+  #define _PR_HAVE_GETPROTO_R
+  #define _PR_HAVE_5_ARG_GETPROTO_R
+  #endif
+--- 105,112 ----
+  #define _PR_HAVE_GETPROTO_R_INT
+  #endif
+  
+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) ||  \
+!     (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+  #define _PR_HAVE_GETPROTO_R
+  #define _PR_HAVE_5_ARG_GETPROTO_R
+  #endif