diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | 0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch | 70 | ||||
| -rw-r--r-- | 0001-Use-remoting-name-for-GDK-application-names.patch | 46 | ||||
| -rw-r--r-- | 2000_system_harfbuzz_support.patch | 19 | ||||
| -rw-r--r-- | 2001_system_graphite2_support.patch | 10 | ||||
| -rw-r--r-- | 5022efe33088.patch | 17 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | mozconfig | 1 | ||||
| -rw-r--r-- | unity-menubar.patch | 47 |
9 files changed, 88 insertions, 185 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu May 14 02:14:56 UTC 2020 +# Sun May 31 19:58:19 UTC 2020 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 76.0.1 - pkgrel = 2 + pkgver = 77.0b9 + 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=76.0.1 + provides = firefox=77.0b9 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_76_0_1_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_77_0b9_RELEASE source = mozconfig source = firefox.desktop source = vendor.js source = kde.js - source = firefox-branded-icons-3fd9346c90a6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/3fd9346c90a6/firefox-branded-icons.patch - source = firefox-kde-3fd9346c90a6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/3fd9346c90a6/firefox-kde.patch - source = mozilla-kde-3fd9346c90a6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/3fd9346c90a6/mozilla-kde.patch - source = mozilla-nongnome-proxies-3fd9346c90a6.patch::http://www.rosenauer.org/hg/mozilla/raw-file/3fd9346c90a6/mozilla-nongnome-proxies.patch + source = firefox-branded-icons-d5b284f833d5.patch::http://www.rosenauer.org/hg/mozilla/raw-file/d5b284f833d5/firefox-branded-icons.patch + source = firefox-kde-d5b284f833d5.patch::http://www.rosenauer.org/hg/mozilla/raw-file/d5b284f833d5/firefox-kde.patch + source = mozilla-kde-d5b284f833d5.patch::http://www.rosenauer.org/hg/mozilla/raw-file/d5b284f833d5/mozilla-kde.patch + source = mozilla-nongnome-proxies-d5b284f833d5.patch::http://www.rosenauer.org/hg/mozilla/raw-file/d5b284f833d5/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch @@ -80,28 +80,26 @@ pkgbase = firefox-kde-opensuse source = 7002_system_av1_support.patch source = 0001-Use-remoting-name-for-GDK-application-names.patch source = 5022efe33088.patch - source = 0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch source = mozilla-1516803.patch source = build-disable-elfhack.patch md5sums = SKIP - md5sums = 141299821a0a0fb744a187750b01e1b6 + md5sums = 095f1d0cd7de36e7ad3340699fce45b8 md5sums = a26a061efb4def6572d5b319d657f1d6 md5sums = 4c23d9c0a691d70919beb1dafbbecbd3 md5sums = 05bb69d25fb3572c618e3adf1ee7b670 md5sums = 6821ee347a094765776d8aec0a1d07e2 - md5sums = 9fbeda9d97bdd05082e1b9b954839c65 - md5sums = 69a4e699468346c47457186205c6316f + md5sums = ac9ce8934b4553fc42cb110c9c04350e + md5sums = 625fe05879952550fe3468e7a6465a07 md5sums = 0f9fcd2ec38e339e4f2d602e1b13e3ef - md5sums = dab1119e8575751064cd616718ce3eb4 + md5sums = 0442f4a7524e5229611009372369f1f4 md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 39f19e3fc4acb7dd5ff92c656228c244 - md5sums = fc2299d95a9230c5bfe79462a7b1bfc6 - md5sums = 86bf0a147c5d07b57caf81456db4bdc6 + md5sums = d24681f9a46ae23689b2867f4ab6eaae + md5sums = dbb578ee6ef93f0d28584d38904fac70 md5sums = f867ae41a722630cc5567e2dcc51676d md5sums = 215e69f9941a0855e005a7b5a351df60 - md5sums = 0ffabb81dd8a5fe98bb8afe47d6541d3 - md5sums = cae73e7bbb8496192bee5aa83dfa2e8d - md5sums = b3955b522692ff778b571ae5014b4841 + md5sums = e8585d1477f5f057603f38fcceec5c3f + md5sums = 91ef22b0393dd313dce0e5ffe042a369 md5sums = efcddfb6595b356b3faaf6b93313659e md5sums = aa9261c4d407cf809bf8275e6f2e52c7 diff --git a/0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch b/0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch deleted file mode 100644 index 99c05bb2bb94..000000000000 --- a/0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch +++ /dev/null @@ -1,70 +0,0 @@ -From c3acffdb8e0cd46561d2c5131227dc92967cf3d2 Mon Sep 17 00:00:00 2001 -From: Kevin Jacobs <kjacobs@mozilla.com> -Date: Tue, 14 Apr 2020 18:32:19 +0000 -Subject: [PATCH] Bug 1624128 - Update CK_GCM_PARAMS uses for PKCS11 v3.0 - definition r=keeler - -This patch initializes the ulIvBits member of CK_GCM_PARAMS, which is new in PKCS11 v3. - -For libprio, we instead define NSS_PKCS11_2_0_COMPAT, which yields the old struct definition. - -Differential Revision: https://phabricator.services.mozilla.com/D67740 ---- - dom/crypto/WebCryptoTask.cpp | 1 + - netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c | 1 + - security/manager/ssl/OSKeyStore.cpp | 1 + - third_party/prio/moz.build | 5 +++++ - 4 files changed, 8 insertions(+) - -diff --git a/dom/crypto/WebCryptoTask.cpp b/dom/crypto/WebCryptoTask.cpp -index ad0d1432738f..60a265972d21 100644 ---- a/dom/crypto/WebCryptoTask.cpp -+++ b/dom/crypto/WebCryptoTask.cpp -@@ -600,6 +600,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData { - case CKM_AES_GCM: - gcmParams.pIv = mIv.Elements(); - gcmParams.ulIvLen = mIv.Length(); -+ gcmParams.ulIvBits = gcmParams.ulIvLen * 8; - gcmParams.pAAD = mAad.Elements(); - gcmParams.ulAADLen = mAad.Length(); - gcmParams.ulTagBits = mTagLength; -diff --git a/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c b/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c -index e1fdbe36fbf8..2be2ce932ddf 100644 ---- a/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c -+++ b/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c -@@ -271,6 +271,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, - - c->params.pIv = c->iv; - c->params.ulIvLen = GCM_IV_LEN; -+ c->params.ulIvBits = GCM_IV_LEN * 8; - c->params.pAAD = c->aad; - c->params.ulAADLen = c->aad_size; - -diff --git a/security/manager/ssl/OSKeyStore.cpp b/security/manager/ssl/OSKeyStore.cpp -index 00bc918c5fdd..c83a559d9c1e 100644 ---- a/security/manager/ssl/OSKeyStore.cpp -+++ b/security/manager/ssl/OSKeyStore.cpp -@@ -663,6 +663,7 @@ nsresult AbstractOSKeyStore::DoCipher(const UniquePK11SymKey& aSymKey, - CK_GCM_PARAMS gcm_params; - gcm_params.pIv = const_cast<unsigned char*>(ivp); - gcm_params.ulIvLen = mIVLength; -+ gcm_params.ulIvBits = gcm_params.ulIvLen * 8; - gcm_params.ulTagBits = 128; - gcm_params.pAAD = nullptr; - gcm_params.ulAADLen = 0; -diff --git a/third_party/prio/moz.build b/third_party/prio/moz.build -index 3e10fe71ce8e..0a6e3c74a269 100644 ---- a/third_party/prio/moz.build -+++ b/third_party/prio/moz.build -@@ -42,3 +42,8 @@ SOURCES += [ - ] - - FINAL_LIBRARY = 'xul' -+ -+# Use PKCS11 v2 struct definitions for now, otherwise NSS requires -+# CK_GCM_PARAMS.ulIvBits to be set. This workaround is only required -+# until NSS 3.52 RTM and upstream correctly initializes the field. -+DEFINES['NSS_PKCS11_2_0_COMPAT'] = True --- -2.26.2 - diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch index 8cc378636c19..c58bc5accec0 100644 --- a/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/0001-Use-remoting-name-for-GDK-application-names.patch @@ -1,19 +1,15 @@ -From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001 -Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Mon, 25 Mar 2019 20:30:11 +0100 -Subject: [PATCH] Use remoting name for GDK application names - ---- - toolkit/xre/nsAppRunner.cpp | 6 +----- - widget/gtk/nsAppShell.cpp | 7 +++---- - 2 files changed, 4 insertions(+), 9 deletions(-) +# HG changeset patch +# User Andrew Crerar <andrew@crerar.io> +# Date 1588883129 14400 +# Thu May 07 16:25:29 2020 -0400 +# Node ID 9970281ae22ce7cad35870ef91d27149ec7e9879 +# Parent c9a2a8be0647d05e5f354794c3e7b7298cdbe26f +Use remoting name for GDK application names diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 0b808ef215f06..28911c0ffeaec 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -3703,11 +3703,7 @@ // consistently. // Set program name to the one defined in application.ini. @@ -27,7 +23,6 @@ index 0b808ef215f06..28911c0ffeaec 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index 0686ff814916b..ae4a4ea55f420 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -24,6 +24,7 @@ @@ -38,19 +33,16 @@ index 0686ff814916b..ae4a4ea55f420 100644 #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() { - // option when program uses gdk_set_program_class(). - // - // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 -- nsAutoString brandName; -- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); -- if (!brandName.IsEmpty()) { -- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); -+ if (gAppData) { -+ gdk_set_program_class(gAppData->remotingName); +@@ -178,10 +179,8 @@ + // creating top-level windows. (At this point, a child process hasn't + // received the list of registered chrome packages, so the + // GetBrandShortName call would fail anyway.) +- nsAutoString brandName; +- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); +- if (!brandName.IsEmpty()) { +- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); ++ if (gAppData) { ++ gdk_set_program_class(gAppData->remotingName); + } } } - --- -2.21.0 - diff --git a/2000_system_harfbuzz_support.patch b/2000_system_harfbuzz_support.patch index 680d9bfce22d..06072d3cd411 100644 --- a/2000_system_harfbuzz_support.patch +++ b/2000_system_harfbuzz_support.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 7b4a61d079f0d07c410e5f143ca666791349432f +# Parent ddfced51baf26d84a283f2838dc4cf3a1dbff7ec Add ability to use system-harfbuzz instead of bundled. https://bugzilla.mozilla.org/show_bug.cgi?id=847568 @@ -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 -@@ -537,16 +537,19 @@ include('/ipc/chromium/chromium-config.m +@@ -543,16 +543,19 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: @@ -85,8 +85,8 @@ diff --git a/gfx/moz.build b/gfx/moz.build 'vr', 'config', 'webrender_bindings', + 'wgpu_bindings', ] - diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -136,7 +136,7 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build -@@ -283,11 +283,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' +@@ -285,11 +285,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' if CONFIG['MOZ_WAYLAND']: CXXFLAGS += CONFIG['MOZ_WAYLAND_CFLAGS'] @@ -170,7 +170,12 @@ 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 -@@ -84,6 +84,9 @@ +@@ -80,12 +80,15 @@ GeneratedFile('etld_data.inc', script='p + inputs=['effective_tld_names.dat']) + + # need to include etld_data.inc + LOCAL_INCLUDES += [ + '/netwerk/base', '/netwerk/protocol/http', ] @@ -180,7 +185,7 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build USE_LIBS += ['icu'] if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - + CXXFLAGS += ['-Wno-error=shadow'] diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -207,7 +212,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 -@@ -399,16 +399,26 @@ def freetype2_combined_info(fontconfig_i +@@ -397,16 +397,26 @@ def freetype2_combined_info(fontconfig_i return namespace( cflags=freetype2_info.cflags + fontconfig_info.cflags, libs=freetype2_info.libs + fontconfig_info.libs, diff --git a/2001_system_graphite2_support.patch b/2001_system_graphite2_support.patch index 0aa93375bea2..1ba176d080b8 100644 --- a/2001_system_graphite2_support.patch +++ b/2001_system_graphite2_support.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 6a7e586f839ddc687046e2b1fea168d7ad9b72bd +# Parent df5c5a8c44bbf84528429a29aa78de4488884713 Allow building against system-wide graphite2. https://bugzilla.mozilla.org/show_bug.cgi?id=847568 @@ -135,12 +135,12 @@ diff --git a/gfx/moz.build b/gfx/moz.build 'vr', 'config', 'webrender_bindings', + 'wgpu_bindings', ] - diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build -@@ -281,16 +281,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and +@@ -283,16 +283,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] @@ -164,7 +164,7 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build diff --git a/old-configure.in b/old-configure.in --- a/old-configure.in +++ b/old-configure.in -@@ -2595,16 +2595,37 @@ if test "$USE_FC_FREETYPE"; then +@@ -2528,16 +2528,37 @@ if test "$USE_FC_FREETYPE"; then CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], , [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include <fontconfig/fontconfig.h>]) @@ -228,7 +228,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 -@@ -399,16 +399,30 @@ def freetype2_combined_info(fontconfig_i +@@ -397,16 +397,30 @@ def freetype2_combined_info(fontconfig_i return namespace( cflags=freetype2_info.cflags + fontconfig_info.cflags, libs=freetype2_info.libs + fontconfig_info.libs, diff --git a/5022efe33088.patch b/5022efe33088.patch index a114eaaa09f7..9603db33fb95 100644 --- a/5022efe33088.patch +++ b/5022efe33088.patch @@ -309,12 +309,7 @@ diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp diff --git a/third_party/sqlite3/src/moz.build b/third_party/sqlite3/src/moz.build --- a/third_party/sqlite3/src/moz.build +++ b/third_party/sqlite3/src/moz.build -@@ -76,27 +76,25 @@ if CONFIG['OS_ARCH'] == 'WINNT' and CONF - # Omit unused functions to save some library footprint. - DEFINES['SQLITE_OMIT_DEPRECATED'] = True - DEFINES['SQLITE_OMIT_BUILTIN_TEST'] = True - DEFINES['SQLITE_OMIT_DECLTYPE'] = True - +@@ -80,7 +80,6 @@ # Try to use a MEMORY temp store when possible. That allows for better # performance and doesn't suffer from a full separate tmp partition. # Exclude 32bit platforms due to address space fragmentation issues. @@ -322,9 +317,7 @@ diff --git a/third_party/sqlite3/src/moz.build b/third_party/sqlite3/src/moz.bui if CONFIG['OS_TARGET'] == 'Android': # On Android there's no tmp partition, so always use a MEMORY temp store. DEFINES['SQLITE_TEMP_STORE'] = 3 - elif CONFIG['HAVE_64BIT_BUILD']: - # On 64bit platforms default to a MEMORY temp store for performance. - DEFINES['SQLITE_TEMP_STORE'] = 2 +@@ -90,7 +89,6 @@ # Change the default temp files prefix, to easily distinguish files we created # vs files created by other Sqlite instances in the system. @@ -332,11 +325,7 @@ diff --git a/third_party/sqlite3/src/moz.build b/third_party/sqlite3/src/moz.bui DEFINES['SQLITE_TEMP_FILE_PREFIX'] = '"mz_etilqs_"' # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CFLAGS += [ - '-Wno-sign-compare', - '-Wno-type-limits', - ] + diff --git a/third_party/sqlite3/src/sqlite.symbols b/third_party/sqlite3/src/sqlite.symbols --- a/third_party/sqlite3/src/sqlite.symbols +++ b/third_party/sqlite3/src/sqlite.symbols @@ -19,8 +19,8 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=76.0.1 -pkgrel=2 +pkgver=77.0b9 +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=3fd9346c90a6 +_patchrev=d5b284f833d5 options=('!emptydirs') _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -78,8 +78,6 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" 0001-Use-remoting-name-for-GDK-application-names.patch # reenable system sqlite 5022efe33088.patch - # https://bugs.archlinux.org/task/66549 - 0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch # Fix MOZILLA#1516803 # https://bugzilla.mozilla.org/show_bug.cgi?id=1516803 mozilla-1516803.patch @@ -133,8 +131,6 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i "$srcdir"/0001-Use-remoting-name-for-GDK-application-names.patch - # https://bugs.archlinux.org/task/66549 - patch -Np1 -i ../0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch # reenable system sqlite patch -R -p1 -i "$srcdir"/5022efe33088.patch @@ -241,23 +237,22 @@ END ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" } md5sums=('SKIP' - '141299821a0a0fb744a187750b01e1b6' + '095f1d0cd7de36e7ad3340699fce45b8' 'a26a061efb4def6572d5b319d657f1d6' '4c23d9c0a691d70919beb1dafbbecbd3' '05bb69d25fb3572c618e3adf1ee7b670' '6821ee347a094765776d8aec0a1d07e2' - '9fbeda9d97bdd05082e1b9b954839c65' - '69a4e699468346c47457186205c6316f' + 'ac9ce8934b4553fc42cb110c9c04350e' + '625fe05879952550fe3468e7a6465a07' '0f9fcd2ec38e339e4f2d602e1b13e3ef' - 'dab1119e8575751064cd616718ce3eb4' + '0442f4a7524e5229611009372369f1f4' 'fe24f5ea463013bb7f1c12d12dce41b2' '39f19e3fc4acb7dd5ff92c656228c244' - 'fc2299d95a9230c5bfe79462a7b1bfc6' - '86bf0a147c5d07b57caf81456db4bdc6' + 'd24681f9a46ae23689b2867f4ab6eaae' + 'dbb578ee6ef93f0d28584d38904fac70' 'f867ae41a722630cc5567e2dcc51676d' '215e69f9941a0855e005a7b5a351df60' - '0ffabb81dd8a5fe98bb8afe47d6541d3' - 'cae73e7bbb8496192bee5aa83dfa2e8d' - 'b3955b522692ff778b571ae5014b4841' + 'e8585d1477f5f057603f38fcceec5c3f' + '91ef22b0393dd313dce0e5ffe042a369' 'efcddfb6595b356b3faaf6b93313659e' 'aa9261c4d407cf809bf8275e6f2e52c7') diff --git a/mozconfig b/mozconfig index 6782eb79b490..094e0b6e1f84 100644 --- a/mozconfig +++ b/mozconfig @@ -49,7 +49,6 @@ ac_add_options --enable-startup-notification ac_add_options --enable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-gconf ac_add_options --disable-tests #STRIP_FLAGS="--strip-debug" diff --git a/unity-menubar.patch b/unity-menubar.patch index ee88291d15cc..d1dd175e21c4 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 -@@ -6373,11 +6373,17 @@ function onViewToolbarsPopupShowing(aEve +@@ -6296,11 +6296,17 @@ function onViewToolbarsPopupShowing(aEve let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -34,7 +34,7 @@ toolbar.getAttribute("type") == "menubar" ? "autohide" : "collapsed"; --- a/browser/components/places/content/places.xhtml +++ b/browser/components/places/content/places.xhtml -@@ -171,7 +171,7 @@ +@@ -169,7 +169,7 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" #else @@ -84,7 +84,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): --- a/layout/build/moz.build +++ b/layout/build/moz.build -@@ -69,6 +69,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'an +@@ -68,6 +68,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'an '/dom/system', '/dom/system/android', ] @@ -97,7 +97,7 @@ 'components.conf', --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -317,6 +317,9 @@ pref("dom.mouseevent.click.hack.use_lega +@@ -309,6 +309,9 @@ pref("dom.mouseevent.click.hack.use_lega // of content viewers to cache based on the amount of available memory. pref("browser.sessionhistory.max_total_viewers", -1); @@ -319,7 +319,7 @@ +#endif /* __nsDbusmenu_h__ */ --- /dev/null +++ b/widget/gtk/nsMenu.cpp -@@ -0,0 +1,797 @@ +@@ -0,0 +1,796 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -338,7 +338,6 @@ +#include "mozilla/MouseEvents.h" +#include "mozilla/PresShell.h" +#include "mozilla/PresShellInlines.h" -+#include "nsAutoPtr.h" +#include "nsComponentManagerUtils.h" +#include "nsContentUtils.h" +#include "nsCSSValue.h" @@ -1245,7 +1244,7 @@ +#endif /* __nsMenu_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuBar.cpp -@@ -0,0 +1,549 @@ +@@ -0,0 +1,548 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -1261,7 +1260,6 @@ +#include "mozilla/dom/KeyboardEvent.h" +#include "mozilla/dom/KeyboardEventBinding.h" +#include "mozilla/Preferences.h" -+#include "nsAutoPtr.h" +#include "nsContentUtils.h" +#include "nsIDOMEventListener.h" +#include "nsIRunnable.h" @@ -2050,7 +2048,7 @@ + index)); + } + -+ MOZ_ALWAYS_TRUE(mChildren.InsertElementAt(index, std::move(aChild))); ++ mChildren.InsertElementAt(index, std::move(aChild)); +} + +void @@ -2064,7 +2062,7 @@ + aChild->GetNativeData())); + } + -+ MOZ_ALWAYS_TRUE(mChildren.AppendElement(std::move(aChild))); ++ mChildren.AppendElement(std::move(aChild)); +} + +bool @@ -2157,7 +2155,7 @@ +#endif /* __nsMenuContainer_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuItem.cpp -@@ -0,0 +1,767 @@ +@@ -0,0 +1,766 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -2173,7 +2171,6 @@ +#include "mozilla/dom/XULCommandEvent.h" +#include "mozilla/Preferences.h" +#include "mozilla/TextEvents.h" -+#include "nsAutoPtr.h" +#include "nsContentUtils.h" +#include "nsCRT.h" +#include "nsGkAtoms.h" @@ -3849,7 +3846,7 @@ +#endif /* __nsMenuObject_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuSeparator.cpp -@@ -0,0 +1,83 @@ +@@ -0,0 +1,82 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -3858,7 +3855,6 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "mozilla/Assertions.h" -+#include "nsAutoPtr.h" +#include "nsCRT.h" +#include "nsGkAtoms.h" + @@ -4057,7 +4053,7 @@ + return; + } + -+ MutationRecord *m = *mPendingMutations.AppendElement(new MutationRecord); ++ MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get(); + m->mType = MutationRecord::eAttributeChanged; + m->mTarget = aElement; + m->mAttribute = aAttribute; @@ -4088,7 +4084,7 @@ + return; + } + -+ MutationRecord *m = *mPendingMutations.AppendElement(new MutationRecord); ++ MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get(); + m->mType = MutationRecord::eContentInserted; + m->mTarget = container; + m->mChild = aChild; @@ -4111,7 +4107,7 @@ + return; + } + -+ MutationRecord *m = *mPendingMutations.AppendElement(new MutationRecord); ++ MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get(); + m->mType = MutationRecord::eContentRemoved; + m->mTarget = container; + m->mChild = aChild; @@ -4181,7 +4177,7 @@ + bool inUpdateSequence = false; + + while (mPendingMutations.Length() > 0) { -+ MutationRecord *m = mPendingMutations[0]; ++ MutationRecord *m = mPendingMutations[0].get(); + + if (m->mTarget != currentTarget) { + if (inUpdateSequence) { @@ -4342,7 +4338,7 @@ +#include "mozilla/Attributes.h" +#include "mozilla/GuardObjects.h" +#include "mozilla/RefPtr.h" -+#include "nsAutoPtr.h" ++#include "mozilla/UniquePtr.h" +#include "nsDataHashtable.h" +#include "nsStubMutationObserver.h" +#include "nsTArray.h" @@ -4453,7 +4449,7 @@ + mozilla::dom::Document *mDocument; + nsIContent *mLastSource; + nsNativeMenuChangeObserver *mLastTarget; -+ nsTArray<nsAutoPtr<MutationRecord> > mPendingMutations; ++ nsTArray<mozilla::UniquePtr<MutationRecord> > mPendingMutations; + nsDataHashtable<nsPtrHashKey<nsIContent>, nsNativeMenuChangeObserver *> mContentToObserverTable; + + static uint32_t sUpdateBlockersCount; @@ -4488,7 +4484,7 @@ +#endif /* __nsNativeMenuDocListener_h__ */ --- /dev/null +++ b/widget/gtk/nsNativeMenuService.cpp -@@ -0,0 +1,504 @@ +@@ -0,0 +1,503 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -4499,7 +4495,6 @@ +#include "mozilla/Assertions.h" +#include "mozilla/Preferences.h" +#include "mozilla/UniquePtr.h" -+#include "nsAutoPtr.h" +#include "nsCOMPtr.h" +#include "nsCRT.h" +#include "nsGtkUtils.h" @@ -5082,7 +5077,7 @@ +#endif /* __nsNativeMenuService_h__ */ --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -5793,6 +5793,10 @@ void nsWindow::HideWindowChrome(bool aSh +@@ -6008,6 +6008,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5113,7 +5108,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -712,6 +716,8 @@ class nsWindow final : public nsBaseWidg +@@ -721,6 +725,8 @@ class nsWindow final : public nsBaseWidg mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; static CSDSupportLevel sCSDSupportLevel; @@ -5159,7 +5154,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2537,7 +2538,7 @@ STATIC_ATOMS = [ +@@ -2552,7 +2553,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS @@ -5187,7 +5182,7 @@ if defined('MOZ_X11'): --- a/xpfe/appshell/AppWindow.cpp +++ b/xpfe/appshell/AppWindow.cpp -@@ -66,7 +66,7 @@ +@@ -67,7 +67,7 @@ # include "mozilla/XULStore.h" #endif |