diff options
-rw-r--r-- | .SRCINFO | 32 | ||||
-rw-r--r-- | 0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz | bin | 0 -> 43148 bytes | |||
-rw-r--r-- | 0001-Update-bindgen.patch.xz | bin | 139904 -> 0 bytes | |||
-rw-r--r-- | 0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz | bin | 43160 -> 0 bytes | |||
-rw-r--r-- | 2000_system_harfbuzz_support.patch | 23 | ||||
-rw-r--r-- | PKGBUILD | 34 | ||||
-rw-r--r-- | unity-menubar.patch | 6 | ||||
-rw-r--r-- | workaround_dom_indexdb_actorsparent_allignment.patch | 70 |
8 files changed, 117 insertions, 48 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Dec 3 19:03:15 UTC 2019 +# Thu Dec 5 22:06:06 UTC 2019 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 70.0.1 - pkgrel = 3 + pkgver = 71.0 + pkgrel = 1 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 arch = x86_64 @@ -59,18 +59,18 @@ pkgbase = firefox-kde-opensuse optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech optdepends = pulseaudio: Audio support - provides = firefox=70.0.1 + provides = firefox=71.0 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_70_0_1_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_71_0_RELEASE source = mozconfig source = firefox.desktop source = vendor.js source = kde.js - source = firefox-branded-icons-8a4f5aea2475.patch::http://www.rosenauer.org/hg/mozilla/raw-file/8a4f5aea2475/firefox-branded-icons.patch - source = firefox-kde-8a4f5aea2475.patch::http://www.rosenauer.org/hg/mozilla/raw-file/8a4f5aea2475/firefox-kde.patch - source = mozilla-kde-8a4f5aea2475.patch::http://www.rosenauer.org/hg/mozilla/raw-file/8a4f5aea2475/mozilla-kde.patch - source = mozilla-nongnome-proxies-8a4f5aea2475.patch::http://www.rosenauer.org/hg/mozilla/raw-file/8a4f5aea2475/mozilla-nongnome-proxies.patch + source = firefox-branded-icons-572ec48f3fe8.patch::http://www.rosenauer.org/hg/mozilla/raw-file/572ec48f3fe8/firefox-branded-icons.patch + source = firefox-kde-572ec48f3fe8.patch::http://www.rosenauer.org/hg/mozilla/raw-file/572ec48f3fe8/firefox-kde.patch + source = mozilla-kde-572ec48f3fe8.patch::http://www.rosenauer.org/hg/mozilla/raw-file/572ec48f3fe8/mozilla-kde.patch + source = mozilla-nongnome-proxies-572ec48f3fe8.patch::http://www.rosenauer.org/hg/mozilla/raw-file/572ec48f3fe8/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch @@ -79,27 +79,27 @@ pkgbase = firefox-kde-opensuse source = pgo.patch source = 7002_system_av1_support.patch source = 0001-Use-remoting-name-for-GDK-application-names.patch - source = 0001-Update-bindgen.patch.xz - source = 0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz + source = 0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz + source = workaround_dom_indexdb_actorsparent_allignment.patch md5sums = SKIP md5sums = f758e064e1463b90878790124f398197 md5sums = a26a061efb4def6572d5b319d657f1d6 md5sums = 4c23d9c0a691d70919beb1dafbbecbd3 md5sums = 05bb69d25fb3572c618e3adf1ee7b670 - md5sums = 63ed8892dbc06dc62a381e8c91c132df + md5sums = ad055db454c9263623fdbc857e8290fe md5sums = 0756f1b090f9c3371df957257907b0c7 md5sums = bc1f7445de31cd5ff20f00d0f9bc8e57 md5sums = e083ae314eaa9355aa2d4aa75a7fc277 - md5sums = b6b2fd9958366917e3b4014dde36354b + md5sums = 35fd9214a0af395543346f4dd074f92b md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 3fa8bd22d97248de529780f5797178af - md5sums = 1a7381dd7780409c04351424a8711d29 + md5sums = 28c2eff56d3d95da6e9ba444fc60e90b md5sums = 8d0c0ebc805e4e52a3cb2c0dc64ea2de md5sums = f867ae41a722630cc5567e2dcc51676d md5sums = d87270bfe02ea30e2fde3fcae5daf18d md5sums = 0ffabb81dd8a5fe98bb8afe47d6541d3 - md5sums = 0c91cd2a5abc6474dd24912bea80bf23 - md5sums = 35b553936e674cd8538fd97d6414b046 + md5sums = 3016656551d00f4f22dc2eaccc71ee14 + md5sums = f4a8a7f7480c74556ffb8fea3c5fe51a pkgname = firefox-kde-opensuse diff --git a/0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz b/0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz Binary files differnew file mode 100644 index 000000000000..d00280e6f2c5 --- /dev/null +++ b/0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz diff --git a/0001-Update-bindgen.patch.xz b/0001-Update-bindgen.patch.xz Binary files differdeleted file mode 100644 index 335985781b8a..000000000000 --- a/0001-Update-bindgen.patch.xz +++ /dev/null diff --git a/0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz b/0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz Binary files differdeleted file mode 100644 index 9d4caa2c7119..000000000000 --- a/0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz +++ /dev/null diff --git a/2000_system_harfbuzz_support.patch b/2000_system_harfbuzz_support.patch index dc46fa360949..21ccd1f0cd40 100644 --- a/2000_system_harfbuzz_support.patch +++ b/2000_system_harfbuzz_support.patch @@ -34,7 +34,7 @@ diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild diff --git a/dom/base/moz.build b/dom/base/moz.build --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -534,16 +534,19 @@ include('/ipc/chromium/chromium-config.m +@@ -538,13 +538,16 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: @@ -46,14 +46,11 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - GENERATED_FILES += [ - 'UseCounterList.h', - ] - - counterlist = GENERATED_FILES['UseCounterList.h'] - counterlist.script = 'gen-usecounters.py:use_counter_list' - counterlist.inputs = ['UseCounters.conf'] + GeneratedFile('UseCounterList.h', script='gen-usecounters.py', + entry_point='use_counter_list', inputs=['UseCounters.conf']) + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] diff --git a/gfx/moz.build b/gfx/moz.build --- a/gfx/moz.build +++ b/gfx/moz.build @@ -170,9 +167,9 @@ diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build -@@ -81,12 +81,15 @@ etld_data = GENERATED_FILES['etld_data.i - etld_data.script = 'prepare_tlds.py' - etld_data.inputs = ['effective_tld_names.dat'] +@@ -77,12 +77,15 @@ FINAL_LIBRARY = 'xul' + GeneratedFile('etld_data.inc', script='prepare_tlds.py', + inputs=['effective_tld_names.dat']) # need to include etld_data.inc LOCAL_INCLUDES += [ @@ -189,7 +186,7 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -240,16 +240,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: +@@ -234,16 +234,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: OS_LIBS += [ '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'], '-lgvr', @@ -212,7 +209,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -390,16 +390,26 @@ def freetype2_combined_info(fontconfig_i +@@ -394,16 +394,26 @@ def freetype2_combined_info(fontconfig_i return namespace( cflags=freetype2_info.cflags + fontconfig_info.cflags, libs=freetype2_info.libs + fontconfig_info.libs, @@ -15,12 +15,12 @@ _pgo=true # /view/head:/debian/patches/unity-menubar.patch # patches from gentoo: -# https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-07.tar.xz +# https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-71.0-patches-04.tar.xz _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=70.0.1 -pkgrel=3 +pkgver=71.0 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -51,7 +51,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'pulseaudio: Audio support') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=8a4f5aea2475 +_patchrev=572ec48f3fe8 options=('!emptydirs') _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -76,10 +76,11 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" 7002_system_av1_support.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 0001-Use-remoting-name-for-GDK-application-names.patch - # Update Bindgen to fix building with rust 1.39 - 0001-Update-bindgen.patch.xz # Fix building with python 3.8 - 0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz + 0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz + # Workaround objects no being allocated with the correct alignment + # inside dom/indexedDB/ActorsParent.cpp + workaround_dom_indexdb_actorsparent_allignment.patch ) # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -128,13 +129,14 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i "$srcdir"/0001-Use-remoting-name-for-GDK-application-names.patch - # Update Bindgen to fix building with rust 1.39 - xzcat "$srcdir"/0001-Update-bindgen.patch.xz | patch -Np1 - # Fix building with python 3.8 xzcat "$srcdir"/\ -0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz | \ +0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch.xz | \ patch -Np1 + + # Workaround objects no being allocated with the correct alignment + # inside dom/indexedDB/ActorsParent.cpp + patch -Np1 -i "$srcdir"/workaround_dom_indexdb_actorsparent_allignment.patch if [[ $_pgo ]] ; then # add missing rule for pgo builds @@ -236,17 +238,17 @@ md5sums=('SKIP' 'a26a061efb4def6572d5b319d657f1d6' '4c23d9c0a691d70919beb1dafbbecbd3' '05bb69d25fb3572c618e3adf1ee7b670' - '63ed8892dbc06dc62a381e8c91c132df' + 'ad055db454c9263623fdbc857e8290fe' '0756f1b090f9c3371df957257907b0c7' 'bc1f7445de31cd5ff20f00d0f9bc8e57' 'e083ae314eaa9355aa2d4aa75a7fc277' - 'b6b2fd9958366917e3b4014dde36354b' + '35fd9214a0af395543346f4dd074f92b' 'fe24f5ea463013bb7f1c12d12dce41b2' '3fa8bd22d97248de529780f5797178af' - '1a7381dd7780409c04351424a8711d29' + '28c2eff56d3d95da6e9ba444fc60e90b' '8d0c0ebc805e4e52a3cb2c0dc64ea2de' 'f867ae41a722630cc5567e2dcc51676d' 'd87270bfe02ea30e2fde3fcae5daf18d' '0ffabb81dd8a5fe98bb8afe47d6541d3' - '0c91cd2a5abc6474dd24912bea80bf23' - '35b553936e674cd8538fd97d6414b046') + '3016656551d00f4f22dc2eaccc71ee14' + 'f4a8a7f7480c74556ffb8fea3c5fe51a') diff --git a/unity-menubar.patch b/unity-menubar.patch index e43298b7e5d4..92bbbbb9cb32 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -14,7 +14,7 @@ <menu id="file-menu" data-l10n-id="menu-file"> --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -6801,11 +6801,17 @@ function onViewToolbarsPopupShowing(aEve +@@ -6796,11 +6796,17 @@ function onViewToolbarsPopupShowing(aEve let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -5143,7 +5143,7 @@ #include "mozilla/Preferences.h" #include "nsIPrefService.h" #include "nsIServiceManager.h" -@@ -5192,6 +5193,10 @@ void nsWindow::HideWindowChrome(bool aSh +@@ -5174,6 +5175,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5174,7 +5174,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -638,6 +642,8 @@ class nsWindow final : public nsBaseWidg +@@ -637,6 +641,8 @@ class nsWindow final : public nsBaseWidg mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; static CSDSupportLevel sCSDSupportLevel; diff --git a/workaround_dom_indexdb_actorsparent_allignment.patch b/workaround_dom_indexdb_actorsparent_allignment.patch new file mode 100644 index 000000000000..e651efce0e13 --- /dev/null +++ b/workaround_dom_indexdb_actorsparent_allignment.patch @@ -0,0 +1,70 @@ +Workaround GCC/Clang6 not supporting class-temporary#6.7 [1] +Bugs: ++ https://bugzilla.mozilla.org/show_bug.cgi?id=1601707 ++ http://gcc.gnu.org/PR92831 ++ https://bugzilla.redhat.com/show_bug.cgi?id=1779082 + +[1] http://eel.is/c++draft/class.temporary#6.7 + +diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp +--- a/dom/indexedDB/ActorsParent.cpp ++++ b/dom/indexedDB/ActorsParent.cpp +@@ -24311,11 +24311,11 @@ + // if we allow overwrite or not. By not allowing overwrite we raise + // detectable errors rather than corrupting data. + DatabaseConnection::CachedStatement stmt; +- const auto& optReplaceDirective = (!mOverwrite || keyUnset) +- ? NS_LITERAL_CSTRING("") +- : NS_LITERAL_CSTRING("OR REPLACE "); + rv = aConnection->GetCachedStatement( +- NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective + ++ NS_LITERAL_CSTRING("INSERT ") + ++ ((!mOverwrite || keyUnset) ++ ? NS_LITERAL_CSTRING("") ++ : NS_LITERAL_CSTRING("OR REPLACE ")) + + NS_LITERAL_CSTRING("INTO object_data " + "(object_store_id, key, file_ids, data) " + "VALUES (:") + +@@ -26076,9 +26076,6 @@ + + const bool usingKeyRange = mOptionalKeyRange.isSome(); + +- const auto& indexTable = mCursor->mUniqueIndex +- ? NS_LITERAL_CSTRING("unique_index_data") +- : NS_LITERAL_CSTRING("index_data"); + + NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column"); + +@@ -26099,7 +26096,9 @@ + "object_data.file_ids, " + "object_data.data " + "FROM ") + +- indexTable + ++ (mCursor->mUniqueIndex ++ ? NS_LITERAL_CSTRING("unique_index_data") ++ : NS_LITERAL_CSTRING("index_data")) + + NS_LITERAL_CSTRING( + " AS index_table " + "JOIN object_data " +@@ -26198,9 +26197,6 @@ + + const bool usingKeyRange = mOptionalKeyRange.isSome(); + +- const auto& table = mCursor->mUniqueIndex +- ? NS_LITERAL_CSTRING("unique_index_data") +- : NS_LITERAL_CSTRING("index_data"); + + NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column"); + +@@ -26218,7 +26214,10 @@ + NS_LITERAL_CSTRING( + "object_data_key " + " FROM ") + +- table + NS_LITERAL_CSTRING(" WHERE index_id = :") + ++ (mCursor->mUniqueIndex ++ ? NS_LITERAL_CSTRING("unique_index_data") ++ : NS_LITERAL_CSTRING("index_data")) + ++ NS_LITERAL_CSTRING(" WHERE index_id = :") + + kStmtParamNameId; + + const auto keyRangeClause = |