# HG changeset patch # User Wolfgang Rosenauer # Date 1285787158 -7200 # Node ID 995e803e819885433abe63d099986bde3a8be333 # Parent a6dc70babb5f6baef3f0e4401accd88cbe93f6d4 rebase patches to snapshot 20100929 diff -r a6dc70babb5f -r 995e803e8198 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Wed Sep 29 14:11:58 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Sep 29 21:05:58 2010 +0200 @@ -53,7 +53,6 @@ Source10: compare-locales.tar.bz2 Source16: firefox.1 Patch1: firefox-libxul-sdk.patch -Patch2: firefox-credits.patch Patch3: toolkit-download-folder.patch Patch4: firefox-linkorder.patch Patch5: firefox-browser-css.patch @@ -64,7 +63,6 @@ Patch11: firefox-no-sync-l10n.patch Patch12: firefox-sync-system-nss.patch Patch13: firefox-sync-build.patch -Patch14: firefox-tabview.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -160,7 +158,6 @@ %setup -q -n mozilla -b 7 -b 10 cd $RPM_BUILD_DIR/mozilla %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -175,7 +172,6 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build export MOZ_BUILD_DATE=%{releasedate} diff -r a6dc70babb5f -r 995e803e8198 MozillaFirefox/firefox-credits.patch --- a/MozillaFirefox/firefox-credits.patch Wed Sep 29 14:11:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-credits.patch \ No newline at end of file diff -r a6dc70babb5f -r 995e803e8198 MozillaFirefox/firefox-tabview.patch --- a/MozillaFirefox/firefox-tabview.patch Wed Sep 29 14:11:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-tabview.patch \ No newline at end of file diff -r a6dc70babb5f -r 995e803e8198 firefox-credits.patch --- a/firefox-credits.patch Wed Sep 29 14:11:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml ---- a/browser/base/content/credits.xhtml -+++ b/browser/base/content/credits.xhtml -@@ -581,16 +581,19 @@ -
  • Kohei Yoshino
    • -
  • Shigeru Yoshitake
    • -
  • Tanner M. Young
    • -
  • Boris Zbarsky
    • -
  • Marco Zehe
    • -
  • Matthew Zeier
    • - - -+

    openSUSE RPM packaging

    -+ -+ -
    - &credit.translation; -
    - - - -
    -

    &credit.thanks;

    diff -r a6dc70babb5f -r 995e803e8198 firefox-kde.patch --- a/firefox-kde.patch Wed Sep 29 14:11:58 2010 +0200 +++ b/firefox-kde.patch Wed Sep 29 21:05:58 2010 +0200 @@ -1121,20 +1121,20 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -22,16 +22,18 @@ browser.jar: +@@ -20,16 +20,18 @@ browser.jar: + * content/browser/aboutHome.xhtml (content/aboutHome.xhtml) + * content/browser/aboutHome.js (content/aboutHome.js) * content/browser/aboutHome.css (content/aboutHome.css) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) - content/browser/aboutRobots-icon-rtl.png (content/aboutRobots-icon-rtl.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) - content/browser/aboutRobots-widget-right.png (content/aboutRobots-widget-right.png) * content/browser/browser.css (content/browser.css) * content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) +* content/browser/browser-kde.xul (content/browser-kde.xul) +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) - * content/browser/credits.xhtml (content/credits.xhtml) * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) + * content/browser/inspector.html (content/inspector.html) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) @@ -1595,7 +1595,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -429,16 +429,17 @@ +@@ -431,16 +431,17 @@ #endif #endif diff -r a6dc70babb5f -r 995e803e8198 firefox-tabview.patch --- a/firefox-tabview.patch Wed Sep 29 14:11:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent d4d706483e1378477430197d3366a6e4d6dbb9cd -tabview is part of Firefox and not GRE - -diff --git a/browser/base/content/tabview/tabview.js b/browser/base/content/tabview/tabview.js ---- a/browser/base/content/tabview/tabview.js -+++ b/browser/base/content/tabview/tabview.js -@@ -1,15 +1,15 @@ - const Cc = Components.classes; - const Ci = Components.interfaces; - const Cu = Components.utils; - --Cu.import("resource://gre/modules/tabview/AllTabs.jsm"); --Cu.import("resource://gre/modules/tabview/groups.jsm"); --Cu.import("resource://gre/modules/tabview/utils.jsm"); -+Cu.import("resource:///modules/tabview/AllTabs.jsm"); -+Cu.import("resource:///modules/tabview/groups.jsm"); -+Cu.import("resource:///modules/tabview/utils.jsm"); - Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource://gre/modules/XPCOMUtils.jsm"); - - XPCOMUtils.defineLazyGetter(this, "gWindow", function() { - return window.QueryInterface(Ci.nsIInterfaceRequestor). - getInterface(Ci.nsIWebNavigation). - QueryInterface(Ci.nsIDocShell). - chromeEventHandler.ownerDocument.defaultView; diff -r a6dc70babb5f -r 995e803e8198 mozilla-kde.patch --- a/mozilla-kde.patch Wed Sep 29 14:11:58 2010 +0200 +++ b/mozilla-kde.patch Wed Sep 29 21:05:58 2010 +0200 @@ -21,9 +21,9 @@ diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp --- a/modules/libpref/src/nsPrefService.cpp +++ b/modules/libpref/src/nsPrefService.cpp -@@ -51,16 +51,17 @@ - #include "nsILocalFile.h" - #include "nsIObserverService.h" +@@ -55,16 +55,17 @@ + #include "nsIStringEnumerator.h" + #include "nsIZipReader.h" #include "nsPrefBranch.h" #include "nsXPIDLString.h" #include "nsCRT.h" @@ -39,7 +39,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -718,28 +719,40 @@ static nsresult pref_InitDefaults() +@@ -837,28 +838,40 @@ static nsresult pref_InitDefaults() /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MAC) || defined(XP_MACOSX) @@ -2088,7 +2088,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -95,17 +95,18 @@ CMMSRCS = nsNativeAppSupportCocoa.mm +@@ -97,17 +97,18 @@ CMMSRCS = nsNativeAppSupportCocoa.mm else ifeq ($(MOZ_WIDGET_TOOLKIT),os2) CPPSRCS += nsNativeAppSupportOS2.cpp @@ -3104,7 +3104,7 @@ diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in --- a/widget/src/gtk2/Makefile.in +++ b/widget/src/gtk2/Makefile.in -@@ -155,11 +155,14 @@ endif +@@ -157,11 +157,14 @@ endif DEFINES += -DCAIRO_GFX @@ -3458,7 +3458,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -98,10 +98,11 @@ FORCE_STATIC_LIB = 1 +@@ -94,10 +94,11 @@ FORCE_STATIC_LIB = 1 # Force use of PIC FORCE_USE_PIC = 1 diff -r a6dc70babb5f -r 995e803e8198 mozilla-pkgconfig.patch --- a/mozilla-pkgconfig.patch Wed Sep 29 14:11:58 2010 +0200 +++ b/mozilla-pkgconfig.patch Wed Sep 29 21:05:58 2010 +0200 @@ -24,7 +24,7 @@ # to register xulrunner per-user, override this with $HOME/.gre.d regdir = /etc/gre.d -@@ -109,16 +112,17 @@ pkg_config_files += mozilla-nss.pc +@@ -116,16 +119,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) @@ -40,8 +40,8 @@ -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ - -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ - chmod 644 $@ + -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ + -e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \ diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in --- a/xulrunner/installer/libxul-embedding.pc.in +++ b/xulrunner/installer/libxul-embedding.pc.in @@ -72,7 +72,7 @@ Description: The Mozilla Runtime and Embedding Engine Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom + Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in --- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in +++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in @@ -112,6 +112,6 @@ Description: The Mozilla JavaScript Library Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lmozjs -+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs +-Libs: -L${sdkdir}/lib %MOZ_JS_LINK% ++Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK% Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE diff -r a6dc70babb5f -r 995e803e8198 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Wed Sep 29 14:11:58 2010 +0200 +++ b/mozilla-shared-nss-db.patch Wed Sep 29 21:05:58 2010 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -560,16 +560,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -564,16 +564,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -22,16 +22,16 @@ + MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ + export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ + MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ COMPILER_DEPEND = @COMPILER_DEPEND@ MDDEPDIR := @MDDEPDIR@ CC_WRAPPER = @CC_WRAPPER@ - CXX_WRAPPER = @CXX_WRAPPER@ - diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8452,16 +8452,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8550,16 +8550,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz diff -r a6dc70babb5f -r 995e803e8198 series --- a/series Wed Sep 29 14:11:58 2010 +0200 +++ b/series Wed Sep 29 21:05:58 2010 +0200 @@ -16,7 +16,6 @@ # Firefox patches firefox-libxul-sdk.patch -firefox-credits.patch firefox-linkorder.patch firefox-browser-css.patch firefox-cross-desktop.patch @@ -26,4 +25,3 @@ firefox-no-sync-l10n.patch firefox-sync-system-nss.patch firefox-sync-build.patch -firefox-tabview.patch