diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index e05511f..09e33c2 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Apr 21 10:02:37 UTC 2012 - wr@rosenauer.org + +- update to Firefox 12.0 (bnc#758408) + * rebased patches +- added mozilla-libnotify.patch to allow fallback from libnotify + to xul based events if no notification-daemon is running +- gcc 4.7 fixes + * mozilla-gcc47.patch + * disabled crashreporter temporarily for Factory +- recommend libcanberra0 for proper sound notifications + ------------------------------------------------------------------- Fri Mar 9 21:47:07 UTC 2012 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 5835997..b1f67a8 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,8 +17,9 @@ # -%define major 11 +%define major 12 %define mainver %major.0 +%define update_channel release Name: MozillaFirefox BuildRequires: Mesa-devel @@ -48,7 +49,7 @@ BuildRequires: mozilla-nss-devel >= 3.13.3 BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 0 -%define releasedate 2012031200 +%define releasedate 2012042100 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -90,7 +91,9 @@ Patch11: mozilla-sle11.patch Patch12: mozilla-linux3.patch Patch14: mozilla-disable-neon-option.patch Patch15: mozilla-yarr-pcre.patch -Patch16: mozilla-sle11-gcc.patch +Patch16: mozilla-revert_621446.patch +Patch17: mozilla-libnotify.patch +Patch18: mozilla-gcc47.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -105,6 +108,7 @@ Requires(postun): shared-mime-info desktop-file-utils 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 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} @@ -122,9 +126,13 @@ Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %define branding 1 %define localize 1 %ifarch ppc ppc64 s390 s390x ia64 %arm -%define crashreporter 0 +%define crashreporter 0 %else -%define crashreporter 1 +%define crashreporter 1 +%endif +# temporary gcc 4.7 +%if %suse_version > 1210 +%define crashreporter 0 %endif ### build options end @@ -160,7 +168,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;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;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;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;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -220,6 +228,8 @@ cd $RPM_BUILD_DIR/mozilla %patch14 -p1 #%patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 # %patch31 -p1 %patch32 -p1 @@ -282,7 +292,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=release +ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -320,6 +330,8 @@ source %{SOURCE5} export MOZ_SOURCE_STAMP=$REV export MOZ_SOURCE_REPO=$REPO make -C browser/installer STRIP=/bin/true +#DEBUG (break the build if searchplugins are missing / temporary) +grep amazondotcom dist/firefox/omni.ja # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{progdir} cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} @@ -354,8 +366,9 @@ for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org - # remove prefs and profile defaults from langpack + # remove prefs, profile defaults, and hyphenation from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults + rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/hyphenation # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do @@ -424,6 +437,7 @@ 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} install -m 755 %SOURCE12 %{buildroot}%{_bindir} diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 2ae0a8e..2a46cdd 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:d9cec169c349f8b2e9a51fb2d2ff34057389b6d3c7212c52fae8fc94b00334e5 -size 29341 +oid sha256:bd133c57e1e6c71dda3d593853125ab27073ab32bafd568fe441baff47c3a32d +size 29339 diff --git a/create-tar.sh b/create-tar.sh index c661f2c..c89460a 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,10 +2,11 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0_RELEASE" -VERSION="11.0" +RELEASE_TAG="FIREFOX_12_0_RELEASE" +VERSION="12.0" # mozilla +echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH mozilla pushd mozilla [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG @@ -15,23 +16,28 @@ hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt echo -n "REPO=" >> ../source-stamp.txt hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd +echo "creating archive..." tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n +echo "fetching locales..." test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; *) + echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done +echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales +echo "creating compare-locales" hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales diff --git a/firefox-11.0-source.tar.bz2 b/firefox-11.0-source.tar.bz2 deleted file mode 100644 index 44b112c..0000000 --- a/firefox-11.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23c3ba10be3b43b576411b597d4c699f611357cfa813f4debf779355261fe4d2 -size 78236937 diff --git a/firefox-12.0-source.tar.bz2 b/firefox-12.0-source.tar.bz2 new file mode 100644 index 0000000..c0e1472 --- /dev/null +++ b/firefox-12.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b78faebdac7c27c203f50965280b5b0332f3cc72b37106d201eaa09516b98ef +size 78962014 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 9836780..f8576da 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,10 +1,10 @@ # HG changeset patch -# Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de +# Parent d6bb5c163142d233d00e739e21aa9df16077873e diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -169,16 +169,21 @@ endif # LIBXUL_SDK +@@ -164,16 +164,21 @@ endif # LIBXUL_SDK DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -54,14 +54,14 @@ 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 -@@ -424,18 +424,21 @@ +@@ -432,18 +432,21 @@ + @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest - #ifdef XP_UNIX - #ifndef XP_MACOSX + #ifdef MOZ_GTK2 @BINPATH@/chrome/icons/default/default16.png +@BINPATH@/chrome/icons/default/default22.png +@BINPATH@/chrome/icons/default/default24.png @@ -69,10 +69,10 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m @BINPATH@/chrome/icons/default/default48.png +@BINPATH@/chrome/icons/default/default256.png #endif - #endif - ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX @BINPATH@/icons/*.xpm + @BINPATH@/icons/*.png + #endif diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch index 6fc3119..ab9aaf0 100644 --- a/firefox-browser-css.patch +++ b/firefox-browser-css.patch @@ -9,7 +9,7 @@ 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 -@@ -1018,16 +1018,30 @@ toolbar[iconsize="small"] #feed-button { +@@ -1016,16 +1016,30 @@ toolbar[iconsize="small"] #feed-button { } #urlbar-display { @@ -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-stack { - width: 24px; + #page-proxy-favicon:not([src]) { diff --git a/firefox-kde.patch b/firefox-kde.patch index dec4d11..9d5ad06 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,1125 @@ +@@ -0,0 +1,1118 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -396,27 +396,27 @@ new file mode 100644 + +