/[fink]/10.3/main/finkinfo/net/firefox-qt.patch
ViewVC logotype

Contents of /10.3/main/finkinfo/net/firefox-qt.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1.1.1 - (show annotations) (download) (vendor branch)
Thu Aug 31 16:24:10 2006 UTC (17 years, 8 months ago) by nieder
Branch: MAIN, IMPORT
CVS Tags: baseline-1_1_1, HEAD
Changes since 1.1: +0 -0 lines
Imported using TkCVS

1 diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
2 --- mozilla-orig/.mozconfig 1969-12-31 18:00:00.000000000 -0600
3 +++ mozilla/.mozconfig 2005-08-26 15:49:05.000000000 -0500
4 @@ -0,0 +1,42 @@
5 +# sh
6 +# Build configuration script
7 +#
8 +# See http://www.mozilla.org/build/unix.html for build instructions.
9 +#
10 +
11 +. $topsrcdir/browser/config/mozconfig
12 +
13 +# Options for client.mk.
14 +# environment variables to set
15 +#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
16 +
17 +# Options for 'configure' (same as command-line options).
18 +#ac_add_options --enable-official-branding
19 +ac_add_options --enable-default-toolkit=qt
20 +ac_add_options --enable-xft
21 +#ac_add_options --disable-xft
22 +#ac_add_options --enable-freetype2
23 +ac_add_options --disable-freetype2
24 +ac_add_options --enable-postscript
25 +ac_add_options --enable-xinerama
26 +ac_add_options --with-pthreads
27 +ac_add_options --disable-gnomevfs
28 +ac_add_options --disable-gnomeui
29 +ac_add_options --enable-extensions=default,-gnomevfs
30 +ac_add_options --enable-canvas
31 +ac_add_options --enable-svg
32 +
33 +# prebinding disabled or otherwise don't get binary
34 +ac_add_options --disable-prebinding
35 +ac_add_options --disable-debug
36 +ac_add_options --disable-tests
37 +ac_add_options --enable-strip
38 +ac_add_options --enable-optimize='-O2'
39 +ac_add_options --enable-macos-target=10.3
40 +ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox-qt1.5
41 +ac_add_options --with-system-jpeg=@PREFIX@
42 +ac_add_options --with-system-png=@PREFIX@
43 +ac_add_options --with-system-zlib=/usr
44 +
45 +#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype219
46 +#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype219
47 diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in
48 --- mozilla-orig/browser/components/build/Makefile.in 2005-08-25 09:32:44.000000000 -0500
49 +++ mozilla/browser/components/build/Makefile.in 2005-08-26 15:49:05.000000000 -0500
50 @@ -74,6 +74,12 @@
51 $(MOZ_COMPONENT_LIBS) \
52 $(NULL)
53
54 +# fix for building on Mac/X11 (bug 257773)
55 +# dependencies for gkgfx
56 +ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
57 +EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
58 +endif
59 +
60 # Need to link to CoreFoundation for Mac Migrators (PList reading code)
61 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
62 EXTRA_DSO_LDOPTS += \
63 diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
64 --- mozilla-orig/browser/locales/en-US/profile/bookmarks.html 2005-08-25 09:32:44.000000000 -0500
65 +++ mozilla/browser/locales/en-US/profile/bookmarks.html 2005-08-26 15:49:05.000000000 -0500
66 @@ -12,6 +12,7 @@
67 <DL><p>
68 <DT><A HREF="http://www.mozilla.org/products/firefox/central.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A>
69 <DT><A HREF="http://fxfeeds.mozilla.org/" LAST_MODIFIED="1094668003" FEEDURL="http://fxfeeds.mozilla.org/rss20.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
70 + <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>
71 </DL><p>
72 <HR>
73 <DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
74 diff -ruN mozilla-orig/browser/themes/winstripe/browser/preferences/preferences.css mozilla/browser/themes/winstripe/browser/preferences/preferences.css
75 --- mozilla-orig/browser/themes/winstripe/browser/preferences/preferences.css 2005-08-25 09:32:44.000000000 -0500
76 +++ mozilla/browser/themes/winstripe/browser/preferences/preferences.css 2005-08-26 15:49:05.000000000 -0500
77 @@ -89,6 +89,7 @@
78 padding-bottom: 3px;
79 -moz-padding-start: 4px;
80 -moz-padding-end: 2px;
81 + background-color: transparent;
82 }
83
84 /* File Field Widget */
85 diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
86 --- mozilla-orig/config/autoconf.mk.in 2005-08-25 09:32:44.000000000 -0500
87 +++ mozilla/config/autoconf.mk.in 2005-08-26 15:49:05.000000000 -0500
88 @@ -54,14 +54,14 @@
89 prefix = @prefix@
90 exec_prefix = @exec_prefix@
91 bindir = @bindir@
92 -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
93 +includedir = @includedir@/$(MOZ_APP_NAME)-qt1.5
94 libdir = @libdir@
95 datadir = @datadir@
96 mandir = @mandir@
97 -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
98 +idldir = @datadir@/idl/$(MOZ_APP_NAME)-qt1.5
99
100 -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
101 -mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
102 +mozappdir = $(libdir)/$(MOZ_APP_NAME)-qt1.5
103 +mredir = $(libdir)/mre/mre-qt1.5
104 mrelibdir = $(mredir)/lib
105
106 DIST = $(DEPTH)/dist
107 diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
108 --- mozilla-orig/config/config.mk 2005-08-25 09:32:44.000000000 -0500
109 +++ mozilla/config/config.mk 2005-08-26 15:49:05.000000000 -0500
110 @@ -678,7 +678,7 @@
111 ifeq ($(OS_ARCH),Darwin)
112 ifdef USE_PREBINDING
113 export LD_PREBIND=1
114 -export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
115 +export LD_PREBIND_ALLOW_OVERLAP=1
116 endif # USE_PREBINDING
117 PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
118 PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build
119 diff -ruN mozilla-orig/configure mozilla/configure
120 --- mozilla-orig/configure 2005-08-26 15:02:21.000000000 -0500
121 +++ mozilla/configure 2005-08-26 15:49:05.000000000 -0500
122 @@ -5413,7 +5413,7 @@
123 ;;
124
125 *-darwin*)
126 - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
127 + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
128 HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
129 HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
130 MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
131 @@ -5698,8 +5698,8 @@
132
133 *-darwin*)
134 _PEDANTIC=
135 - CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
136 - CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
137 + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
138 + CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
139 DLL_SUFFIX=".dylib"
140 DSO_LDOPTS=''
141 STRIP="$STRIP -x -S"
142 diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop
143 --- mozilla-orig/fink/applications/firefox.desktop 1969-12-31 18:00:00.000000000 -0600
144 +++ mozilla/fink/applications/firefox.desktop 2005-08-26 15:49:05.000000000 -0500
145 @@ -0,0 +1,10 @@
146 +[Desktop Entry]
147 +Encoding=UTF-8
148 +Name=Firefox Web Browser
149 +Comment=Browse the World Wide Web
150 +Exec=firefox
151 +Icon=firefox.xpm
152 +Terminal=false
153 +Type=Application
154 +Categories=Application;Network
155 +StartupNotify=true
156 diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
157 --- mozilla-orig/fink/prefs.js 1969-12-31 18:00:00.000000000 -0600
158 +++ mozilla/fink/prefs.js 2005-08-26 15:49:05.000000000 -0500
159 @@ -0,0 +1,27 @@
160 +pref("general.useragent.extra.vendorComment", "Fink Community Edition");
161 +
162 +// Give a default font set that can do BOLD
163 +pref("font.name.serif.x-western", "Bitstream Vera Serif");
164 +pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
165 +pref("font.size.variable.x-western", 15);
166 +
167 +// TrueType
168 +//pref("font.FreeType2.enable", true);
169 +//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype219/lib/libfreetype.6.dylib");
170 +//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
171 +//pref("font.freetype2.autohinted", true);
172 +//pref("font.freetype2.unhinted", true);
173 +//pref("font.antialias.min", 10);
174 +//pref("font.embedded_bitmaps.max", 1000000);
175 +//pref("font.scale.tt_bitmap.dark_text.min", 64);
176 +//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
177 +//pref("font.directory.truetype.1", "/Library/Fonts");
178 +//pref("font.directory.truetype.2", "/Network/Library/Fonts");
179 +//pref("font.directory.truetype.3", "/System/Library/Fonts");
180 +//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
181 +//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
182 +
183 +// AA with Bitmap scaling.
184 +//pref("font.scale.aa_bitmap.enable", true);
185 +//pref("font.scale.aa_bitmap.always", false);
186 +//pref("font.scale.aa_bitmap.min", 6);
187 diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
188 --- mozilla-orig/modules/libpref/src/nsPrefService.cpp 2005-08-25 09:32:44.000000000 -0500
189 +++ mozilla/modules/libpref/src/nsPrefService.cpp 2005-08-26 15:49:06.000000000 -0500
190 @@ -748,6 +748,7 @@
191 #elif defined(XP_BEOS)
192 "beos.js"
193 #endif
194 + , "fink.js"
195 };
196
197 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
198 diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
199 --- mozilla-orig/nsprpub/configure 2005-08-25 09:32:44.000000000 -0500
200 +++ mozilla/nsprpub/configure 2005-08-26 15:49:06.000000000 -0500
201 @@ -3301,9 +3301,6 @@
202
203 # Add Mac OS X support for loading CFM & CFBundle plugins
204 if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
205 - cat >> confdefs.h <<\EOF
206 -#define XP_MACOSX 1
207 -EOF
208
209 OS_TARGET=MacOSX
210
211 @@ -4904,8 +4901,6 @@
212
213
214 case $target in
215 -*-darwin*)
216 - ;;
217 *)
218 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
219 echo "configure:4912: checking for dlopen in -ldl" >&5
220 diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
221 --- mozilla-orig/nsprpub/pr/include/md/_darwin.h 2005-08-25 09:32:44.000000000 -0500
222 +++ mozilla/nsprpub/pr/include/md/_darwin.h 2005-08-26 15:49:06.000000000 -0500
223 @@ -62,7 +62,8 @@
224
225 #undef HAVE_STACK_GROWING_UP
226 #define HAVE_DLL
227 -#define USE_MACH_DYLD
228 +/* #define USE_MACH_DYLD */
229 +#define USE_DLFCN
230 #define _PR_HAVE_SOCKADDR_LEN
231 #define _PR_STAT_HAS_ST_ATIMESPEC
232 #define _PR_NO_LARGE_FILES
233 diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
234 --- mozilla-orig/nsprpub/pr/src/Makefile.in 2005-08-25 09:32:44.000000000 -0500
235 +++ mozilla/nsprpub/pr/src/Makefile.in 2005-08-26 15:49:06.000000000 -0500
236 @@ -204,9 +204,9 @@
237 endif
238 endif
239
240 -ifeq ($(OS_TARGET),MacOSX)
241 -OS_LIBS = -framework CoreServices -framework CoreFoundation
242 -endif
243 +#ifeq ($(OS_TARGET),MacOSX)
244 +#OS_LIBS = -framework CoreServices -framework CoreFoundation
245 +#endif
246
247 ifdef GC_LEAK_DETECTOR
248 EXTRA_LIBS = -L$(dist_libdir) -lboehm
249 diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
250 --- mozilla-orig/nsprpub/pr/src/linking/prlink.c 2005-08-25 09:32:44.000000000 -0500
251 +++ mozilla/nsprpub/pr/src/linking/prlink.c 2005-08-26 15:49:06.000000000 -0500
252 @@ -154,7 +154,8 @@
253 #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
254 || defined(WIN16) || defined(XP_OS2) \
255 || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
256 -#define NEED_LEADING_UNDERSCORE
257 +/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
258 +/* #define NEED_LEADING_UNDERSCORE */
259 #endif
260
261 /************************************************************************/
262 --- mozilla-orig/gfx/src/qt/malloc.h 2005-08-25 09:32:44.000000000 -0500
263 +++ mozilla/gfx/src/qt/malloc.h 2005-08-26 15:49:06.000000000 -0500
264 @@ -0,0 +1,67 @@
265 +/*
266 + * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
267 + *
268 + * @APPLE_LICENSE_HEADER_START@
269 + *
270 + * The contents of this file constitute Original Code as defined in and
271 + * are subject to the Apple Public Source License Version 1.1 (the
272 + * "License"). You may not use this file except in compliance with the
273 + * License. Please obtain a copy of the License at
274 + * http://www.apple.com/publicsource and read it before using this file.
275 + *
276 + * This Original Code and all software distributed under the License are
277 + * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
278 + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
279 + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
280 + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
281 + * License for the specific language governing rights and limitations
282 + * under the License.
283 + *
284 + * @APPLE_LICENSE_HEADER_END@
285 + */
286 +/* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
287 +/* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
288 +/*
289 + * Copyright (c) 1987, 1993
290 + * The Regents of the University of California. All rights reserved.
291 + *
292 + * Redistribution and use in source and binary forms, with or without
293 + * modification, are permitted provided that the following conditions
294 + * are met:
295 + * 1. Redistributions of source code must retain the above copyright
296 + * notice, this list of conditions and the following disclaimer.
297 + * 2. Redistributions in binary form must reproduce the above copyright
298 + * notice, this list of conditions and the following disclaimer in the
299 + * documentation and/or other materials provided with the distribution.
300 + * 3. All advertising materials mentioning features or use of this software
301 + * must display the following acknowledgement:
302 + * This product includes software developed by the University of
303 + * California, Berkeley and its contributors.
304 + * 4. Neither the name of the University nor the names of its contributors
305 + * may be used to endorse or promote products derived from this software
306 + * without specific prior written permission.
307 + *
308 + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
309 + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
310 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
311 + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
312 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
313 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
314 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
315 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
316 + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
317 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
318 + * SUCH DAMAGE.
319 + *
320 + * @(#)malloc.h 8.5 (Berkeley) 5/3/95
321 + */
322 +
323 +#ifndef _SYS_MALLOC_H_
324 +#define _SYS_MALLOC_H_+
325 +
326 +#include <sys/appleapiopts.h>
327 +
328 +
329 +
330 +#endif /* _SYS_MALLOC_H_ */
331 +

  ViewVC Help
Powered by ViewVC 1.1.17