From 5048a922bb029728c7c196d08e28e94232897add9d7bde88612f4a7e0b394e55 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 29 Oct 2018 14:09:04 +0000 Subject: [PATCH 1/7] Accepting request 644806 from home:Guillaume_G:branches:mozilla:Factory - Update _constraints for armv6/7 - Add patch to fix build on armv7: * mozilla-bmo1463035.patch OBS-URL: https://build.opensuse.org/request/show/644806 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=690 --- MozillaFirefox.changes | 11 ++++ MozillaFirefox.spec | 4 +- _constraints | 9 --- mozilla-bmo1463035.patch | 130 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 10 deletions(-) create mode 100644 mozilla-bmo1463035.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 5ef6c12..9fc860d 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 25 14:39:04 UTC 2018 - Guillaume GARDET + +- Update _constraints for armv6/7 + +------------------------------------------------------------------- +Thu Oct 25 08:50:24 UTC 2018 - Guillaume GARDET + +- Add patch to fix build on armv7: + * mozilla-bmo1463035.patch + ------------------------------------------------------------------- Tue Oct 2 21:28:31 UTC 2018 - astieger@suse.com diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index fee692c..57e4a34 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -160,6 +160,7 @@ Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch Patch9: mozilla-no-return.patch +Patch10: mozilla-bmo1463035.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -270,6 +271,7 @@ cd $RPM_BUILD_DIR/%{source_prefix} %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/_constraints b/_constraints index 7821a87..03d5c58 100644 --- a/_constraints +++ b/_constraints @@ -12,15 +12,6 @@ armv6l armv7l - - - - 2600 - - - - - aarch64 diff --git a/mozilla-bmo1463035.patch b/mozilla-bmo1463035.patch new file mode 100644 index 0000000..039f039 --- /dev/null +++ b/mozilla-bmo1463035.patch @@ -0,0 +1,130 @@ + +# HG changeset patch +# User Mike Hommey +# Date 1526871862 -32400 +# Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43 +# Parent 1800b8895c08bc0c60302775dc0a4b5ea4deb310 +Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons + +For some reason, GNU as is not happy with the assembly generated after +bug 1238661 anymore on Debian armel. + +OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this +workaround anymore, so let's just kill it. + + +diff --git a/mfbt/LinuxSignal.h b/mfbt/LinuxSignal.h +deleted file mode 100644 +--- a/mfbt/LinuxSignal.h ++++ /dev/null +@@ -1,45 +0,0 @@ +-/* This Source Code Form is subject to the terms of the Mozilla Public +- * License, v. 2.0. If a copy of the MPL was not distributed with this +- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +- +-#ifndef mozilla_LinuxSignal_h +-#define mozilla_LinuxSignal_h +- +-namespace mozilla { +- +-#if defined(__arm__) +- +-// Some (old) Linux kernels on ARM have a bug where a signal handler +-// can be called without clearing the IT bits in CPSR first. The result +-// is that the first few instructions of the handler could be skipped, +-// ultimately resulting in crashes. To workaround this bug, the handler +-// on ARM is a trampoline that starts with enough NOP instructions, so +-// that even if the IT bits are not cleared, only the NOP instructions +-// will be skipped over. +- +-template +-__attribute__((naked)) void +-SignalTrampoline(int aSignal, siginfo_t* aInfo, void* aContext) +-{ +- asm volatile ( +- "nop; nop; nop; nop" +- : : : "memory"); +- +- asm volatile ( +- "b %0" +- : +- : "X"(H) +- : "memory"); +-} +- +-# define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) +- +-#else // __arm__ +- +-# define MOZ_SIGNAL_TRAMPOLINE(h) (h) +- +-#endif // __arm__ +- +-} // namespace mozilla +- +-#endif // mozilla_LinuxSignal_h +diff --git a/mfbt/moz.build b/mfbt/moz.build +--- a/mfbt/moz.build ++++ b/mfbt/moz.build +@@ -117,20 +117,16 @@ EXPORTS["double-conversion"] = [ + LOCAL_INCLUDES += [ + '/mfbt/double-conversion', + ] + + if CONFIG['OS_ARCH'] == 'WINNT': + EXPORTS.mozilla += [ + 'WindowsVersion.h', + ] +-elif CONFIG['OS_ARCH'] == 'Linux': +- EXPORTS.mozilla += [ +- 'LinuxSignal.h', +- ] + + UNIFIED_SOURCES += [ + 'Assertions.cpp', + 'ChaosMode.cpp', + 'double-conversion/double-conversion/bignum-dtoa.cc', + 'double-conversion/double-conversion/bignum.cc', + 'double-conversion/double-conversion/cached-powers.cc', + 'double-conversion/double-conversion/diy-fp.cc', +diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp +--- a/tools/profiler/core/platform-linux-android.cpp ++++ b/tools/profiler/core/platform-linux-android.cpp +@@ -55,17 +55,16 @@ + #ifdef __GLIBC__ + #include // backtrace, backtrace_symbols + #endif // def __GLIBC__ + #include // index + #include + #include + + #include "prenv.h" +-#include "mozilla/LinuxSignal.h" + #include "mozilla/PodOperations.h" + #include "mozilla/DebugOnly.h" + + #include + #include + + using namespace mozilla; + +@@ -272,17 +271,17 @@ Sampler::Sampler(PSLockRef aLock) + + // NOTE: We don't initialize LUL here, instead initializing it in + // SamplerThread's constructor. This is because with the + // profiler_suspend_and_sample_thread entry point, we want to be able to + // sample without waiting for LUL to be initialized. + + // Request profiling signals. + struct sigaction sa; +- sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); ++ sa.sa_sigaction = SigprofHandler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART | SA_SIGINFO; + if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { + MOZ_CRASH("Error installing SIGPROF handler in the profiler"); + } + } + + void + From 6bbb36ffe929fd30d81d0b59f23226427265d9918d8933683ebe49794cbfd2f1 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 29 Oct 2018 15:21:53 +0000 Subject: [PATCH 2/7] - update to Firefox 63.0 * WebExtensions now run in their own process on Linux * The Ctrl+Tab shortcut now displays thumbnail previews of your tabs and cycles through tabs in recently used order. This new default behavior is activated only in new profiles and can be changed in preferences. * Added support for Web Components custom elements and shadow DOM - requires NSPR 4.20, NSS 3.39 and Rust 1.28 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=691 --- MozillaFirefox.changes | 16 +- MozillaFirefox.spec | 20 +-- compare-locales.tar.xz | 4 +- create-tar.sh | 4 +- firefox-62.0.3.source.tar.xz | 3 - firefox-62.0.3.source.tar.xz.asc | 17 --- firefox-63.0.source.tar.xz | 3 + firefox-63.0.source.tar.xz.asc | 17 +++ firefox-kde.patch | 254 +++++++++++++++++-------------- l10n-62.0.3.tar.xz | 3 - l10n-63.0.tar.xz | 3 + mozilla-kde.patch | 69 ++++----- mozilla-no-return.patch | 40 ----- mozilla-no-stdcxx-check.patch | 25 --- source-stamp.txt | 2 +- 15 files changed, 223 insertions(+), 257 deletions(-) delete mode 100644 firefox-62.0.3.source.tar.xz delete mode 100644 firefox-62.0.3.source.tar.xz.asc create mode 100644 firefox-63.0.source.tar.xz create mode 100644 firefox-63.0.source.tar.xz.asc delete mode 100644 l10n-62.0.3.tar.xz create mode 100644 l10n-63.0.tar.xz delete mode 100644 mozilla-no-return.patch delete mode 100644 mozilla-no-stdcxx-check.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 9fc860d..3bba17d 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,10 +1,22 @@ ------------------------------------------------------------------- -Thu Oct 25 14:39:04 UTC 2018 - Guillaume GARDET +Mon Oct 29 14:07:51 UTC 2018 - wr@rosenauer.org + +- update to Firefox 63.0 + * WebExtensions now run in their own process on Linux + * The Ctrl+Tab shortcut now displays thumbnail previews of your + tabs and cycles through tabs in recently used order. This new + default behavior is activated only in new profiles and can be + changed in preferences. + * Added support for Web Components custom elements and shadow DOM +- requires NSPR 4.20, NSS 3.39 and Rust 1.28 + +------------------------------------------------------------------- +Thu Oct 25 14:39:04 UTC 2018 - guillaume.gardet@opensuse.org - Update _constraints for armv6/7 ------------------------------------------------------------------- -Thu Oct 25 08:50:24 UTC 2018 - Guillaume GARDET +Thu Oct 25 08:50:24 UTC 2018 - guillaume.gardet@opensuse.org - Add patch to fix build on armv7: * mozilla-bmo1463035.patch diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 57e4a34..235046b 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,13 +18,13 @@ # changed with every update -%define major 62 -%define mainver %major.0.3 -%define orig_version 62.0.3 +%define major 63 +%define mainver %major.0 +%define orig_version 63.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 -%define releasedate 20181002000000 +%define releasedate 20181018182531 %define source_prefix firefox-%{orig_version} # PIE, full relro (x86_64 for now) @@ -74,12 +74,12 @@ BuildRequires: libiw-devel BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.19 -BuildRequires: mozilla-nss-devel >= 3.38 +BuildRequires: mozilla-nspr-devel >= 4.20 +BuildRequires: mozilla-nss-devel >= 3.39 BuildRequires: python-devel BuildRequires: python2-xml BuildRequires: python3 >= 3.5 -BuildRequires: rust >= 1.24 +BuildRequires: rust >= 1.26 BuildRequires: rust-std BuildRequires: startup-notification-devel BuildRequires: unzip @@ -155,12 +155,10 @@ Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch Patch3: mozilla-ntlm-full-path.patch Patch4: mozilla-openaes-decl.patch -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-no-return.patch -Patch10: mozilla-bmo1463035.patch +Patch9: mozilla-bmo1463035.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -264,14 +262,12 @@ cd $RPM_BUILD_DIR/%{source_prefix} %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %ifarch %ix86 %patch6 -p1 %endif %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index 58ddc20..825db00 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:27af58da73451950ebf835d79afa0a16bf3f1a656d2a754a9d425117412ed4b0 -size 28828 +oid sha256:be9a1053e0516d4a8661b408fae6a82ecfcf65fe5e8c6b13e7abebacd89f3b23 +size 28404 diff --git a/create-tar.sh b/create-tar.sh index 0e6e719..812f4fc 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="c9ed11ae5c79df3dcb69075e1c9da0317d1ecb1b" -VERSION="62.0.3" +RELEASE_TAG="FIREFOX_63_0_RELEASE" +VERSION="63.0" VERSION_SUFFIX="" LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json" diff --git a/firefox-62.0.3.source.tar.xz b/firefox-62.0.3.source.tar.xz deleted file mode 100644 index 9d61d3c..0000000 --- a/firefox-62.0.3.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1d506eb7b1225e52398b2e4587085e77ff5f1fbf07728ba0fee60bbeae94636 -size 259531444 diff --git a/firefox-62.0.3.source.tar.xz.asc b/firefox-62.0.3.source.tar.xz.asc deleted file mode 100644 index 4fae277..0000000 --- a/firefox-62.0.3.source.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAABCAAGBQJbsmo1AAoJELu+vbskxvNV8vEQALnsRG+LaLIk2FOHX1BgwpK4 -7eAsq6P80fLJMKsHhyAZK8cPLGPrHK9sctxGhanbAP0HablmcxXRkGxBed74iVmJ -gOYrtI53eG0yy2U9rcC4iti5aa0Ff5jFzapks+XFiuwXabT+vhY2fHPWTLWdxuOy -m7xs9AJuf8Y7sTG1YYeeKQr4AzYdAxxpCC2StVo1Aogp87R0UxbI6Qxu/hL5LgaB -Z+D1vlH7GOFKfAZ/PXMDFmvBLVRv8hp3yWAwUNthQuP01OHHbN67CRvlddge+85c -lygJ+eNq13NUMX0L7nbEIVylvKuEr4zjkRF3A28yRcqn+chr4z3QUvX791Xs6xsJ -S3WL6FDVcOhX4KzTUrkBfGIPfHm+jsFDhHuNSLqDRGasWmwPWEVV08EqalOjEn0h -QCTDxaFd2mn2R53WUo0YwCfFQF983AEGB/Kxkqiim8Sxe58A5VROaJv4ko/QKNCE -8z2cPbmIzw1yC8atnduIYOgCLinadI+ibZ5scaTf+rcNufLnYKEbzeNTuALQnoN9 -ZuPvIdvBf7x2hukDBRgrWmsvGB2/SQJ2OL3Gltqceb5Qo3TSFZS4CSkX8ps7/BKA -VZg72bhRAiyz7dAFah1h5UDH4H79rNS8+BNfVC5MmDTDfjtMm24ApZ3MmcKq48Cz -PMEfO5f6vQZR829H7jre -=lzNt ------END PGP SIGNATURE----- diff --git a/firefox-63.0.source.tar.xz b/firefox-63.0.source.tar.xz new file mode 100644 index 0000000..f0d13a2 --- /dev/null +++ b/firefox-63.0.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f95b028571ab9ffb3bf637761534a685aed224de3b87eb8ad7e1d0831995c07 +size 265957640 diff --git a/firefox-63.0.source.tar.xz.asc b/firefox-63.0.source.tar.xz.asc new file mode 100644 index 0000000..849cc92 --- /dev/null +++ b/firefox-63.0.source.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABCAAGBQJbyOkNAAoJELu+vbskxvNV5LMQAK7JdjrLmZ0BQm489MBrC6Pq +RLAdoa8Qpkng4Ffe9Rtjj9DTo3ZdJfccTm41E/k8yc5OJ2hwtKfsB3nheCCDtnON +aqBUBkj2Rd3heLZBV0uKL56shCf41p58Xp93tsYQJeVfFvOMImVcYNxxyw0M9O7R +EZeABrOIhvTlIXWRjgnVgcuPMvOK5sgrtdKT8c9kSIEjCRn49w7jAe7RMgVYWfop +FDUmtM4Q1ZwxQoyGjJYSTbwIebSfirwzjXgUD5jTith4bvhDCu4bAx62IyONEGG/ +2M+WjPviP7n/RRC2EfWbZukozLCGGCkeIQpyRlcSpZxtqNkR3Q+rWhRVXm7VeyfC +Bp3MQWEOE75f1hMxS14ggD+lAXq7u4pj6wdGROFTHXRLPEvjj12F76Xr2hUqWX02 +HA/WVNsYTlqd08+ojbEqsJBDPi2UUv/ogaEWfKPehpnzXJ1znO5eVMdNnA0ykjD4 +nbo4PRDt3g6E2GMXJgpnVcrq8bQv28s+cHaC4OhxZ7E0fPtfvPp2j0CLX2TGZwq2 +Ub8NKYWrt6ZjEJrf7fAFMkHnlK+OCb/69byoKhbcrOozZk47f74scVRAv9iLWPdK +qj+HeOP8/lg7UMLjN/vP9xpLl4tMpCXmu+H2+uE/OBYS6YNtheHIgwy4EG3DDDSj +VKJF8cbSSpvtyh5Q/4Ka +=1MST +-----END PGP SIGNATURE----- diff --git a/firefox-kde.patch b/firefox-kde.patch index 52d698a..e07965b 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 0629fb9c6879e14c1b5e3cbff53b0d44371f0127 +# Parent fdf78810e83396d10418791fbe32bed6bfe1558b 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,1291 @@ +@@ -0,0 +1,1317 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -14,18 +14,23 @@ new file mode 100644 +# License, v. 2.0. If a copy of the MPL was not distributed with this +# 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 @@ -40,7 +45,6 @@ new file mode 100644 + xmlns:html="http://www.w3.org/1999/xhtml" + xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" -+ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" + title="&mainWindow.title;" + title_normal="&mainWindow.title;" +#ifdef XP_MACOSX @@ -75,31 +79,36 @@ new file mode 100644 +# that they can be shared with macWindow.inc.xul. +#include global-scripts.inc + -+ + -+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) ++# All sets except for popupsets (commands, keys, and stringbundles) +# *must* go into the browser-sets.inc file so that they can be shared with other +# top level windows in macWindow.inc.xul. -+#define FULL_BROWSER_WINDOW +#include browser-sets.inc -+#undef FULL_BROWSER_WINDOW + + + + ++