OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=61

MozillaFirefox.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  6 12:33:47 CEST 2009 - wr@rosenauer.org
+
+- added mozilla-linkorder.patch to fix build with --as-needed
+
 -------------------------------------------------------------------
 Tue Jun 30 08:52:00 CEST 2009 - wr@rosenauer.org
 

MozillaFirefox.spec

@@ -29,7 +29,7 @@ License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
 Provides:       web_browser
 Provides:       firefox
 Version:        3.5.0
-Release:        3
+Release:        4
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -47,6 +47,7 @@ Source17:       firefox-suse-default-prefs.js
 Patch1:         firefox-libxul-sdk.patch
 Patch2:         firefox-no-update.patch
 Patch3:         toolkit-download-folder.patch
+Patch4:         mozilla-linkorder.patch
 Patch14:        credits.patch
 Patch17:        firefox-appname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -127,6 +128,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch14
 %patch17
 

mozilla-linkorder.patch

@@ -0,0 +1,26 @@
+From: Wolfgang Rosenauer
+Subject: Build fails with --as-needed
+References:
+
+
+diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
+--- a/browser/components/build/Makefile.in
++++ b/browser/components/build/Makefile.in
+@@ -68,7 +68,6 @@ endif
+ EXTRA_DSO_LDOPTS += \
+ 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
+ 	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
+-	$(MOZ_COMPONENT_LIBS) \
+ 	$(NULL)
+ 
+ # migration requires mozreg, which doesn't build on WINCE; only include
+@@ -80,6 +79,9 @@ SHARED_LIBRARY_LIBS += ../migration/src/
+ EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
+ endif
+ 
++# if built with --as-needed the NSPR libs need to be linked after mozreg_s
++EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
++
+ # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
+ # GTK2: Need to link with glib for GNOME shell service
+ ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))