From 551d63d536af39660cc353d25a3009ec61fc7cab6a6aabb8438c86e03c05c07b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 5 Sep 2018 07:16:27 +0000 Subject: [PATCH 1/5] - update to Firefox 62.0 (build2) - requires NSS >= 3.38 - removed obsolete patches mozilla-bmo1464766.patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=682 --- MozillaFirefox.changes | 8 ++ MozillaFirefox.spec | 17 ++-- compare-locales.tar.xz | 4 +- create-tar.sh | 4 +- firefox-61.0.2.source.tar.xz | 3 - firefox-61.0.2.source.tar.xz.asc | 17 ---- firefox-62.0.source.tar.xz | 3 + firefox-62.0.source.tar.xz.asc | 17 ++++ firefox-kde.patch | 146 ++++++++++++++-------------- l10n-61.0.2.tar.xz | 3 - l10n-62.0.tar.xz | 3 + mozilla-aarch64-startup-crash.patch | 6 +- mozilla-bmo1464766.patch | 119 ----------------------- mozilla-kde.patch | 38 ++++---- source-stamp.txt | 2 +- 15 files changed, 139 insertions(+), 251 deletions(-) delete mode 100644 firefox-61.0.2.source.tar.xz delete mode 100644 firefox-61.0.2.source.tar.xz.asc create mode 100644 firefox-62.0.source.tar.xz create mode 100644 firefox-62.0.source.tar.xz.asc delete mode 100644 l10n-61.0.2.tar.xz create mode 100644 l10n-62.0.tar.xz delete mode 100644 mozilla-bmo1464766.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 5f39af4..712349d 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 3 10:47:43 UTC 2018 - wr@rosenauer.org + +- update to Firefox 62.0 (build2) +- requires NSS >= 3.38 +- removed obsolete patches + mozilla-bmo1464766.patch + ------------------------------------------------------------------- Thu Aug 9 14:22:00 UTC 2018 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index edd7be8..3dc8529 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -13,18 +13,18 @@ # 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/ # # changed with every update -%define major 61 -%define mainver %major.0.2 -%define orig_version 61.0.2 +%define major 62 +%define mainver %major.0 +%define orig_version 62.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 -%define releasedate 20180807170231 +%define releasedate 20180830143136 %define source_prefix firefox-%{orig_version} # PIE, full relro (x86_64 for now) @@ -75,7 +75,7 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.19 -BuildRequires: mozilla-nss-devel >= 3.37.3 +BuildRequires: mozilla-nss-devel >= 3.38 BuildRequires: python-devel BuildRequires: python2-xml BuildRequires: python3 >= 3.5 @@ -160,7 +160,6 @@ Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch Patch9: mozilla-no-return.patch -Patch10: mozilla-bmo1464766.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -271,7 +270,6 @@ cd $RPM_BUILD_DIR/%{source_prefix} %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -372,6 +370,7 @@ ac_add_options --enable-startup-notification ac_add_options --enable-update-channel=%{update_channel} ac_add_options --with-mozilla-api-keyfile=%{SOURCE18} ac_add_options --with-google-api-keyfile=%{SOURCE19} +ac_add_options --with-unsigned-addon-scopes=app %if %branding ac_add_options --enable-official-branding %endif @@ -508,7 +507,6 @@ rm -f %{buildroot}%{progdir}/old-homepage-default.properties rm -f %{buildroot}%{progdir}/run-mozilla.sh rm -f %{buildroot}%{progdir}/LICENSE rm -f %{buildroot}%{progdir}/precomplete -rm -f %{buildroot}%{progdir}/dictionaries/en-US* rm -f %{buildroot}%{progdir}/update-settings.ini # devel mkdir -p %{buildroot}%{_bindir} @@ -586,7 +584,6 @@ exit 0 %dir %{progdir}/distribution/ %{progdir}/distribution/extensions/ %{progdir}/defaults/ -%{progdir}/dictionaries/ %dir %{progdir}/gtk2 %{progdir}/gtk2/libmozgtk.so %{progdir}/gmp-clearkey/ diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index c1c9220..d89dfba 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:b6e345d53252f5367425ef8a382b578f66d9d71b265298fcbcd24756c9fc71d5 -size 28392 +oid sha256:0521698e2af7153ff2e611683b8bea69c74b91c67691e5d43d5953387626d106 +size 28368 diff --git a/create-tar.sh b/create-tar.sh index b57fa2b..4c75c94 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_61_0_2_RELEASE" -VERSION="61.0.2" +RELEASE_TAG="9cbae12a3fff404ed2c12070ad475424d0ae869f" +VERSION="62.0" VERSION_SUFFIX="" LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json" diff --git a/firefox-61.0.2.source.tar.xz b/firefox-61.0.2.source.tar.xz deleted file mode 100644 index 7ddf197..0000000 --- a/firefox-61.0.2.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c -size 266077556 diff --git a/firefox-61.0.2.source.tar.xz.asc b/firefox-61.0.2.source.tar.xz.asc deleted file mode 100644 index ba236d9..0000000 --- a/firefox-61.0.2.source.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAABCAAGBQJbafHXAAoJELu+vbskxvNVIhMP/2VqScRCb6eW+UsdFHrFLQHg -APpDgdjc/lKVUN8Zrm4uazM9eutozPTBIvXUGFtIewCA6XNdqdJ9V3qXGUIe+eY0 -dd2BQhHjHCgN1viqvKMtvyC5elAlW4je0r20ON6/ODp2ltFEplWkzPRdvMJdj81c -R+LWlI4BtT7R54wGKeOKmn2L4xx6SYMAfYShMDaeWxT4KywYWFIDf2Is7ogLJpH4 -cPzvuPkUdZPcZ0r3clp/DbNHB5NLrmcrKk1rD1LndKoe45qb75ZDKK4Vsc9I98VW -pRxNQwvg01bbo4S/Qc4MgyGQBoaW+5H2NuwOLhIsbN3+vK4bfjF+/TQ4ZTtpyBbV -vTjvnEq7WzrNqwVWkLjZINdeByADyLDMGilSHBiV3D1/Ueafzd81fwuroqC8FEil -Z2uVmFaK7flERMpcPPV9hk3g9vXn28g9Pe0Gk51Sro0mGiFSh/6C5ROeS3+LV96Q -TPVzptkkhwjKF8BnOgK1kkwNhk5/KTEBYAOuGefXrTnddaKpMiaDOQAVA3mZaIU4 -VyzFh9v7sWQIl1c0iuE115Z33WoY7iPC+YY9DVhvUbeA+/XuzG/8CuqXPLrjE5Zp -Ljww6gv+r+/tZGKEF/dLmQw2WOpP9KwXvn21xyzMeltrmRCpG55v+Q3cyzlAExby -MKFxldx23Uvzqxzj1qoi -=Qg+b ------END PGP SIGNATURE----- diff --git a/firefox-62.0.source.tar.xz b/firefox-62.0.source.tar.xz new file mode 100644 index 0000000..9bfb120 --- /dev/null +++ b/firefox-62.0.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f850581f7d89655a05d5dc26ba010783934d86aa920399237f79dedd5daec9 +size 258026884 diff --git a/firefox-62.0.source.tar.xz.asc b/firefox-62.0.source.tar.xz.asc new file mode 100644 index 0000000..7425d75 --- /dev/null +++ b/firefox-62.0.source.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABCAAGBQJbiCAwAAoJELu+vbskxvNV3pcP+wcRkN/B+QpmN8O4Usk5oPAg +11lBrHJAcN7QIYxxZg71J/ctKFFr1STmIeJiVKve8ZmA6KLwp6pC9Y6cVIlorkaZ +RAGHqavkN1pP+qthjMU73VH6Cb+bVe+NwhTgTj2nMyl8i6Rav2BIivN0MunpovfR +gi6nJCDKoYKidnpIhhQRXVd1MSXia77FE5WSwZGieWTIeliboOcqS7S4tQClcWkA +uH9eLnqBB0YciwE5vEhjwt/esi8JUqJT4jdfpIkqr9ymdw0MwXm0cp3vQaW/Jn4Y +3QoioQI9yB/8OKlNbT/77MRpTuJj47Y1Gsg12V1bR5+F/rMLgFcEsIMqj2XB0Z/f +zH51ymxd84rmnH08Sg3dhfx4IGWNZ0rTRfJ0YjMpJu+0v1uVh/oCHSP9radxbDsT +E5TY6MkO+2YyRgoyceJBNj8jdaw/VJInb61mBVHQo4gIwRpzBVAgQ7xtG+Ui6ZkA +lGJnnokzBmnPEu+sN9xJuQtdaX6FhZlzX/EemoSjyygGTErNnLnlfs8f3gtw3f2o +yeARZgHbanADac+I/wLRR5PMTuhZUbFuWBbri97CXIXcXMY7xNfCjl+i+UhXx3xJ +E8TrFxNGgsH6jZL2J+C/gFyAtdsPyyd6a7kiBlo8ng8ZeULUhl+Afx2sSVweaI2r +y1DeLNA2bnUtBcCtvAlb +=PXE6 +-----END PGP SIGNATURE----- diff --git a/firefox-kde.patch b/firefox-kde.patch index 7b11b84..52d698a 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc +# Parent 0629fb9c6879e14c1b5e3cbff53b0d44371f0127 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,1293 @@ +@@ -0,0 +1,1291 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -21,6 +21,7 @@ new file mode 100644 + + + ++ + + + @@ -107,6 +108,8 @@ new file mode 100644 + + ++