diff options
Diffstat (limited to 'www/firefox3-devel/files')
| -rw-r--r-- | www/firefox3-devel/files/firefox.desktop.in | 4 | ||||
| -rw-r--r-- | www/firefox3-devel/files/patch-config-rules.mk | 11 | ||||
| -rw-r--r-- | www/firefox3-devel/files/patch-configure | 25 | ||||
| -rw-r--r-- | www/firefox3-devel/files/patch-libm | 16 | ||||
| -rw-r--r-- | www/firefox3-devel/files/patch-nothreads-fixme | 12 | ||||
| -rw-r--r-- | www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk | 14 | ||||
| -rw-r--r-- | www/firefox3-devel/files/patch-sysnss | 10 |
7 files changed, 46 insertions, 46 deletions
diff --git a/www/firefox3-devel/files/firefox.desktop.in b/www/firefox3-devel/files/firefox.desktop.in index 2a0a3cdca..d72090e1a 100644 --- a/www/firefox3-devel/files/firefox.desktop.in +++ b/www/firefox3-devel/files/firefox.desktop.in @@ -182,10 +182,10 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %U +Exec=@MOZILLA@ %u Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; diff --git a/www/firefox3-devel/files/patch-config-rules.mk b/www/firefox3-devel/files/patch-config-rules.mk index ecc3c8194..7377726fd 100644 --- a/www/firefox3-devel/files/patch-config-rules.mk +++ b/www/firefox3-devel/files/patch-config-rules.mk @@ -1,14 +1,11 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ +--- config/rules.mk.orig Fri Jul 7 00:13:36 2006 ++++ config/rules.mk Sun Sep 3 00:04:03 2006 +@@ -443,7 +443,7 @@ ifeq ($(OS_ARCH),FreeBSD) ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) +-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif endif endif diff --git a/www/firefox3-devel/files/patch-configure b/www/firefox3-devel/files/patch-configure index 923cf5065..ee6087d2d 100644 --- a/www/firefox3-devel/files/patch-configure +++ b/www/firefox3-devel/files/patch-configure @@ -1,15 +1,24 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Wed Nov 23 11:07:17 2005 -@@ -10016,7 +10016,7 @@ +--- configure.orig Tue Aug 8 13:59:01 2006 ++++ configure Tue Sep 19 07:52:08 2006 +@@ -1047,7 +1047,7 @@ + + MOZJPEG=62 + MOZPNG=10207 +-MOZZLIB=1.2.3 ++MOZZLIB=1.2.2 + NSPR_VERSION=4 + NSS_VERSION=3 + +@@ -10267,7 +10267,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 10022 "configure" + #line 10273 "configure" #include "confdefs.h" -@@ -10047,7 +10047,7 @@ +@@ -10298,7 +10298,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +27,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ +@@ -10308,7 +10308,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 10063 "configure" + #line 10314 "configure" #include "confdefs.h" -@@ -10088,7 +10088,7 @@ +@@ -10339,7 +10339,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox3-devel/files/patch-libm b/www/firefox3-devel/files/patch-libm index 7de64b2a5..d9295c906 100644 --- a/www/firefox3-devel/files/patch-libm +++ b/www/firefox3-devel/files/patch-libm @@ -1,19 +1,3 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - --- js/Makefile.in Sun Mar 23 14:36:00 2003 +++ js/Makefile.in Thu Aug 4 23:08:06 2005 @@ -46,5 +46,5 @@ diff --git a/www/firefox3-devel/files/patch-nothreads-fixme b/www/firefox3-devel/files/patch-nothreads-fixme new file mode 100644 index 000000000..1b1bbbcbd --- /dev/null +++ b/www/firefox3-devel/files/patch-nothreads-fixme @@ -0,0 +1,12 @@ +--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 ++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 +@@ -99,7 +99,8 @@ + # REFEF_IO allows us to override IO functions, which is used in the AsyncIO + # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we + # don't have to vacuum to make sure the data is not visible in the file. +-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 ++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 ++# -DTHREADSAFE=1 + + ifdef ENABLE_TESTS + ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk b/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk index 3e0e14aca..0f7a04a02 100644 --- a/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk +++ b/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk @@ -1,6 +1,6 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ +--- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 ++++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 +@@ -45,8 +45,12 @@ ifeq ($(OS_TEST),alpha) CPU_ARCH = alpha else @@ -13,16 +13,12 @@ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -71,7 +75,11 @@ +@@ -73,7 +77,7 @@ DLL_SUFFIX = so.1.0 endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) +MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file + MKSHLIB += -Wl,--version-script,$(MAPFILE) endif diff --git a/www/firefox3-devel/files/patch-sysnss b/www/firefox3-devel/files/patch-sysnss index f92ef73b1..d69df4045 100644 --- a/www/firefox3-devel/files/patch-sysnss +++ b/www/firefox3-devel/files/patch-sysnss @@ -148,14 +148,16 @@ endif echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in.orig Tue Jan 31 07:24:14 2006 -+++ security/manager/ssl/src/Makefile.in Tue Mar 28 15:30:44 2006 -@@ -119,17 +119,16 @@ +--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 ++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 +@@ -124,19 +124,19 @@ pipboot \ $(NULL) -EXTRA_DEPS = $(NSS_DEP_LIBS) -- + + DEFINES += -DNSS_ENABLE_ECC + # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's -LOCAL_INCLUDES += $(NSS_CFLAGS) |