From 59451a5643492ab4ad77906131586b19e70b9cd94212f49936fda3aeb92c1a59 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 26 Mar 2018 11:11:30 +0000 Subject: [PATCH 1/4] Accepting request 590743 from home:cgrobertson:branches:mozilla:Factory - Added patches: * mozilla-i586-DecoderDoctorLogger.patch - bmo#1447070 fixes non-unified build error * mozilla-i586-domPrefs.patch - DOMPrefs.h fixes 32bit build error OBS-URL: https://build.opensuse.org/request/show/590743 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=641 --- MozillaFirefox.changes | 9 +++++++++ MozillaFirefox.spec | 6 ++++++ mozilla-bmo1005535.patch | 2 +- mozilla-i586-DecoderDoctorLogger.patch | 26 +++++++++++++++++++++++++ mozilla-i586-domPrefs.patch | 27 ++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 mozilla-i586-DecoderDoctorLogger.patch create mode 100644 mozilla-i586-domPrefs.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 73f98f3..32f147c 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 21 17:14:24 UTC 2018 - cgrobertson@suse.com + +- Added patches: + * mozilla-i586-DecoderDoctorLogger.patch - bmo#1447070 + fixes non-unified build error + * mozilla-i586-domPrefs.patch - DOMPrefs.h + fixes 32bit build error + ------------------------------------------------------------------- Fri Mar 16 06:40:11 UTC 2018 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index f2bbd8c..96632cb 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -152,6 +152,8 @@ Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch Patch9: mozilla-bmo1005535.patch Patch10: mozilla-bmo1446062.patch +Patch11: mozilla-i586-DecoderDoctorLogger.patch +Patch12: mozilla-i586-domPrefs.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -264,6 +266,10 @@ cd $RPM_BUILD_DIR/mozilla %patch8 -p1 %patch9 -p1 %patch10 -p1 +%ifarch %ix86 +%patch11 -p1 +%patch12 -p1 +%endif # Firefox %patch101 -p1 %patch102 -p1 diff --git a/mozilla-bmo1005535.patch b/mozilla-bmo1005535.patch index e11bcd8..4a35a5a 100644 --- a/mozilla-bmo1005535.patch +++ b/mozilla-bmo1005535.patch @@ -1,7 +1,7 @@ # HG changeset patch # Parent 376f185a0a757fe128be665adbb705f4a56461bc # User Steve Singer -# Parent 23e95bbe4d5553a2ba9dda2a4a96a2029253597c +# Parent 371f01835b6fe4cb6b7095a6c29f7bb54f6d6257 Bug 1005535 - Get skia GPU building on big endian. diff --git a/gfx/skia/skia/include/core/SkColorPriv.h b/gfx/skia/skia/include/core/SkColorPriv.h diff --git a/mozilla-i586-DecoderDoctorLogger.patch b/mozilla-i586-DecoderDoctorLogger.patch new file mode 100644 index 0000000..13f9bda --- /dev/null +++ b/mozilla-i586-DecoderDoctorLogger.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# Parent f3fe334a20e8a63266eb06c5d298ad793cefc015 +Mozilla Bug#1447070 - DecoderDoctorLogger.h must be included in MediaKeySession.h + to fix non-unified build error for i586 target. + +diff --git a/dom/media/eme/MediaKeySession.h b/dom/media/eme/MediaKeySession.h +--- a/dom/media/eme/MediaKeySession.h ++++ b/dom/media/eme/MediaKeySession.h +@@ -2,16 +2,17 @@ + /* vim: set ts=8 sts=2 et sw=2 tw=80: */ + /* 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_dom_MediaKeySession_h + #define mozilla_dom_MediaKeySession_h + ++#include "DecoderDoctorLogger.h" + #include "mozilla/Attributes.h" + #include "mozilla/ErrorResult.h" + #include "nsCycleCollectionParticipant.h" + #include "mozilla/DOMEventTargetHelper.h" + #include "nsCOMPtr.h" + #include "mozilla/dom/TypedArray.h" + #include "mozilla/Mutex.h" + #include "mozilla/dom/Date.h" diff --git a/mozilla-i586-domPrefs.patch b/mozilla-i586-domPrefs.patch new file mode 100644 index 0000000..9675c00 --- /dev/null +++ b/mozilla-i586-domPrefs.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Andrea Marchesini +# Parent bb4eb640e7303ea68be982d824aa100caacce240 +Mozilla Bug#1447409 - DOMPrefs.h must be included in WorkerScope, r=qdot + To fix 32bit build error for i586 target. + +diff --git a/dom/workers/WorkerScope.h b/dom/workers/WorkerScope.h +--- a/dom/workers/WorkerScope.h ++++ b/dom/workers/WorkerScope.h +@@ -4,16 +4,17 @@ + * 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_dom_workerscope_h__ + #define mozilla_dom_workerscope_h__ + + #include "Workers.h" + #include "mozilla/DOMEventTargetHelper.h" ++#include "mozilla/dom/DOMPrefs.h" + #include "mozilla/dom/Headers.h" + #include "mozilla/dom/RequestBinding.h" + #include "nsWeakReference.h" + #include "mozilla/dom/ImageBitmapSource.h" + + namespace mozilla { + namespace dom { + From f3956c81624f6b9873064cd514b9cb040d87c0e95d43bc7ca84adef45a550062 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 27 Mar 2018 12:10:14 +0000 Subject: [PATCH 2/4] - update to Firefox 59.0.2 * Invalid page rendering with hardware acceleration enabled (bmo#1435472) * Browser keyboard shortcuts (eg copy Ctrl+C) don't work on sites that use those keys with resistFingerprinting enabled (bmo#1433592) * High CPU / memory churn caused by third-party software on some computers (bmo#1446280) * Users who have configured an "automatic proxy configuration URL" and want to reload their proxy settings from the URL will find the Reload button disabled in the Connection Settings dialog when they select Preferences/Options>Network Proxy>Settings... (bmo#1445991) * URL Fragment Identifiers Break Service Worker Responses (bmo#1443850) * User's trying to cancel a print around the time it completes will continue to get intermittent crashes (bmo#1441598) MFSA 2018-10 (bsc#1087059) * CVE-2018-5148 (bmo#1440717) Use-after-free in compositor - removed obsolete patch mozilla-bmo1446062.patch * mozilla-i586-domPrefs.patch - DOMPrefs.h OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=642 --- MozillaFirefox.changes | 23 ++++++- MozillaFirefox.spec | 8 +-- compare-locales.tar.xz | 4 +- create-tar.sh | 4 +- firefox-59.0.1-source.tar.xz | 3 - firefox-59.0.2-source.tar.xz | 3 + l10n-59.0.1.tar.xz | 3 - l10n-59.0.2.tar.xz | 3 + mozilla-bmo1446062.patch | 116 ----------------------------------- source-stamp.txt | 2 +- 10 files changed, 36 insertions(+), 133 deletions(-) delete mode 100644 firefox-59.0.1-source.tar.xz create mode 100644 firefox-59.0.2-source.tar.xz delete mode 100644 l10n-59.0.1.tar.xz create mode 100644 l10n-59.0.2.tar.xz delete mode 100644 mozilla-bmo1446062.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 32f147c..c49e743 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,10 +1,31 @@ +------------------------------------------------------------------- +Tue Mar 27 06:40:25 UTC 2018 - wr@rosenauer.org + +- update to Firefox 59.0.2 + * Invalid page rendering with hardware acceleration enabled (bmo#1435472) + * Browser keyboard shortcuts (eg copy Ctrl+C) don't work on sites + that use those keys with resistFingerprinting enabled (bmo#1433592) + * High CPU / memory churn caused by third-party software on some + computers (bmo#1446280) + * Users who have configured an "automatic proxy configuration URL" + and want to reload their proxy settings from the URL will find + the Reload button disabled in the Connection Settings dialog when + they select Preferences/Options>Network Proxy>Settings... (bmo#1445991) + * URL Fragment Identifiers Break Service Worker Responses (bmo#1443850) + * User's trying to cancel a print around the time it completes will + continue to get intermittent crashes (bmo#1441598) + MFSA 2018-10 (bsc#1087059) + * CVE-2018-5148 (bmo#1440717) + Use-after-free in compositor +- removed obsolete patch mozilla-bmo1446062.patch + ------------------------------------------------------------------- Wed Mar 21 17:14:24 UTC 2018 - cgrobertson@suse.com - Added patches: * mozilla-i586-DecoderDoctorLogger.patch - bmo#1447070 fixes non-unified build error - * mozilla-i586-domPrefs.patch - DOMPrefs.h + * mozilla-i586-domPrefs.patch - DOMPrefs.h fixes 32bit build error ------------------------------------------------------------------- diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 96632cb..2deea7f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -151,9 +151,8 @@ Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch Patch9: mozilla-bmo1005535.patch -Patch10: mozilla-bmo1446062.patch -Patch11: mozilla-i586-DecoderDoctorLogger.patch -Patch12: mozilla-i586-domPrefs.patch +Patch10: mozilla-i586-DecoderDoctorLogger.patch +Patch11: mozilla-i586-domPrefs.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -265,10 +264,9 @@ cd $RPM_BUILD_DIR/mozilla %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %ifarch %ix86 +%patch10 -p1 %patch11 -p1 -%patch12 -p1 %endif # Firefox %patch101 -p1 diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index bfe8c84..5c9f748 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:cdd97af0fb4589f385a87d15d405b8416aed9fb644b8688ffb1e87b87a207d1c -size 28360 +oid sha256:c35c7ba668c5a16b33e2799111b94563a7e17bcd6443303fce38b90b882ec406 +size 28384 diff --git a/create-tar.sh b/create-tar.sh index 411a053..1abaf53 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_59_0_1_RELEASE" -VERSION="59.0.1" +RELEASE_TAG="FIREFOX_59_0_2_RELEASE" +VERSION="59.0.2" # check required tools test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 ) diff --git a/firefox-59.0.1-source.tar.xz b/firefox-59.0.1-source.tar.xz deleted file mode 100644 index c41e704..0000000 --- a/firefox-59.0.1-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:880faed22ce6e5c305117e0771ad476995884a7f2599ca72b0587cb96eb57523 -size 262899092 diff --git a/firefox-59.0.2-source.tar.xz b/firefox-59.0.2-source.tar.xz new file mode 100644 index 0000000..9b38df6 --- /dev/null +++ b/firefox-59.0.2-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0691c740edb5bc83b1c5eff4e9255157c0021c90755036197d9c7455bc01bbcd +size 262881260 diff --git a/l10n-59.0.1.tar.xz b/l10n-59.0.1.tar.xz deleted file mode 100644 index 1496a41..0000000 --- a/l10n-59.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de5f9a8916fe43c9e79d1cdc7b5a85892600c0b11b5ed57618e009680b154e23 -size 49070588 diff --git a/l10n-59.0.2.tar.xz b/l10n-59.0.2.tar.xz new file mode 100644 index 0000000..23f6698 --- /dev/null +++ b/l10n-59.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:400327769430f7c61cb9b582b70e723386ad3daf0cd796b66631ea6f51596966 +size 49106848 diff --git a/mozilla-bmo1446062.patch b/mozilla-bmo1446062.patch deleted file mode 100644 index 3efe280..0000000 --- a/mozilla-bmo1446062.patch +++ /dev/null @@ -1,116 +0,0 @@ - -# HG changeset patch -# User Thomas Daede -# Date 1521175629 25200 -# Node ID 5cd5586a2f48424a9031a3fa4c782954a9df9a52 -# Parent 494e5d5278ba6f5fdda9a2bb9ac7ca772653ee4a -Bug 1446062: libtremor Vorbis fix. r=jmspeex a=dveditz - -diff --git a/media/libtremor/lib/tremor_codebook.c b/media/libtremor/lib/tremor_codebook.c ---- a/media/libtremor/lib/tremor_codebook.c -+++ b/media/libtremor/lib/tremor_codebook.c -@@ -253,26 +253,26 @@ long vorbis_book_decodevs_add(codebook * - - if(shift>=0){ - for (i = 0; i < step; i++) { - entry[i]=decode_packed_entry_number(book,b); - if(entry[i]==-1)return(-1); - t[i] = book->valuelist+entry[i]*book->dim; - } - for(i=0,o=0;idim;i++,o+=step) -- for (j=0;j>shift; - }else{ - for (i = 0; i < step; i++) { - entry[i]=decode_packed_entry_number(book,b); - if(entry[i]==-1)return(-1); - t[i] = book->valuelist+entry[i]*book->dim; - } - for(i=0,o=0;idim;i++,o+=step) -- for (j=0;jbinarypoint; - - if(shift>=0){ - for(i=0;ivaluelist+entry*book->dim; -- for (j=0;jdim;) -+ for (j=0;idim;) - a[i++]+=t[j++]>>shift; - } - }else{ - for(i=0;ivaluelist+entry*book->dim; -- for (j=0;jdim;) -+ for (j=0;idim;) - a[i++]+=t[j++]<<-shift; - } - } - } - return(0); - } - - /* unlike the others, we guard against n not being an integer number -@@ -347,41 +347,41 @@ long vorbis_book_decodev_set(codebook *b - /* decode vector / dim granularity gaurding is done in the upper layer */ - long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a,\ - long offset,int ch, - oggpack_buffer *b,int n,int point){ - if(book->used_entries>0){ - long i,j,entry; - int chptr=0; - int shift=point-book->binarypoint; -- -+ int m=offset+n; - if(shift>=0){ - -- for(i=offset;ivaluelist+entry*book->dim; -- for (j=0;jdim;j++){ -+ for (j=0;idim;j++){ - a[chptr++][i]+=t[j]>>shift; - if(chptr==ch){ - chptr=0; - i++; - } - } - } - } - }else{ - -- for(i=offset;ivaluelist+entry*book->dim; -- for (j=0;jdim;j++){ -+ for (j=0;idim;j++){ - a[chptr++][i]+=t[j]<<-shift; - if(chptr==ch){ - chptr=0; - i++; - } - } - } - } - diff --git a/source-stamp.txt b/source-stamp.txt index fabbcf3..01ff622 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=3db9e3d52b17 +REV=239e434d6d2b REPO=http://hg.mozilla.org/releases/mozilla-release From a07c7d7f17b6934786fe49c747d50585207bc95ee48dfb72a972501559b0278b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 27 Mar 2018 12:14:12 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=643 --- MozillaFirefox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 2deea7f..172e38c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,10 +19,10 @@ # changed with every update %define major 59 -%define mainver %major.0.1 +%define mainver %major.0.2 %define update_channel release %define branding 1 -%define releasedate 20180315233128 +%define releasedate 20180323154952 # PIE, full relro (x86_64 for now) %define build_hardened 1 From 1595d2c3dcf279c36375210b1690b78ba4ddc9bd2f9926db0534a0f999bb6cdb Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 27 Mar 2018 15:18:52 +0000 Subject: [PATCH 4/4] Accepting request 591640 from home:Andreas_Schwab:Factory - Reduce constraints on aarch64 OBS-URL: https://build.opensuse.org/request/show/591640 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=644 --- MozillaFirefox.changes | 5 +++++ _constraints | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index c49e743..d70218e 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 27 14:07:11 UTC 2018 - schwab@suse.de + +- Reduce constraints on aarch64 + ------------------------------------------------------------------- Tue Mar 27 06:40:25 UTC 2018 - wr@rosenauer.org diff --git a/_constraints b/_constraints index 2ec300e..7821a87 100644 --- a/_constraints +++ b/_constraints @@ -19,4 +19,14 @@ + + + aarch64 + + + + 9 + + +