diff options
| -rw-r--r-- | firefox-1.0-nss-system-nspr.patch | 123 | ||||
| -rw-r--r-- | firefox.sh.in | 11 | ||||
| -rw-r--r-- | firefox.spec | 19 |
3 files changed, 145 insertions, 8 deletions
diff --git a/firefox-1.0-nss-system-nspr.patch b/firefox-1.0-nss-system-nspr.patch new file mode 100644 index 0000000..3199945 --- /dev/null +++ b/firefox-1.0-nss-system-nspr.patch @@ -0,0 +1,123 @@ +Index: mozilla/security/coreconf/location.mk +=================================================================== +RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v +retrieving revision 1.9 +diff -u -r1.9 location.mk +--- mozilla/security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9 ++++ mozilla/security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000 +@@ -61,6 +61,8 @@ + + DIST = $(SOURCE_PREFIX)/$(PLATFORM) + ++NSPR_LIBDIR = $(DIST)/lib ++ + ifdef BUILD_DEBUG_GC + DEFINES += -DDEBUG_GC + endif +Index: mozilla/security/manager/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v +retrieving revision 1.56 +diff -u -r1.56 Makefile.in +--- mozilla/security/manager/Makefile.in 14 Mar 2005 10:00:58 -0000 1.56 ++++ mozilla/security/manager/Makefile.in 11 Apr 2005 20:21:57 -0000 +@@ -76,11 +76,22 @@ + endif + endif + ++ABS_DIST := $(shell cd $(DIST) && pwd) ++ifeq ($(OS_ARCH),WINNT) ++ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') ++endif ++NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) ++ifneq (,$(strip $(NSPR_LIBDIR))) ++NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) ++else ++NSPR_LIBDIR = $(ABS_DIST)/lib ++endif + # NSS makefiles are not safe for parallel execution. + DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 +-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" +-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist +-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist ++DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" ++DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) ++DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) ++DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) + DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 + DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 + ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) +Index: mozilla/security/nss/lib/ckfw/builtins/Makefile +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v +retrieving revision 1.14 +diff -u -r1.14 Makefile +--- mozilla/security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14 ++++ mozilla/security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000 +@@ -53,23 +53,23 @@ + # This is merely an expedient hack and not the right solution. + ifdef NS_USE_GCC + EXTRA_LIBS += \ +- -L$(DIST)/lib \ ++ -L$(NSPR_LIBDIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ + $(NULL) + else + EXTRA_LIBS += \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + $(NULL) + endif + + else + + EXTRA_LIBS += \ +- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NULL) + + endif +Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v +retrieving revision 1.18 +diff -u -r1.18 Makefile +--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18 ++++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000 +@@ -63,7 +63,7 @@ + $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ + $(CRYPTO_LIB) \ + $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ +- -L$(DIST)/lib \ ++ -L$(NSPR_LIBDIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ +@@ -76,8 +76,8 @@ + $(DIST)/lib/softokn.lib \ + $(CRYPTO_LIB) \ + $(DIST)/lib/secutil.lib \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + wsock32.lib \ + winmm.lib \ + $(NULL) +@@ -98,8 +98,8 @@ + $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ + $(CRYPTO_LIB) \ + $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NULL) + + endif diff --git a/firefox.sh.in b/firefox.sh.in index 4387998..7526330 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -36,7 +36,12 @@ cmdname=`basename $0` ## ## Variables ## -MOZ_DIST_BIN="FFDIR" +MOZ_LIB_DIR="/usr/lib" +if [ -x "/usr/lib64/firefox-FIREFOX_VERSION/firefox-bin" ] +then + MOZ_LIB_DIR="/usr/lib64" +fi +MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client" MOZ_CLIENT_PROGRAM_PARAM="-a firefox" @@ -65,9 +70,9 @@ export LD_LIBRARY_PATH ## if [ "$MOZ_PLUGIN_PATH" ] then - MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins:$MOZ_DIST_BIN/plugins + MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/plugins:$MOZ_DIST_BIN/plugins else - MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins:$MOZ_DIST_BIN/plugins + MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/plugins:$MOZ_DIST_BIN/plugins fi export MOZ_PLUGIN_PATH diff --git a/firefox.spec b/firefox.spec index 0313d4f..2e08754 100644 --- a/firefox.spec +++ b/firefox.spec @@ -10,7 +10,7 @@ ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.0.3 -Release: 2 +Release: 3 Epoch: 0 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL @@ -36,8 +36,8 @@ Patch1: firefox-0.7.3-freetype-compile.patch Patch2: firefox-1.0-prdtoa.patch Patch3: firefox-1.0-gcc4-compile.patch Patch4: firefox-1.0-recv-fortify.patch -Patch5: firefox-1.0-nspr-config.patch -Patch6: firefox-1.0-gfxshared_s.patch +Patch5: firefox-1.0-gfxshared_s.patch +Patch6: firefox-1.0-nss-system-nspr.patch # customization patches Patch20: firefox-redhat-homepage.patch @@ -54,11 +54,13 @@ Patch31: firefox-1.0-pango-selection.patch Patch32: firefox-1.0-pango-space-width.patch Patch33: firefox-1.0-pango-rounding.patch Patch34: firefox-1.0-pango-direction.patch +Patch35: firefox-1.0-pango-bidi-justify.patch # local bugfixes Patch40: firefox-PR1-gnome-vfs-default-app.patch Patch41: firefox-PR1-stack-direction.patch Patch42: firefox-1.0-download-to-desktop.patch +Patch43: firefox-1.0-uriloader.patch # backported patches Patch90: firefox-PR1-gtk-file-chooser-morefixes.patch @@ -117,7 +119,7 @@ compliance, performance and portability. %patch3 -p0 %patch4 -p0 %patch5 -p0 -%patch6 -p0 +%patch6 -p1 %patch20 -p0 %patch21 -p1 %patch22 -p1 @@ -132,9 +134,11 @@ compliance, performance and portability. %patch32 -p1 %patch33 -p1 %patch34 -p1 +%patch35 -p0 %patch40 -p1 %patch41 -p0 %patch42 -p0 +%patch43 -p0 %patch90 -p0 %patch101 -p0 %patch102 -p0 @@ -188,7 +192,7 @@ desktop-file-install --vendor mozilla \ %{SOURCE20} # set up the firefox start script -%{__cat} %{SOURCE21} | %{__sed} -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \ +%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \ $RPM_BUILD_ROOT%{_bindir}/firefox %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox @@ -330,6 +334,11 @@ fi #--------------------------------------------------------------------- %changelog +* Tue May 3 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.3-3 +- Firefox script fixes to support multilib installs. +- Add upstream patch to fix bidi justification of pango +- Add patch to fix launching of helper applications + * Wed Apr 27 2005 Warren Togami <wtogami@redhat.com> - remove JVM version probing (#116445) - correct confusing PANGO vars in startup script |