From f9f24f9c98c29d6c584e9fae1430f9fff07e82eb977af1594c4d0a3afcd7c684 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 7 May 2018 08:31:01 +0000 Subject: [PATCH 1/5] Accepting request 603791 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Fix armv7 build by: * adding RUSTFLAGS="-Cdebuginfo=0" * updating _constraints for %arm OBS-URL: https://build.opensuse.org/request/show/603791 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=654 --- MozillaFirefox.changes | 7 +++++++ MozillaFirefox.spec | 7 +++++++ _constraints | 11 +---------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 057dbd1..443adab 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 3 14:33:37 UTC 2018 - guillaume.gardet@opensuse.org + +- Fix armv7 build by: + * adding RUSTFLAGS="-Cdebuginfo=0" + * updating _constraints for %arm + ------------------------------------------------------------------- Wed May 2 20:46:37 UTC 2018 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 593167d..08bad11 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -321,6 +321,9 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now" export CFLAGS="$CFLAGS -mminimal-toc" %endif export CXXFLAGS="$CFLAGS" +%ifarch %{arm} +export RUSTFLAGS="-Cdebuginfo=0" +%endif export MOZCONFIG=$RPM_BUILD_DIR/mozconfig cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 @@ -375,8 +378,12 @@ ac_add_options --disable-crashreporter %ifarch %arm ac_add_options --with-fpu=vfpv3-d16 ac_add_options --with-float-abi=hard +%ifarch armv6l armv6hl +ac_add_options --with-arch=armv6 +%else ac_add_options --with-arch=armv7-a %endif +%endif %ifarch %arm s390x ac_add_options --disable-webrtc %endif diff --git a/_constraints b/_constraints index 7821a87..0306741 100644 --- a/_constraints +++ b/_constraints @@ -10,19 +10,10 @@ + aarch64 armv6l armv7l - - - 2600 - - - - - - aarch64 - 9 From 0344382ac87999bd90c31cdbab5c0509937bf3f5702dd24347c8a6dec6804744 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 8 May 2018 13:14:23 +0000 Subject: [PATCH 2/5] - update to Firefox 60.0 * Added a policy engine that allows customized Firefox deployments in enterprise environments, using Windows Group Policy or a cross-platform JSON file * Applied Quantum CSS to render browser UI * Added support for Web Authentication, allowing the use of USB tokens for authentication to web sites * Locale added: Occitan (oc) - removed obsolete patches 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch - requires NSPR 4.19 and NSS 3.36.1 - requires rust 1.24 or higher OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=655 --- ...TC-fails-to-build-with-GCC-8-r-dmino.patch | 47 -- MozillaFirefox.changes | 16 + MozillaFirefox.spec | 30 +- _constraints | 11 +- compare-locales.tar.xz | 4 +- create-tar.sh | 4 +- firefox-59.0.3-source.tar.xz | 3 - firefox-60.0-source.tar.xz | 3 + firefox-kde.patch | 120 ++- l10n-59.0.3.tar.xz | 3 - l10n-60.0.tar.xz | 3 + mozilla-bmo1005535.patch | 123 ---- mozilla-enable-csd.patch | 684 +++++++++++++++--- mozilla-i586-domPrefs.patch | 10 +- mozilla-kde.patch | 82 ++- ...lla-reduce-files-per-UnifiedBindings.patch | 36 +- source-stamp.txt | 2 +- 17 files changed, 797 insertions(+), 384 deletions(-) delete mode 100644 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch delete mode 100644 firefox-59.0.3-source.tar.xz create mode 100644 firefox-60.0-source.tar.xz delete mode 100644 l10n-59.0.3.tar.xz create mode 100644 l10n-60.0.tar.xz delete mode 100644 mozilla-bmo1005535.patch diff --git a/0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch b/0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch deleted file mode 100644 index f38eba0..0000000 --- a/0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 38a3ee1f792f586aef412ebc04980a93825612c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Mon, 5 Feb 2018 09:46:44 -0500 -Subject: [PATCH] Bug 1435695 - WebRTC fails to build with GCC 8; r=dminor - ---HG-- -extra : rebase_source : d26e183b2082fa4f88ce3b837e2db5fc8acbff5b ---- - media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c | 5 +++-- - .../webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c b/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c -index 0340165eb505..d09314720ddd 100644 ---- a/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c -+++ b/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c -@@ -115,8 +115,9 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset, - // undefined behavior, so not a good idea; this just makes UBSan ignore the - // violation, so that our old code can continue to do what it's always been - // doing.) --static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) -- RTC_NO_SANITIZE("signed-integer-overflow") { -+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") -+OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) -+{ - return a * b; - } - -diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c -index 2b92acb64a3d..c10014f6a108 100644 ---- a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c -+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c -@@ -209,8 +209,9 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef, - // Left shift of an int32_t that's allowed to overflow. (It's still undefined - // behavior, so not a good idea; this just makes UBSan ignore the violation, so - // that our old code can continue to do what it's always been doing.) --static inline int32_t OverflowingLShiftS32(int32_t x, int shift) -- RTC_NO_SANITIZE("shift") { -+static inline int32_t RTC_NO_SANITIZE("shift") -+OverflowingLShiftS32(int32_t x, int shift) -+{ - return x << shift; - } - --- -2.16.3 - diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 443adab..fee6dd1 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon May 7 08:32:28 UTC 2018 - wr@rosenauer.org + +- update to Firefox 60.0 + * Added a policy engine that allows customized Firefox deployments + in enterprise environments, using Windows Group Policy or a + cross-platform JSON file + * Applied Quantum CSS to render browser UI + * Added support for Web Authentication, allowing the use of USB + tokens for authentication to web sites + * Locale added: Occitan (oc) +- removed obsolete patches + 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch +- requires NSPR 4.19 and NSS 3.36.1 +- requires rust 1.24 or higher + ------------------------------------------------------------------- Thu May 3 14:33:37 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 08bad11..125cfc0 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,11 +18,11 @@ # changed with every update -%define major 59 -%define mainver %major.0.3 +%define major 60 +%define mainver %major.0 %define update_channel release %define branding 1 -%define releasedate 20180340000000 +%define releasedate 20180503143129 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -70,11 +70,11 @@ BuildRequires: libiw-devel BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.18 -BuildRequires: mozilla-nss-devel >= 3.35 +BuildRequires: mozilla-nspr-devel >= 4.19 +BuildRequires: mozilla-nss-devel >= 3.36.1 BuildRequires: python-devel BuildRequires: python2-xml -BuildRequires: rust >= 1.22.1 +BuildRequires: rust >= 1.24 BuildRequires: rust-std BuildRequires: startup-notification-devel BuildRequires: unzip @@ -150,11 +150,9 @@ Patch5: mozilla-no-stdcxx-check.patch Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch -Patch9: mozilla-bmo1005535.patch -Patch10: mozilla-i586-DecoderDoctorLogger.patch -Patch11: mozilla-i586-domPrefs.patch -Patch12: mozilla-enable-csd.patch -Patch13: 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch +Patch9: mozilla-i586-DecoderDoctorLogger.patch +Patch10: mozilla-i586-domPrefs.patch +Patch11: mozilla-enable-csd.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -208,7 +206,7 @@ of %{appname}. %package translations-other Summary: Extra translations for %{appname} Group: System/Localization -Provides: locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;ne-NP;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) +Provides: locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;ne-NP;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -265,13 +263,11 @@ cd $RPM_BUILD_DIR/mozilla %endif %patch7 -p1 %patch8 -p1 -%patch9 -p1 %ifarch %ix86 +%patch9 -p1 %patch10 -p1 -%patch11 -p1 %endif -%patch12 -p1 -%patch13 -p1 +%patch11 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -596,7 +592,7 @@ exit 0 %{progdir}/application.ini %{progdir}/chrome.manifest %{progdir}/dependentlibs.list -%{progdir}/icudt*.dat +#%{progdir}/icudt*.dat %{progdir}/*.so %{progdir}/omni.ja %{progdir}/fonts/ diff --git a/_constraints b/_constraints index 0306741..7821a87 100644 --- a/_constraints +++ b/_constraints @@ -10,10 +10,19 @@ - aarch64 armv6l armv7l + + + 2600 + + + + + + aarch64 + 9 diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index ac1daa1..b799ae2 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37774ab800fa0eb9045c834ebe7ada3cd82b866c3ef00c23cd7abac312e414ac -size 28864 +oid sha256:971053a42b39417bb7d549e3de0d4b267732bb961e5178bbc3a2340b58f84b31 +size 28368 diff --git a/create-tar.sh b/create-tar.sh index de400b9..f19a082 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_59_0_3_RELEASE" -VERSION="59.0.3" +RELEASE_TAG="ea4f3168c604994f051644b467aad92723448d12" +VERSION="60.0" # check required tools test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 ) diff --git a/firefox-59.0.3-source.tar.xz b/firefox-59.0.3-source.tar.xz deleted file mode 100644 index 094f58c..0000000 --- a/firefox-59.0.3-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c64851cc34baa35b54680d4339d940dbd81ec297c78b1ac1b57d3b6b5271a92b -size 270321944 diff --git a/firefox-60.0-source.tar.xz b/firefox-60.0-source.tar.xz new file mode 100644 index 0000000..f7083ce --- /dev/null +++ b/firefox-60.0-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f298fbe76fb70fb80aba87d9f6febe81b702b397f17a008dc124db632197516e +size 283237956 diff --git a/firefox-kde.patch b/firefox-kde.patch index f81ad40..6c57040 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent ffcd96e120857e207bd357b2005f0b5bc776e375 +# Parent 1b44c077e473c5a7d02fab26e2a220ebf219e0ab diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1238 @@ +@@ -0,0 +1,1280 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -15,14 +15,15 @@ new file mode 100644 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + ++ + + + + ++ + ++ + -+ -+ + + +# All DTD information is stored in a separate file so that it can be shared by @@ -59,7 +60,6 @@ new file mode 100644 + tabsintitlebar="true" +#endif + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" -+ lightweightthemes="true" + windowtype="navigator:browser" + macanimationtype="document" + screenX="4" screenY="4" @@ -75,6 +75,7 @@ new file mode 100644 + + + +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the @@ -104,8 +105,9 @@ new file mode 100644 + accesskey="&moveToNewWindow.accesskey;" + tbattr="tabbrowser-multiple" + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> -+ ++ + + @@ -144,6 +146,7 @@ new file mode 100644 + + @@ -1196,13 +1223,28 @@ new file mode 100644 +