/[fink]/10.3/main/finkinfo/net/firefox2.patch
ViewVC logotype

Diff of /10.3/main/finkinfo/net/firefox2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.1.1 by nieder, Thu Aug 31 16:24:10 2006 UTC revision 1.5 by nieder, Tue Apr 10 19:20:52 2007 UTC
# Line 16  diff -ruN mozilla-orig/.mozconfig mozill Line 16  diff -ruN mozilla-orig/.mozconfig mozill
16  +  +
17  +# Options for 'configure' (same as command-line options).  +# Options for 'configure' (same as command-line options).
18  +ac_add_options --prefix=@PREFIX@  +ac_add_options --prefix=@PREFIX@
19  +ac_add_options --enable-official-branding  +#ac_add_options --enable-official-branding
20  +ac_add_options --enable-default-toolkit=gtk2  +ac_add_options --enable-default-toolkit=gtk2
21  +ac_add_options --enable-xft  +ac_add_options --enable-xft
22  +#ac_add_options --disable-xft  +#ac_add_options --disable-xft
23  +#ac_add_options --enable-freetype2  +#ac_add_options --enable-freetype2
24  +ac_add_options --disable-freetype2  +#ac_add_options --disable-freetype2
25  +ac_add_options --enable-postscript  +ac_add_options --enable-postscript
26  +ac_add_options --enable-xinerama  +ac_add_options --enable-xinerama
27  +ac_add_options --with-pthreads  +ac_add_options --with-pthreads
# Line 36  diff -ruN mozilla-orig/.mozconfig mozill Line 36  diff -ruN mozilla-orig/.mozconfig mozill
36  +ac_add_options --disable-debug  +ac_add_options --disable-debug
37  +ac_add_options --disable-tests  +ac_add_options --disable-tests
38  +ac_add_options --enable-strip  +ac_add_options --enable-strip
39  +ac_add_options --enable-optimize='-Os'  +ac_add_options --enable-optimize='-O2'
40  +ac_add_options --enable-macos-target=10.3  +ac_add_options --enable-macos-target=10.3
41  +ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox2  +ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox2
42  +ac_add_options --with-system-jpeg=@PREFIX@  +ac_add_options --with-system-jpeg=@PREFIX@
43  +ac_add_options --with-system-png=@PREFIX@  +ac_add_options --with-system-png=@PREFIX@
44  +ac_add_options --with-system-zlib=/usr  +ac_add_options --with-freetype-prefix=@PREFIX@/lib/freetype219
45  +  +
46  +#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2  +#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype219
47  +#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin  +#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype219/bin
48  diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in  diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in
49  --- mozilla-orig/browser/app/mozilla.in Wed May 10 12:23:59 2006  --- mozilla-orig/browser/app/mozilla.in Wed May 10 12:23:59 2006
50  +++ mozilla/browser/app/mozilla.in      Tue Jun 20 11:43:33 2006  +++ mozilla/browser/app/mozilla.in      Tue Jun 20 11:43:33 2006
# Line 135  diff -ruN mozilla-orig/browser/app/mozil Line 135  diff -ruN mozilla-orig/browser/app/mozil
135    
136   pass_arg_count=0   pass_arg_count=0
137   while [ $# -gt $pass_arg_count ]   while [ $# -gt $pass_arg_count ]
138    diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in
139    --- mozilla-orig/browser/components/build/Makefile.in   Tue Oct 31 10:55:32 2006
140    +++ mozilla/browser/components/buildMakefile.in Tue Oct 31 11:01:11 2006
141    @@ -113,6 +113,12 @@
142     EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
143     endif
144    
145    +# fix for building on Mac/X11 (bug 257773)
146    +# dependencies for gkgfx
147    +ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
148    +EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
149    +endif
150    +
151     # Mac: Need to link to CoreFoundation for Mac Migrators (PList reading code)
152     # GTK2: Need to link with glib for GNOME shell service
153     ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
154  diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html  diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
155  --- mozilla-orig/browser/locales/en-US/profile/bookmarks.html   Tue May 16 15:44:44 2006  --- mozilla-orig/browser/locales/en-US/profile/bookmarks.html   Tue May 16 15:44:44 2006
156  +++ mozilla/browser/locales/en-US/profile/bookmarks.html        Tue Jun 20 11:43:33 2006  +++ mozilla/browser/locales/en-US/profile/bookmarks.html        Tue Jun 20 11:43:33 2006
157  @@ -12,6 +12,7 @@  @@ -14,6 +14,7 @@
158       <DL><p>       <DL><p>
159           <DT><A HREF="http://www.mozilla.com/firefox/central/" 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>           <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$GvPhC3">Getting Started</A>
160           <DT><A HREF="http://fxfeeds.mozilla.com/" LAST_MODIFIED="1094668003" FEEDURL="http://fxfeeds.mozilla.com/rss20.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>           <DT><A HREF="http://en-US.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/" FEEDURL="http://en-US.fxfeeds.mozilla.com/en-US/firefox/headlines.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
161  +        <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>  +        <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>
162       </DL><p>       </DL><p>
163       <HR>       <HR>
164       <DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>       <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
165  diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in  diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
166  --- mozilla-orig/config/autoconf.mk.in  Mon Jun 19 09:49:54 2006  --- mozilla-orig/config/autoconf.mk.in  Mon Jun 19 09:49:54 2006
167  +++ mozilla/config/autoconf.mk.in       Tue Jun 20 11:43:33 2006  +++ mozilla/config/autoconf.mk.in       Tue Jun 20 11:43:33 2006
# Line 171  diff -ruN mozilla-orig/config/autoconf.m Line 187  diff -ruN mozilla-orig/config/autoconf.m
187  diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk  diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
188  --- mozilla-orig/config/config.mk       Tue Apr 18 13:02:19 2006  --- mozilla-orig/config/config.mk       Tue Apr 18 13:02:19 2006
189  +++ mozilla/config/config.mk    Tue Jun 20 11:43:33 2006  +++ mozilla/config/config.mk    Tue Jun 20 11:43:33 2006
190  @@ -660,7 +660,7 @@  @@ -665,7 +665,7 @@
191   ifeq ($(OS_ARCH),Darwin)   ifeq ($(OS_ARCH),Darwin)
192   ifdef USE_PREBINDING   ifdef USE_PREBINDING
193   export LD_PREBIND=1   export LD_PREBIND=1
# Line 227  diff -ruN mozilla-orig/fink/fink.js mozi Line 243  diff -ruN mozilla-orig/fink/fink.js mozi
243  +pref("general.useragent.extra.vendorComment", "Fink Community Edition");  +pref("general.useragent.extra.vendorComment", "Fink Community Edition");
244  +  +
245  +// Give a default font set that can do BOLD  +// Give a default font set that can do BOLD
246  +pref("font.name.serif.x-western", "Bitstream Vera Serif");  +//pref("font.name.serif.x-western", "Bitstream Vera Serif");
247  +pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");  +//pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
248  +pref("font.size.variable.x-western", 15);  +//pref("font.size.variable.x-western", 15);
249  +  +
250  +// TrueType  +// TrueType
251  +//pref("font.FreeType2.enable", true);  +//pref("font.FreeType2.enable", true);
252  +//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype2/lib/libfreetype.6.dylib");  +//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype219/lib/libfreetype.6.dylib");
253  +//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");  +//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
254  +//pref("font.freetype2.autohinted", true);  +//pref("font.freetype2.autohinted", true);
255  +//pref("font.freetype2.unhinted", true);  +//pref("font.freetype2.unhinted", true);
# Line 251  diff -ruN mozilla-orig/fink/fink.js mozi Line 267  diff -ruN mozilla-orig/fink/fink.js mozi
267  +//pref("font.scale.aa_bitmap.enable", true);  +//pref("font.scale.aa_bitmap.enable", true);
268  +//pref("font.scale.aa_bitmap.always", false);  +//pref("font.scale.aa_bitmap.always", false);
269  +//pref("font.scale.aa_bitmap.min", 6);  +//pref("font.scale.aa_bitmap.min", 6);
270  diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp  diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
271  --- mozilla-orig/modules/libpref/src/nsPrefService.cpp  Wed May 10 12:23:59 2006  --- mozilla-orig/nsprpub/configure      Wed Feb 22 18:03:10 2006
272  +++ mozilla/modules/libpref/src/nsPrefService.cpp       Tue Jun 20 11:43:33 2006  +++ mozilla/nsprpub/configure   Mon Jun 19 15:10:14 2006
273  @@ -748,6 +748,7 @@  @@ -3338,9 +3338,6 @@
274   #elif defined(XP_BEOS)  
275         "beos.js"       # Add Mac OS X support for loading CFM & CFBundle plugins
276         if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
277    -        cat >> confdefs.h <<\EOF
278    -#define XP_MACOSX 1
279    -EOF
280    
281             OS_TARGET=MacOSX
282    
283    @@ -4960,8 +4958,6 @@
284    
285    
286     case $target in
287    -*-darwin*)
288    -    ;;
289     *)
290         echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
291     echo "configure:4968: checking for dlopen in -ldl" >&5
292    diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
293    --- mozilla-orig/nsprpub/pr/include/md/_darwin.h        Tue Jan 10 18:16:38 2006
294    +++ mozilla/nsprpub/pr/include/md/_darwin.h     Mon Jun 19 15:10:14 2006
295    @@ -62,7 +62,8 @@
296    
297     #undef  HAVE_STACK_GROWING_UP
298     #define HAVE_DLL
299    -#define USE_MACH_DYLD
300    +/* #define USE_MACH_DYLD */
301    +#define USE_DLFCN
302     #define _PR_HAVE_SOCKADDR_LEN
303     #define _PR_STAT_HAS_ST_ATIMESPEC
304     #define _PR_NO_LARGE_FILES
305    diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
306    --- mozilla-orig/nsprpub/pr/src/Makefile.in     Mon Feb 13 13:48:14 2006
307    +++ mozilla/nsprpub/pr/src/Makefile.in  Mon Jun 19 15:10:14 2006
308    @@ -204,9 +204,9 @@
309     endif
310     endif
311    
312    -ifeq ($(OS_TARGET),MacOSX)
313    -OS_LIBS                = -framework CoreServices -framework CoreFoundation
314    -endif
315    +#ifeq ($(OS_TARGET),MacOSX)
316    +#OS_LIBS               = -framework CoreServices -framework CoreFoundation
317    +#endif
318    
319     ifdef GC_LEAK_DETECTOR
320     EXTRA_LIBS     = -L$(dist_libdir) -lboehm
321    diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
322    --- mozilla-orig/nsprpub/pr/src/linking/prlink.c        Thu Aug 18 13:24:29 2005
323    +++ mozilla/nsprpub/pr/src/linking/prlink.c     Mon Jun 19 15:10:14 2006
324    @@ -158,7 +158,8 @@
325     #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
326         || defined(WIN16) || defined(XP_OS2) \
327         || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
328    -#define NEED_LEADING_UNDERSCORE
329    +/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
330    +/* #define NEED_LEADING_UNDERSCORE */
331   #endif   #endif
 +      , "fink.js"  
    };  
332    
333     rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));   /************************************************************************/
Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.5
  ViewVC Help
Powered by ViewVC 1.1.17