diff options
| -rw-r--r-- | .SRCINFO | 43 | ||||
| -rw-r--r-- | 2000_system_harfbuzz_support.patch | 72 | ||||
| -rw-r--r-- | 2001_system_graphite2_support.patch | 60 | ||||
| -rw-r--r-- | PKGBUILD | 53 | ||||
| -rw-r--r-- | mozconfig | 5 | ||||
| -rw-r--r-- | unity-menubar.patch | 69 |
6 files changed, 133 insertions, 169 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jun 21 10:08:24 UTC 2019 +# Wed Jul 10 16:56:52 UTC 2019 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 67.0.4 + pkgver = 68.0 pkgrel = 1 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 @@ -54,58 +54,49 @@ pkgbase = firefox-kde-opensuse depends = aom depends = harfbuzz depends = graphite + depends = libwebp optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech optdepends = pulseaudio: Audio support - provides = firefox=67.0.4 + provides = firefox=68.0 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_67_0_4_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_68_0_RELEASE source = mozconfig source = firefox.desktop source = vendor.js source = kde.js - source = firefox-branded-icons-9c008b241362.patch::http://www.rosenauer.org/hg/mozilla/raw-file/9c008b241362/firefox-branded-icons.patch - source = firefox-kde-9c008b241362.patch::http://www.rosenauer.org/hg/mozilla/raw-file/9c008b241362/firefox-kde.patch - source = mozilla-kde-9c008b241362.patch::http://www.rosenauer.org/hg/mozilla/raw-file/9c008b241362/mozilla-kde.patch - source = mozilla-nongnome-proxies-9c008b241362.patch::http://www.rosenauer.org/hg/mozilla/raw-file/9c008b241362/mozilla-nongnome-proxies.patch + source = firefox-branded-icons-840132a4a9b3.patch::http://www.rosenauer.org/hg/mozilla/raw-file/840132a4a9b3/firefox-branded-icons.patch + source = firefox-kde-840132a4a9b3.patch::http://www.rosenauer.org/hg/mozilla/raw-file/840132a4a9b3/firefox-kde.patch + source = mozilla-kde-840132a4a9b3.patch::http://www.rosenauer.org/hg/mozilla/raw-file/840132a4a9b3/mozilla-kde.patch + source = mozilla-nongnome-proxies-840132a4a9b3.patch::http://www.rosenauer.org/hg/mozilla/raw-file/840132a4a9b3/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch - source = 2001_system_graphite2_support.patch source = 2000_system_harfbuzz_support.patch + source = 2001_system_graphite2_support.patch source = mozilla-1516803.patch source = mozilla-1516081.patch source = pgo.patch - source = 2009_rust-1.33-support.patch.xz - source = 2010_rust-1.33-support.patch.xz - source = 2011_rust-1.33-support.patch.xz source = 7002_system_av1_support.patch - source = 2014_spectre_variant2_bug1542958.patch - source = 2015_spectre_variant2_bug1542958.patch md5sums = SKIP - md5sums = 15a351d5936fb76a779d3afa2baa1308 + md5sums = 0ffd8ac9de394285f53ad08c783d5b30 md5sums = 14e0f6237a79b85e60256f4808163160 md5sums = 5cee310a9040ccc5abcf29742b84aeb8 md5sums = 05bb69d25fb3572c618e3adf1ee7b670 md5sums = d7ce23a18da21c05cd756766e177834f - md5sums = 1fd3db31015977eb77960716d6d2dbe6 - md5sums = 270eed48793b9358702e7de6185c32be - md5sums = 8b24c694c259064b1296e7a1397c3aee - md5sums = 4cd539459e253f53f631ccca51650a87 + md5sums = 6ce1848c9987aa10e954c5f9ac2c7e18 + md5sums = cbec3c8957600bb83c7bfffa6fd42d70 + md5sums = e083ae314eaa9355aa2d4aa75a7fc277 + md5sums = 16447c9996d36ab3b61d64de9843c681 md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 3fa8bd22d97248de529780f5797178af - md5sums = 554514bf00a7927a85280f19e52a55fb - md5sums = 5b0d39aebb1ce84f89bda300320b851f + md5sums = bb549715cf74bcd5cbb0a1e435b1651e + md5sums = 05041908a051d5de7c015747d4cb0f4f md5sums = becf6bf9ceb6008401832c855ccadff9 md5sums = 79d27c8896913c7d87b148240995ab69 md5sums = f867ae41a722630cc5567e2dcc51676d - md5sums = ef358dae95d487740dda8114df4d5f90 - md5sums = f343dc6520abb0be8eb77da17256ce21 - md5sums = 4594ded5cdcdaae038bc49645643f914 md5sums = df439e02304d302009c320a540f01dbe - md5sums = f0e6dccbb32695d2d9057dacd650822c - md5sums = cca2f77b28b5fd53cbc919045006ab0a pkgname = firefox-kde-opensuse diff --git a/2000_system_harfbuzz_support.patch b/2000_system_harfbuzz_support.patch index e9ec5f17ff28..8a4b11b49249 100644 --- a/2000_system_harfbuzz_support.patch +++ b/2000_system_harfbuzz_support.patch @@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild --- a/config/system-headers.mozbuild +++ b/config/system-headers.mozbuild -@@ -1228,16 +1228,23 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr +@@ -1228,16 +1228,23 @@ if CONFIG['OS_TARGET'] == 'Android': 'utils/TypeHelpers.h', 'utils/Unicode.h', 'utils/Vector.h', @@ -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 -@@ -477,16 +477,19 @@ include('/ipc/chromium/chromium-config.m +@@ -523,16 +523,19 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: @@ -54,27 +54,14 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build countermap = GENERATED_FILES['PropertyUseCounterMap.inc'] countermap.script = 'gen-usecounters.py:property_map' countermap.inputs = ['UseCounters.conf'] -diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla ---- a/gfx/harfbuzz/README-mozilla -+++ b/gfx/harfbuzz/README-mozilla -@@ -15,3 +15,8 @@ - - If the collection of source files changes, manual updates to moz.build may be - needed as we don't use the upstream makefiles. -+ -+The in-tree copy may be omitted during build by --with-system-harfbuzz. -+Make sure to keep pkg-config version check within toolkit/moz.configure in sync -+with checkout version or increment latest tag by one if it's not based -+on upstream release. - diff --git a/gfx/moz.build b/gfx/moz.build --- a/gfx/moz.build +++ b/gfx/moz.build -@@ -5,26 +5,28 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - +@@ -7,16 +7,19 @@ with Files('**'): BUG_COMPONENT = ('Core', 'Graphics') + with Files('wr/**'): + BUG_COMPONENT = ('Core', 'Graphics: WebRender') if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] @@ -90,20 +77,10 @@ diff --git a/gfx/moz.build b/gfx/moz.build 'qcms', 'gl', 'layers', - 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - 'webrender_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 -@@ -143,16 +143,19 @@ if CONFIG['CC_TYPE'] == 'gcc': +@@ -111,16 +111,19 @@ if CONFIG['CC_TYPE'] == 'gcc': if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): CXXFLAGS += [ '-Wno-implicit-fallthrough', @@ -126,7 +103,7 @@ diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build -@@ -817,16 +817,19 @@ if CONFIG['CC_TYPE'] == 'gcc': +@@ -488,16 +488,19 @@ if CONFIG['CC_TYPE'] == 'gcc': if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): CXXFLAGS += [ '-Wno-implicit-fallthrough', @@ -149,7 +126,12 @@ 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 -@@ -290,6 +290,9 @@ +@@ -274,11 +274,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and + + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': + CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] + + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] DEFINES['GRAPHITE2_STATIC'] = True @@ -178,7 +160,7 @@ 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 -@@ -67,12 +67,15 @@ etld_data = GENERATED_FILES['etld_data.i +@@ -74,12 +74,15 @@ etld_data = GENERATED_FILES['etld_data.i etld_data.script = 'prepare_tlds.py' etld_data.inputs = ['effective_tld_names.dat'] @@ -197,20 +179,30 @@ 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 -@@ -226,6 +226,9 @@ - if CONFIG['MOZ_SYSTEM_WEBP']: - OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] +@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: + OS_LIBS += [ + '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'], + '-lgvr', + ] + + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - + if CONFIG['MOZ_SYSTEM_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] + + if CONFIG['MOZ_SYSTEM_PNG']: + OS_LIBS += CONFIG['MOZ_PNG_LIBS'] + + if CONFIG['MOZ_SYSTEM_WEBP']: + OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -331,16 +331,26 @@ def freetype2_combined_info(fontconfig_i +@@ -377,16 +377,26 @@ def freetype2_combined_info(fontconfig_i return namespace( cflags=freetype2_info.cflags + fontconfig_info.cflags, libs=freetype2_info.libs + fontconfig_info.libs, @@ -224,7 +216,7 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.2', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) diff --git a/2001_system_graphite2_support.patch b/2001_system_graphite2_support.patch index a68196b17806..bb3753441a10 100644 --- a/2001_system_graphite2_support.patch +++ b/2001_system_graphite2_support.patch @@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild --- a/config/system-headers.mozbuild +++ b/config/system-headers.mozbuild -@@ -1235,16 +1235,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr +@@ -1235,16 +1235,22 @@ if CONFIG['OS_TARGET'] == 'Android': if CONFIG['MOZ_SYSTEM_HARFBUZZ']: system_headers += [ @@ -77,11 +77,11 @@ diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh diff --git a/gfx/moz.build b/gfx/moz.build --- a/gfx/moz.build +++ b/gfx/moz.build -@@ -5,28 +5,30 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - +@@ -7,16 +7,19 @@ with Files('**'): BUG_COMPONENT = ('Core', 'Graphics') + with Files('wr/**'): + BUG_COMPONENT = ('Core', 'Graphics: WebRender') if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] @@ -97,22 +97,15 @@ diff --git a/gfx/moz.build b/gfx/moz.build 'ycbcr', 'angle', 'src', - 'qcms', - 'gl', - 'layers', -- 'graphite2/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - 'webrender_bindings', - ] - diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build -@@ -288,7 +288,10 @@ +@@ -272,16 +272,19 @@ CFLAGS += CONFIG['TK_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'): + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] + + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': + CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] @@ -122,13 +115,16 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build +else: + DEFINES['GRAPHITE2_STATIC'] = True + if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['CC_TYPE'] == 'clang': # Suppress warnings from Skia header files. - + SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] diff --git a/old-configure.in b/old-configure.in --- a/old-configure.in +++ b/old-configure.in -@@ -3857,16 +3857,37 @@ if test "$USE_FC_FREETYPE"; then +@@ -2690,16 +2690,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>]) @@ -169,20 +165,30 @@ diff --git a/old-configure.in b/old-configure.in diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -229,5 +229,8 @@ - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] +@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']: + OS_LIBS += [ + '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'], + '-lgvr', + ] + + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] + - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - + if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + + if CONFIG['MOZ_SYSTEM_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] + + if CONFIG['MOZ_SYSTEM_PNG']: + OS_LIBS += CONFIG['MOZ_PNG_LIBS'] diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -331,16 +331,30 @@ def freetype2_combined_info(fontconfig_i +@@ -377,16 +377,30 @@ def freetype2_combined_info(fontconfig_i return namespace( cflags=freetype2_info.cflags + fontconfig_info.cflags, libs=freetype2_info.libs + fontconfig_info.libs, @@ -210,6 +216,6 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)") - system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.2', + system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1', when='--with-system-harfbuzz') @@ -15,11 +15,11 @@ _pgo=true # /view/head:/debian/patches/unity-menubar.patch # patches from gentoo: -# https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-67.0-patches-05.tar.xz +# https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-07.tar.xz _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=67.0.4 +pkgver=68.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') @@ -34,7 +34,10 @@ depends=('mozilla-common' 'libxt' 'startup-notification' 'mime-types' # system harfbuzz 'harfbuzz' # system graphite - 'graphite') + 'graphite' + # system webp + 'libwebp' + ) makedepends=('unzip' 'zip' 'diffutils' 'python2-setuptools' 'yasm' 'mesa' 'imake' 'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust' @@ -46,7 +49,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'pulseaudio: Audio support') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=9c008b241362 +_patchrev=840132a4a9b3 options=('!emptydirs') _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -64,22 +67,14 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" unity-menubar.patch add_missing_pgo_rule.patch pgo_fix_missing_kdejs.patch - 2001_system_graphite2_support.patch 2000_system_harfbuzz_support.patch + 2001_system_graphite2_support.patch # pgo fixes mozilla-1516803.patch mozilla-1516081.patch pgo.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 - 2009_rust-1.33-support.patch.xz - 2010_rust-1.33-support.patch.xz - 2011_rust-1.33-support.patch.xz # use sytem av1 7002_system_av1_support.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1542958 - # note: fixes compile errrors when using elf migrartion - 2014_spectre_variant2_bug1542958.patch - 2015_spectre_variant2_bug1542958.patch ) # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -125,17 +120,6 @@ prepare() { patch -Np1 -i "$srcdir"/2001_system_graphite2_support.patch patch -Np1 -i "$srcdir"/7002_system_av1_support.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 - # patch -Np1 -i ../0001-bz-1468911.patch patch is to large for the AUR - xzcat "$srcdir"/2009_rust-1.33-support.patch.xz | patch -Np1 - xzcat "$srcdir"/2010_rust-1.33-support.patch.xz | patch -Np1 - xzcat "$srcdir"/2011_rust-1.33-support.patch.xz | patch -Np1 - - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1542958 - # note: fixes compile errrors when using elf migrartion - patch -Np1 -i "$srcdir"/2014_spectre_variant2_bug1542958.patch - patch -Np1 -i "$srcdir"/2015_spectre_variant2_bug1542958.patch if [[ $_pgo ]] ; then # https://bugzilla.mozilla.org/show_bug.cgi?id=1516803 @@ -231,25 +215,20 @@ END ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" } md5sums=('SKIP' - '15a351d5936fb76a779d3afa2baa1308' + '0ffd8ac9de394285f53ad08c783d5b30' '14e0f6237a79b85e60256f4808163160' '5cee310a9040ccc5abcf29742b84aeb8' '05bb69d25fb3572c618e3adf1ee7b670' 'd7ce23a18da21c05cd756766e177834f' - '1fd3db31015977eb77960716d6d2dbe6' - '270eed48793b9358702e7de6185c32be' - '8b24c694c259064b1296e7a1397c3aee' - '4cd539459e253f53f631ccca51650a87' + '6ce1848c9987aa10e954c5f9ac2c7e18' + 'cbec3c8957600bb83c7bfffa6fd42d70' + 'e083ae314eaa9355aa2d4aa75a7fc277' + '16447c9996d36ab3b61d64de9843c681' 'fe24f5ea463013bb7f1c12d12dce41b2' '3fa8bd22d97248de529780f5797178af' - '554514bf00a7927a85280f19e52a55fb' - '5b0d39aebb1ce84f89bda300320b851f' + 'bb549715cf74bcd5cbb0a1e435b1651e' + '05041908a051d5de7c015747d4cb0f4f' 'becf6bf9ceb6008401832c855ccadff9' '79d27c8896913c7d87b148240995ab69' 'f867ae41a722630cc5567e2dcc51676d' - 'ef358dae95d487740dda8114df4d5f90' - 'f343dc6520abb0be8eb77da17256ce21' - '4594ded5cdcdaae038bc49645643f914' - 'df439e02304d302009c320a540f01dbe' - 'f0e6dccbb32695d2d9057dacd650822c' - 'cca2f77b28b5fd53cbc919045006ab0a') + 'df439e02304d302009c320a540f01dbe') diff --git a/mozconfig b/mozconfig index 0d89dc1b1162..4d30cd465ea1 100644 --- a/mozconfig +++ b/mozconfig @@ -6,11 +6,12 @@ ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-rust-simd +# Branding ac_add_options --enable-release ac_add_options --enable-official-branding ac_add_options --enable-update-channel=release ac_add_options --with-distribution-id=org.archlinux - +ac_add_options --with-unsigned-addon-scopes=app,system export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 export MOZ_SOURCE_REPO=https://hg.mozilla.org/mozilla-unified @@ -24,6 +25,7 @@ ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-icu ac_add_options --with-system-jpeg +ac_add_options --with-system-webp ac_add_options --with-system-zlib ac_add_options --with-system-bz2 #ac_add_options --with-system-libvpx @@ -34,6 +36,7 @@ ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman ac_add_options --enable-system-av1 +ac_add_options --enable-necko-wifi ac_add_options --disable-libproxy #ac_add_options --enable-shared-js diff --git a/unity-menubar.patch b/unity-menubar.patch index a8cbd9530c46..0f1d9bbe6702 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -14,7 +14,7 @@ <menu id="file-menu" label="&fileMenu.label;" --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -5776,11 +5776,17 @@ function onViewToolbarsPopupShowing(aEve +@@ -5977,11 +5977,17 @@ function onViewToolbarsPopupShowing(aEve let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -34,7 +34,7 @@ "autohide" : "collapsed"; --- a/browser/components/places/content/places.xul +++ b/browser/components/places/content/places.xul -@@ -173,7 +173,7 @@ +@@ -166,7 +166,7 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" #else @@ -45,7 +45,7 @@ id="organizeButton" label="&organize.label;" --- a/dom/xul/XULPopupElement.cpp +++ b/dom/xul/XULPopupElement.cpp -@@ -157,6 +157,10 @@ void XULPopupElement::GetState(nsString& +@@ -156,6 +156,10 @@ void XULPopupElement::GetState(nsString& // set this here in case there's no frame for the popup aState.AssignLiteral("closed"); @@ -56,7 +56,7 @@ nsMenuPopupFrame* menuPopupFrame = do_QueryFrame(GetPrimaryFrame()); if (menuPopupFrame) { switch (menuPopupFrame->PopupState()) { -@@ -180,6 +184,11 @@ void XULPopupElement::GetState(nsString& +@@ -179,6 +183,11 @@ void XULPopupElement::GetState(nsString& break; } } @@ -70,9 +70,9 @@ nsINode* XULPopupElement::GetTriggerNode() const { --- a/dom/xul/moz.build +++ b/dom/xul/moz.build -@@ -76,6 +76,11 @@ LOCAL_INCLUDES += [ - '/layout/xul/tree', - ] +@@ -78,6 +78,11 @@ LOCAL_INCLUDES += [ + + include('/ipc/chromium/chromium-config.mozbuild') +if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + LOCAL_INCLUDES += [ @@ -97,7 +97,7 @@ 'components.conf', --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -277,6 +277,9 @@ pref("dom.window.event.enabled", true); +@@ -246,6 +246,9 @@ pref("dom.window.event.enabled", true); pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); @@ -105,11 +105,11 @@ +pref("ui.use_unity_menubar", true); +#endif pref("ui.click_hold_context_menus", false); - - // Pop up context menu on mouseup instead of mousedown, if that's the OS default. + // 0 = false, 1 = true, 2 = autodetect. + pref("ui.android.mouse_as_touch", 1); --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css -@@ -244,6 +244,18 @@ toolbar[type="menubar"] { +@@ -215,6 +215,18 @@ toolbar[type="menubar"] { } %endif @@ -146,7 +146,7 @@ 'nsWindow.cpp', # conflicts with X11 headers ] -@@ -124,6 +133,7 @@ FINAL_LIBRARY = 'xul' +@@ -127,6 +136,7 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/layout/base', '/layout/generic', @@ -324,7 +324,7 @@ +#endif /* __nsDbusmenu_h__ */ --- /dev/null +++ b/widget/gtk/nsMenu.cpp -@@ -0,0 +1,845 @@ +@@ -0,0 +1,843 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -337,12 +337,13 @@ +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/ComputedStyleInlines.h" +#include "mozilla/EventDispatcher.h" +#include "mozilla/GuardObjects.h" +#include "mozilla/MouseEvents.h" +#include "mozilla/Move.h" ++#include "mozilla/PresShell.h" ++#include "mozilla/PresShellInlines.h" +#include "nsAutoPtr.h" +#include "nsBindingManager.h" +#include "nsComponentManagerUtils.h" @@ -352,7 +353,6 @@ +#include "nsGtkUtils.h" +#include "nsAtom.h" +#include "nsIContent.h" -+#include "nsIPresShell.h" +#include "nsIRunnable.h" +#include "nsITimer.h" +#include "nsString.h" @@ -446,14 +446,13 @@ +AttachXBLBindings(nsIContent *aContent) +{ + dom::Document *doc = aContent->OwnerDoc(); -+ nsIPresShell *shell = doc->GetShell(); ++ PresShell *shell = doc->GetPresShell(); + if (!shell) { + return; + } + + RefPtr<ComputedStyle> style = -+ shell->StyleSet()->ResolveStyleFor(aContent->AsElement(), -+ LazyComputeBehavior::Allow); ++ shell->StyleSet()->ResolveStyleLazily(*aContent->AsElement()); + + if (!style) { + return; @@ -470,11 +469,10 @@ + } + + RefPtr<nsXBLBinding> binding; -+ bool dummy; + nsresult rv = xbl->LoadBindings(aContent->AsElement(), + display->mBinding->GetURI(), + display->mBinding->ExtraData()->Principal(), -+ getter_AddRefs(binding), &dummy); ++ getter_AddRefs(binding)); + if ((NS_FAILED(rv) && rv != NS_ERROR_XBL_BLOCKED) || !binding) { + return; + } @@ -2212,7 +2210,7 @@ +#endif /* __nsMenuContainer_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuItem.cpp -@@ -0,0 +1,765 @@ +@@ -0,0 +1,764 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -2222,7 +2220,6 @@ + +#include "mozilla/ArrayUtils.h" +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/dom/KeyboardEventBinding.h" @@ -3078,10 +3075,11 @@ +#include "imgRequestProxy.h" +#include "mozilla/ArrayUtils.h" +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/Preferences.h" ++#include "mozilla/PresShell.h" ++#include "mozilla/PresShellInlines.h" +#include "nsAttrValue.h" +#include "nsComputedDOMStyle.h" +#include "nsContentUtils.h" @@ -3090,7 +3088,6 @@ +#include "nsIContentPolicy.h" +#include "nsILoadGroup.h" +#include "nsImageToPixbuf.h" -+#include "nsIPresShell.h" +#include "nsIURI.h" +#include "nsNetUtil.h" +#include "nsPresContext.h" @@ -3249,7 +3246,7 @@ + uriString)) { + NS_NewURI(getter_AddRefs(uri), uriString); + } else { -+ nsIPresShell *shell = doc->GetShell(); ++ PresShell *shell = doc->GetPresShell(); + if (!shell) { + return; + } @@ -3729,7 +3726,7 @@ +} --- /dev/null +++ b/widget/gtk/nsMenuObject.h -@@ -0,0 +1,172 @@ +@@ -0,0 +1,169 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -3741,15 +3738,12 @@ +#define __nsMenuObject_h__ + +#include "mozilla/Attributes.h" ++#include "mozilla/ComputedStyleInlines.h" +#include "nsCOMPtr.h" + +#include "nsDbusmenu.h" +#include "nsNativeMenuDocListener.h" + -+namespace mozilla { -+class ComputedStyle; -+} -+ +class nsIContent; +class nsMenuContainer; +class nsMenuObjectIconLoader; @@ -3904,7 +3898,7 @@ +#endif /* __nsMenuObject_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuSeparator.cpp -@@ -0,0 +1,85 @@ +@@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -3913,7 +3907,6 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/Move.h" +#include "nsAutoPtr.h" +#include "nsCRT.h" @@ -5140,15 +5133,15 @@ +#endif /* __nsNativeMenuService_h__ */ --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -70,6 +70,7 @@ +@@ -71,6 +71,7 @@ #include "mozilla/Assertions.h" #include "mozilla/Likely.h" +#include "mozilla/Move.h" #include "mozilla/Preferences.h" #include "nsIPrefService.h" - #include "nsIGConfService.h" -@@ -4843,6 +4844,10 @@ void nsWindow::HideWindowChrome(bool aSh + #include "nsIServiceManager.h" +@@ -5028,6 +5029,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5158,7 +5151,7 @@ + bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, bool aAlwaysRollup) { - nsIRollupListener *rollupListener = GetActiveRollupListener(); + nsIRollupListener* rollupListener = GetActiveRollupListener(); --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -38,6 +38,8 @@ @@ -5179,7 +5172,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -622,6 +626,8 @@ class nsWindow final : public nsBaseWidg +@@ -632,6 +636,8 @@ class nsWindow final : public nsBaseWidg mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; static CSDSupportLevel sCSDSupportLevel; @@ -5236,7 +5229,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2464,7 +2465,7 @@ STATIC_ATOMS = [ +@@ -2476,7 +2477,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS |