1 |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig |
2 |
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969 |
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969 |
3 |
+++ mozilla/.mozconfig Tue Jun 20 11:43:33 2006 |
+++ mozilla/.mozconfig Tue Jun 20 11:43:33 2006 |
4 |
@@ -0,0 +1,43 @@ |
@@ -0,0 +1,42 @@ |
5 |
+# sh |
+# sh |
6 |
+# Build configuration script |
+# Build configuration script |
7 |
+# |
+# |
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@ |
|
+ac_add_options --with-system-zlib=/usr |
|
44 |
+ |
+ |
45 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2 |
46 |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin |
134 |
|
|
135 |
pass_arg_count=0 |
pass_arg_count=0 |
136 |
while [ $# -gt $pass_arg_count ] |
while [ $# -gt $pass_arg_count ] |
137 |
|
--- mozilla-orig/browser/components/build/Makefile.in Tue Oct 31 10:55:32 2006 |
138 |
|
+++ mozilla/browser/components/buildMakefile.in Tue Oct 31 11:01:11 2006 |
139 |
|
@@ -113,6 +113,12 @@ |
140 |
|
EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX) |
141 |
|
endif |
142 |
|
|
143 |
|
+# fix for building on Mac/X11 (bug 257773) |
144 |
|
+# dependencies for gkgfx |
145 |
|
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) |
146 |
|
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) |
147 |
|
+endif |
148 |
|
+ |
149 |
|
# Mac: Need to link to CoreFoundation for Mac Migrators (PList reading code) |
150 |
|
# GTK2: Need to link with glib for GNOME shell service |
151 |
|
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT))) |
152 |
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 |
153 |
--- 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 |
154 |
+++ 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 |