diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 609ca41..d3a1d9a 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jul 14 19:31:51 UTC 2012 - wr@rosenauer.org + +- update to 14.0.1 (bnc#) +- license change from tri license to MPL-2.0 +- fix crashreporter restart option (bmo#762780) +- reenabled mozilla-yarr-pcre.patch to fix build for PPC +- require NSS 3.13.5 +- remove mozjs pacrunner obsoletes again for now +- adopted mozilla-prefer_plugin_pref.patch + ------------------------------------------------------------------- Fri Jun 15 12:37:09 UTC 2012 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index d143962..fd3638f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,7 +17,7 @@ # -%define major 13 +%define major 14 %define mainver %major.0.1 %define update_channel release @@ -45,11 +45,16 @@ BuildRequires: libproxy-devel BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.9.0 -BuildRequires: mozilla-nss-devel >= 3.13.4 +BuildRequires: mozilla-nss-devel >= 3.13.5 BuildRequires: nss-shared-helper-devel +%if %suse_version > 1140 +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-app-0.10) +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +%endif Version: %{mainver} Release: 0 -%define releasedate 2012061400 +%define releasedate 2012071300 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -59,7 +64,7 @@ Provides: browser(npapi) %define kde_helper_version 6 Provides: mozilla-kde4-version = %{kde_helper_version} Summary: Mozilla Firefox Web Browser -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ Source: firefox-%{version}-source.tar.bz2 @@ -88,23 +93,18 @@ Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch Patch10: mozilla-dump_syms-static.patch Patch11: mozilla-sle11.patch -Patch12: mozilla-linux3.patch -Patch14: mozilla-disable-neon-option.patch -Patch15: mozilla-yarr-pcre.patch -Patch16: mozilla-system-nspr.patch -Patch17: mozilla-revert_621446.patch -Patch18: mozilla-libnotify.patch -Patch19: mozilla-gcc47.patch -Patch20: mozilla-nsSound.patch -Patch21: mozilla-arm-disable-edsp.patch +Patch12: mozilla-disable-neon-option.patch +Patch13: mozilla-yarr-pcre.patch +Patch14: mozilla-gcc47.patch +Patch15: mozilla-arm-disable-edsp.patch +Patch16: mozilla-crashreporter-restart-args.patch # Firefox/browser -Patch31: firefox-browser-css.patch -Patch32: firefox-cross-desktop.patch -Patch33: firefox-kde.patch -Patch34: firefox-kde-114.patch -Patch38: firefox-no-default-ualocale.patch -Patch39: firefox-multilocale-chrome.patch -Patch41: firefox-branded-icons.patch +Patch30: firefox-browser-css.patch +Patch31: firefox-kde.patch +Patch32: firefox-kde-114.patch +Patch33: firefox-no-default-ualocale.patch +Patch34: firefox-multilocale-chrome.patch +Patch35: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -112,8 +112,6 @@ Requires: %{name}-branding > 4.0 Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 -# libproxy's mozjs pacrunner crashes FF (bnc#759123) -Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} @@ -135,10 +133,6 @@ Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 %else %define crashreporter 1 %endif -# temporary gcc 4.7 -%if %suse_version > 1210 -%define crashreporter 0 -%endif ### build options end %description @@ -173,7 +167,7 @@ of MozillaFirefox. %package translations-other Summary: Extra translations for MozillaFirefox Group: System/Localization -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -229,27 +223,22 @@ cd $RPM_BUILD_DIR/mozilla %if %suse_version < 1120 %patch11 -p1 %endif -%patch12 -p1 +#%patch12 -p1 +%patch13 -p1 %patch14 -p1 -#%patch15 -p1 +%patch15 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 # -%patch31 -p1 -%patch32 -p1 +%patch30 -p1 %if %suse_version >= 1110 -%patch33 -p1 +%patch31 -p1 %endif %if %suse_version >= 1140 -%patch34 -p1 +%patch32 -p1 %endif -%patch38 -p1 -%patch39 -p1 -%patch41 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 %build # no need to add build time to binaries @@ -308,6 +297,11 @@ ac_add_options --disable-gnomevfs ac_add_options --enable-gio EOF %endif +%if %suse_version > 1140 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-gstreamer +EOF +%endif %if %branding cat << EOF >> $MOZCONFIG ac_add_options --enable-official-branding @@ -333,11 +327,10 @@ make -f client.mk build %install cd $RPM_BUILD_DIR/obj -rm dist/bin/defaults/pref/firefox-l10n.js source %{SOURCE5} export MOZ_SOURCE_STAMP=$REV export MOZ_SOURCE_REPO=$REPO -make -C browser/installer STRIP=/bin/true +make -C browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 #DEBUG (break the build if searchplugins are missing / temporary) grep amazondotcom dist/firefox/omni.ja # copy tree into RPM_BUILD_ROOT @@ -444,7 +437,6 @@ rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE rm -f $RPM_BUILD_ROOT%{progdir}/precomplete rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* -rm -f $RPM_BUILD_ROOT%{progdir}/firefox rm -f $RPM_BUILD_ROOT%{progdir}/update-settings.ini # devel mkdir -p %{buildroot}%{_bindir} @@ -552,6 +544,7 @@ exit 0 %{progdir}/jssubloader/ %{progdir}/searchplugins/ %attr(755,root,root) %{progdir}/%{progname}.sh +%{progdir}/firefox %{progdir}/firefox-bin %{progdir}/add-plugins.sh %{progdir}/application.ini diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 80e3c70..6334ed9 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e24152dcf3644463541fda529b3b90e690e27a2964159548183a3613d446848 -size 29356 +oid sha256:c5db07512eadf48bc052e496c603bde33899193b61d2cfb478869875ab90f01b +size 29352 diff --git a/create-tar.sh b/create-tar.sh index 677dfbb..1e02f7a 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_13_0_1_RELEASE" -VERSION="13.0.1" +RELEASE_TAG="FIREFOX_14_0_1_RELEASE" +VERSION="14.0.1" # mozilla echo "cloning $BRANCH..." diff --git a/firefox-13.0.1-source.tar.bz2 b/firefox-13.0.1-source.tar.bz2 deleted file mode 100644 index 0785b53..0000000 --- a/firefox-13.0.1-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfef0e76444bc082f7b1c08f2551e62c2f44ebd736e88777b280b05c6f5a32b3 -size 79546704 diff --git a/firefox-14.0.1-source.tar.bz2 b/firefox-14.0.1-source.tar.bz2 new file mode 100644 index 0000000..b6681d8 --- /dev/null +++ b/firefox-14.0.1-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4a2a21aad66f5ae0c0fe769fc3c4914168b9d45568c1e1100f16ceef4d229b9 +size 82284070 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index bf71014..40b2625 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 4a29f791f190ebb5de41590d70d52c7510d9477c +# Parent 7f0b0738f036cd9d2e51c51c3552dc608ac598f9 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -160,16 +160,21 @@ endif - endif # LIBXUL_SDK + endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: @@ -23,9 +23,9 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in libs:: $(srcdir)/profile/prefs.js $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile - libs:: $(srcdir)/blocklist.xml - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin - + ifndef LIBXUL_SDK + # channel-prefs.js is handled separate from other prefs due to bug 756325 + libs:: $(srcdir)/profile/channel-prefs.js diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M 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 -@@ -450,18 +450,21 @@ +@@ -476,18 +476,21 @@ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch index ab9aaf0..a72cbe0 100644 --- a/firefox-browser-css.patch +++ b/firefox-browser-css.patch @@ -9,12 +9,12 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027 diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css --- a/browser/themes/gnomestripe/browser.css +++ b/browser/themes/gnomestripe/browser.css -@@ -1016,16 +1016,30 @@ toolbar[iconsize="small"] #feed-button { - } +@@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button { #urlbar-display { margin-top: 0; margin-bottom: 0; + -moz-margin-start: 0; color: GrayText; } @@ -36,7 +36,7 @@ diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe #page-proxy-favicon { width: 16px; height: 16px; - margin: 2px 4px; - } - - #page-proxy-favicon:not([src]) { + margin-top: 2px; + margin-bottom: 2px; + -moz-margin-start: 4px; + -moz-margin-end: 3px; diff --git a/firefox-cross-desktop.patch b/firefox-cross-desktop.patch deleted file mode 100644 index 816dd72..0000000 --- a/firefox-cross-desktop.patch +++ /dev/null @@ -1,91 +0,0 @@ -# HG changeset patch -# Parent fd2da289a3c15b8c96c248df2710d879793f22c9 -# User Wolfgang Rosenauer -Bug 526717 - remove non-working "Set as desktop background" from the UI for unsupported desktops - -diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js ---- a/browser/base/content/nsContextMenu.js -+++ b/browser/base/content/nsContextMenu.js -@@ -262,17 +262,17 @@ nsContextMenu.prototype = { - - // Set as Desktop background depends on whether an image was clicked on, - // and only works if we have a shell service. - var haveSetDesktopBackground = false; - #ifdef HAVE_SHELL_SERVICE - // Only enable Set as Desktop Background if we can get the shell service. - var shell = getShellService(); - if (shell) -- haveSetDesktopBackground = true; -+ haveSetDesktopBackground = shell.canSetDesktopBackground; - #endif - this.showItem("context-setDesktopBackground", - haveSetDesktopBackground && this.onLoadedImage); - - if (haveSetDesktopBackground && this.onLoadedImage) { - document.getElementById("context-setDesktopBackground") - .disabled = this.disableSetDesktopBackground(); - } -diff --git a/browser/components/shell/public/nsIShellService.idl b/browser/components/shell/public/nsIShellService.idl ---- a/browser/components/shell/public/nsIShellService.idl -+++ b/browser/components/shell/public/nsIShellService.idl -@@ -69,16 +69,25 @@ interface nsIShellService : nsISupports - /** - * Used to determine whether or not to show a "Set Default Browser" - * query dialog. This attribute is true if the application is starting - * up and "browser.shell.checkDefaultBrowser" is true, otherwise it - * is false. - */ - attribute boolean shouldCheckDefaultBrowser; - -+ /** -+ * Used to determine whether or not to offer "Set as desktop background" -+ * context menu item. Even if shell service is available it is not -+ * guaranteed that it is able to set the background for every desktop -+ * which is especially true for Linux with its many different desktop -+ * environments. -+ */ -+ readonly attribute boolean canSetDesktopBackground; -+ - /** - * Flags for positioning/sizing of the Desktop Background image. - */ - const long BACKGROUND_TILE = 1; - const long BACKGROUND_STRETCH = 2; - const long BACKGROUND_CENTER = 3; - const long BACKGROUND_FILL = 4; - const long BACKGROUND_FIT = 5; -diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp ---- a/browser/components/shell/src/nsGNOMEShellService.cpp -+++ b/browser/components/shell/src/nsGNOMEShellService.cpp -@@ -377,16 +377,31 @@ nsGNOMEShellService::SetShouldCheckDefau - pserve->GetBranch("", getter_AddRefs(prefs)); - - if (prefs) - prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); - - return NS_OK; - } - -+NS_IMETHODIMP -+nsGNOMEShellService::GetCanSetDesktopBackground(bool* aResult) -+{ -+ // setting desktop background is currently only supported -+ // for Gnome or desktops using the same GSettings and GConf keys -+ const char* gnomeSession = getenv("GNOME_DESKTOP_SESSION_ID"); -+ if (gnomeSession) { -+ *aResult = true; -+ } else { -+ *aResult = false; -+ } -+ -+ return NS_OK; -+} -+ - static nsresult - WriteImage(const nsCString& aPath, imgIContainer* aImage) - { - #ifndef MOZ_WIDGET_GTK2 - return NS_ERROR_NOT_AVAILABLE; - #else - nsCOMPtr imgToPixbuf = - do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); diff --git a/firefox-kde.patch b/firefox-kde.patch index 892a0b3..73711b1 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1116 @@ +@@ -0,0 +1,1122 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -99,6 +99,7 @@ new file mode 100644 + macanimationtype="document" + screenX="4" screenY="4" + browsingmode="normal" ++ fullscreenbutton="true" + persist="screenX screenY width height sizemode"> + +# All JS files which are not content (only) dependent that browser.xul @@ -533,6 +534,7 @@ new file mode 100644 + + + ++ + + + + +