Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv778/10.4-transitional/unstable/crypto/finkinfo
Modified Files:
firefox.info firefox.patch
Log Message:
New version from trackers (Submissions #1336640) to fix printing.
Index: firefox.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/firefox.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- firefox.info 22 Sep 2005 21:16:54 -0000 1.7
+++ firefox.info 27 Oct 2005 22:36:41 -0000 1.8
@@ -1,6 +1,6 @@
Package: firefox
Version: 1.0.7
-Revision: 1
+Revision: 2
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
Index: firefox.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/firefox.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- firefox.patch 1 Jul 2005 06:00:28 -0000 1.4
+++ firefox.patch 27 Oct 2005 22:36:41 -0000 1.5
@@ -1,7 +1,7 @@
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
--- mozilla-orig/.mozconfig 1969-12-31 18:00:00.000000000 -0600
+++ mozilla/.mozconfig 2005-06-16 10:33:34.000000000 -0500
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,39 @@
+# sh
+# Build configuration script
+#
@@ -13,7 +13,6 @@
+# Options for client.mk.
+# environment variables to set
+#mk_add_options MOZILLA_OFFICIAL=1
-+mk_add_options MOZ_MAKE_FLAGS=-j4
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --enable-default-toolkit=gtk2
@@ -24,6 +23,7 @@
+ac_add_options --enable-xinerama
+ac_add_options --with-pthreads
+ac_add_options --disable-gnomevfs
++ac_add_options --enable-postscript
+
+#ac_add_options --enable-official-branding
+#ac_add_options --disable-shared
@@ -41,12 +41,6 @@
+ac_add_options [EMAIL PROTECTED]@
+#ac_add_options [EMAIL PROTECTED]@/lib/freetype2
+#ac_add_options [EMAIL PROTECTED]@/lib/freetype2/bin
-+
-+# SVG stuff
-+#ac_add_options --enable-svg
-+#ac_add_options --enable-svg-renderer-libart
-+#mk_add_options MOZ_INTERNAL_LIBART_LGPL=1
-+#MOZ_INTERNAL_LIBART_LGPL=1
diff -ruN mozilla-orig/browser/components/build/Makefile.in
mozilla/browser/components/build/Makefile.in
--- mozilla-orig/browser/components/build/Makefile.in 2004-07-15
15:43:54.000000000 -0500
+++ mozilla/browser/components/build/Makefile.in 2005-06-16
10:33:12.000000000 -0500
@@ -176,36 +170,6 @@
DLL_SUFFIX=".dylib"
DSO_LDOPTS=''
STRIP="$STRIP -x -S"
-diff -ruN mozilla-orig/directory/c-sdk/config/config.mk
mozilla/directory/c-sdk/config/config.mk
---- mozilla-orig/directory/c-sdk/config/config.mk 2003-02-23
09:54:18.000000000 -0600
-+++ mozilla/directory/c-sdk/config/config.mk 2005-06-16 10:33:34.000000000
-0500
-@@ -60,10 +60,10 @@
-
- NFSPWD = $(MOD_DEPTH)/config/nfspwd
-
--CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
-- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
--CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
-- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-+CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
-+ $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
-+CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
-+ $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
- # For purify
- NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-diff -ruN mozilla-orig/directory/c-sdk/configure
mozilla/directory/c-sdk/configure
---- mozilla-orig/directory/c-sdk/configure 2004-09-14 16:10:26.000000000
-0500
-+++ mozilla/directory/c-sdk/configure 2005-06-16 10:33:34.000000000 -0500
-@@ -3401,7 +3401,7 @@
-
- CPU_ARCH=ppc
- fi
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @PREFIX@/lib/firefox/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
diff -ruN mozilla-orig/fink/applications/firefox.desktop
mozilla/fink/applications/firefox.desktop
--- mozilla-orig/fink/applications/firefox.desktop 1969-12-31
18:00:00.000000000 -0600
+++ mozilla/fink/applications/firefox.desktop 2005-06-16 10:33:34.000000000
-0500
@@ -260,15 +224,6 @@
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
--- mozilla-orig/nsprpub/configure 2004-09-14 16:10:26.000000000 -0500
+++ mozilla/nsprpub/configure 2005-06-16 10:33:34.000000000 -0500
-@@ -3305,7 +3305,7 @@
-
- CPU_ARCH=ppc
- fi
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
@@ -3320,9 +3320,6 @@
# Add Mac OS X support for loading CFM & CFBundle plugins
@@ -330,30 +285,6 @@
#endif
#ifdef XP_PC
-diff -ruN mozilla-orig/security/coreconf/Darwin.mk
mozilla/security/coreconf/Darwin.mk
---- mozilla-orig/security/coreconf/Darwin.mk 2003-11-12 19:59:22.000000000
-0600
-+++ mozilla/security/coreconf/Darwin.mk 2005-06-16 10:33:34.000000000
-0500
-@@ -68,7 +68,7 @@
- ARCH = darwin
-
- # May override this with -bundle to create a loadable module.
--DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1
-install_name @executable_path/$(notdir $@) -headerpad_max_install_names
-+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1
-install_name @PREFIX@/lib/firefox/$(notdir $@) -headerpad_max_install_names
-
- MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
- DLL_SUFFIX = dylib
-diff -ruN mozilla-orig/security/nss/cmd/platlibs.mk
mozilla/security/nss/cmd/platlibs.mk
---- mozilla-orig/security/nss/cmd/platlibs.mk 2004-10-15 16:13:50.000000000
-0500
-+++ mozilla/security/nss/cmd/platlibs.mk 2005-06-16 10:33:34.000000000
-0500
-@@ -207,7 +207,7 @@
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file
@PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
-
diff -ruN mozilla-orig/security/nss/lib/pki1/oiddata.h
mozilla/security/nss/lib/pki1/oiddata.h
--- mozilla-orig/security/nss/lib/pki1/oiddata.h 2002-01-03
23:22:07.000000000 -0600
+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-06-16 10:37:45.000000000
-0500
@@ -362,35 +293,11 @@
#endif /* DEBUG */
+/* added to fix building on Tiger/gcc4 (bug 284386) */
-+/* fixed for 1.1, so remove this block from the patch */
++/* fixed for 1.1, so remove this block from the patch for 1.1*/
+#include "pki1t.h"
#ifndef NSSPKI1T_H
#include "nsspki1t.h"
#endif /* NSSPKI1T_H */
-diff -ruN mozilla-orig/security/nss/lib/smime/config.mk
mozilla/security/nss/lib/smime/config.mk
---- mozilla-orig/security/nss/lib/smime/config.mk 2004-10-15
16:13:56.000000000 -0500
-+++ mozilla/security/nss/lib/smime/config.mk 2005-06-16 10:33:34.000000000
-0500
-@@ -70,7 +70,7 @@
- $(NULL)
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file
@PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- endif
-diff -ruN mozilla-orig/security/nss/lib/ssl/config.mk
mozilla/security/nss/lib/ssl/config.mk
---- mozilla-orig/security/nss/lib/ssl/config.mk 2004-10-15
16:13:57.000000000 -0500
-+++ mozilla/security/nss/lib/ssl/config.mk 2005-06-16 10:33:34.000000000
-0500
-@@ -75,7 +75,7 @@
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file
@PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- ifeq ($(OS_TARGET),SunOS)
diff -ruN mozilla-orig/themes/Makefile.in mozilla/themes/Makefile.in
--- mozilla-orig/themes/Makefile.in 2004-05-16 13:16:49.000000000 -0500
+++ mozilla/themes/Makefile.in 2005-06-16 10:33:34.000000000 -0500
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
