diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 0908f83..f68aaf8 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,7 +1,17 @@ +------------------------------------------------------------------- +Sat Jun 22 17:48:06 UTC 2013 - wr@rosenauer.org + +- update to Firefox 22.0 (bnc#825935) + * removed obsolete patches + + mozilla-qcms-ppc.patch + + mozilla-gstreamer-760140.patch + * GStreamer support does not build on 12.1 anymore (build only + on 12.2 and later) + ------------------------------------------------------------------- Tue Jun 11 21:06:58 UTC 2013 - dvaleev@suse.com -- Fix qcms altivec include (mozilla-qcms-ppc.patch) +- Fix qcms altivec include (mozilla-qcms-ppc.patch) ------------------------------------------------------------------- Fri May 10 05:25:39 UTC 2013 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 4309f6e..7f34911 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,7 +17,7 @@ # -%define major 21 +%define major 22 %define mainver %major.0 %define update_channel release @@ -53,14 +53,14 @@ BuildRequires: wireless-tools BuildRequires: mozilla-nspr-devel >= 4.9.6 BuildRequires: mozilla-nss-devel >= 3.14.3 BuildRequires: nss-shared-helper-devel -%if %suse_version > 1140 +%if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif Version: %{mainver} Release: 0 -%define releasedate 2013051000 +%define releasedate 2013062200 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -101,10 +101,7 @@ Patch9: mozilla-repo.patch Patch10: mozilla-sle11.patch Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch -Patch14: mozilla-gstreamer-760140.patch -Patch15: mozilla-libproxy-compat.patch -#PATCH-FIX-UPSTREAM - dvaleev@suse.com - fix qcms altivec on powerpc -Patch16: mozilla-qcms-ppc.patch +Patch14: mozilla-libproxy-compat.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -236,8 +233,6 @@ cd $RPM_BUILD_DIR/mozilla %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch16 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -311,7 +306,7 @@ ac_add_options --disable-gnomevfs ac_add_options --enable-gio EOF %endif -%if %suse_version > 1140 +%if %suse_version > 1210 cat << EOF >> $MOZCONFIG ac_add_options --enable-gstreamer EOF @@ -558,6 +553,7 @@ exit 0 %{progdir}/browser/defaults %{progdir}/browser/icons/ %{progdir}/browser/chrome/icons +#%{progdir}/browser/distribution/ %{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/browser/searchplugins/ %{progdir}/browser/blocklist.xml diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 8ba15d3..a99e15b 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:a6b38994b271f8498932fff247fca46f9c629d2dd571027fdf5091153c88e13a -size 29950 +oid sha256:a468c61153c99687cbed6e5e6554e7faf61005a35e6a08a119b623d08c6c4018 +size 29912 diff --git a/create-tar.sh b/create-tar.sh index 2ea5cda..414d7ef 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_21_0_RELEASE" -VERSION="21.0" +RELEASE_TAG="FIREFOX_22_0_RELEASE" +VERSION="22.0" # mozilla if [ -d mozilla ]; then diff --git a/firefox-21.0-source.tar.bz2 b/firefox-21.0-source.tar.bz2 deleted file mode 100644 index 7bad723..0000000 --- a/firefox-21.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a8d8467808cb7a80eeef50492fe4c7e707cdfd3e5d268d71edddfea1924fbbe -size 106610208 diff --git a/firefox-22.0-source.tar.bz2 b/firefox-22.0-source.tar.bz2 new file mode 100644 index 0000000..e6df16a --- /dev/null +++ b/firefox-22.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc2f8ebd513c6a99ddb09f36d8bf20ca2aa1f7445d088dccbfaa2293939141f9 +size 112536902 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 18929d7..9e2763a 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,10 +1,10 @@ # HG changeset patch -# Parent ad0e2fcaa00769bc56cc2b58d1264209f8c32623 +# Parent c2eac57908647987ed11893ad45262a32122dff4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -132,16 +132,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -134,16 +134,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -29,7 +29,7 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in 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 -@@ -47,18 +47,21 @@ BRANDING_FILES := \ +@@ -42,18 +42,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) @@ -54,13 +54,13 @@ 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 -@@ -558,18 +558,21 @@ - @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png - #ifdef SHIP_FEEDBACK +@@ -572,18 +572,21 @@ @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest + @BINPATH@/chrome/recording.manifest + @BINPATH@/chrome/recording/* #ifdef MOZ_GTK2 @BINPATH@/browser/chrome/icons/default/default16.png +@BINPATH@/browser/chrome/icons/default/default22.png diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch index a72cbe0..2f28531 100644 --- a/firefox-browser-css.patch +++ b/firefox-browser-css.patch @@ -6,9 +6,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478632 wr: changed because of 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 +diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css +--- a/browser/themes/linux/browser.css ++++ b/browser/themes/linux/browser.css @@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button { #urlbar-display { diff --git a/firefox-kde.patch b/firefox-kde.patch index cddce15..9842ed7 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,1216 @@ +@@ -0,0 +1,1225 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -119,7 +119,7 @@ new file mode 100644 + onpopupshowing="return FillHistoryMenu(event.target);" + oncommand="gotoHistoryIndex(event); event.stopPropagation();" + onclick="checkForMiddleClick(this, event);"/> -+ ++ + + +