Update to 92.0.1

- New upstream release
- Update patches:
  - unity-menubar patch from Ubuntu
  - firefox-kde patches from openSUSE
  - Gentoo
- Use Gentoo patches for system:
  - harbuzz
  - graphite2
  - av1
- Remove need for graphite2 mozilla by using patch that reuses bundeld
  GeckoExtra for graphite instead of patching graphite2
- Update workaround patch for #14

8 files changed, 210 insertions, 230 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c23376328f1c..7ab3a0064519 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Sep  7 04:39:16 UTC 2021
+# Sun Oct  3 12:11:34 UTC 2021
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 91.0.2
+	pkgver = 92.0.1
 	pkgrel = 1
 	url = https://github.com/openSUSE/firefox-maintenance
 	arch = i686
@@ -53,30 +53,30 @@ pkgbase = firefox-kde-opensuse
 	depends = dav1d
 	depends = aom
 	depends = harfbuzz
-	depends = graphite-mozilla
+	depends = graphite
 	depends = libwebp
 	depends = libevent
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = pulseaudio: Audio support
-	provides = firefox=91.0.2
+	provides = firefox=92.0.1
 	conflicts = firefox
 	options = !emptydirs
-	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_91_0_2_RELEASE
+	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_92_0_1_RELEASE
 	source = mozconfig
 	source = firefox.desktop
 	source = vendor.js
 	source = kde.js
-	source = firefox-branded-icons-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/firefox/firefox-branded-icons.patch
-	source = firefox-kde-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/firefox/firefox-kde.patch
-	source = mozilla-kde-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/mozilla-kde.patch
-	source = mozilla-nongnome-proxies-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/mozilla-nongnome-proxies.patch
+	source = firefox-branded-icons-a0c9416afc032611d6171e58cf711d3cb86c705f.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/a0c9416afc032611d6171e58cf711d3cb86c705f/firefox/firefox-branded-icons.patch
+	source = firefox-kde-a0c9416afc032611d6171e58cf711d3cb86c705f.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/a0c9416afc032611d6171e58cf711d3cb86c705f/firefox/firefox-kde.patch
+	source = mozilla-kde-a0c9416afc032611d6171e58cf711d3cb86c705f.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/a0c9416afc032611d6171e58cf711d3cb86c705f/mozilla-kde.patch
+	source = mozilla-nongnome-proxies-a0c9416afc032611d6171e58cf711d3cb86c705f.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/a0c9416afc032611d6171e58cf711d3cb86c705f/mozilla-nongnome-proxies.patch
 	source = unity-menubar.patch
 	source = add_missing_pgo_rule.patch
 	source = pgo_fix_missing_kdejs.patch
-	source = 2000_system_harfbuzz_support.patch
-	source = 2001_system_graphite2_support.patch
-	source = 7002_system_av1_support.patch
+	source = 0004-bmo-847568-Support-system-harfbuzz.patch
+	source = 0005-bmo-847568-Support-system-graphite2.patch
+	source = 0006-bmo-1559213-Support-system-av1.patch
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = 5022efe33088.patch
 	source = build-disable-elfhack.patch
@@ -93,25 +93,25 @@ pkgbase = firefox-kde-opensuse
 	md5sums = 4c23d9c0a691d70919beb1dafbbecbd3
 	md5sums = 05bb69d25fb3572c618e3adf1ee7b670
 	md5sums = c0f68250d27f208efcdee710207cd3e4
-	md5sums = 43c65f6513fbc28aaa8238ad3bdb4e26
+	md5sums = 9fbe0e41f2d08f9b7509c4afc77e02ee
 	md5sums = 14ada9ebd479223d5f95a615caa50bcd
 	md5sums = 0a5733b7a457a2786c2dd27626a1bf88
-	md5sums = 0d7f0fe667c3e9e54f95fa51e9560eed
+	md5sums = 9ad2dc49bf1cf74f70df2917d673c888
 	md5sums = fe24f5ea463013bb7f1c12d12dce41b2
 	md5sums = 3c383d371d7f6ede5983a40310518715
-	md5sums = 6a1ed12b8dbac57722436a2987e3ea33
-	md5sums = 791db11feed7c4130b5af80b85ebcfbb
-	md5sums = 967b311e1a5c988a257b51d97633fba4
+	md5sums = 33f9a50bb1c0152c8f73afad90caf673
+	md5sums = 10039de04111c320b075d1db592658b7
+	md5sums = 32749b8718999bcba34a508189046b5c
 	md5sums = e7994b3b78b780ebe610ba3d87247e40
 	md5sums = 00abc3976f028f8fe07111b9e687b574
 	md5sums = c7b492df4fbf42ffe8aea4c0afb89921
 	md5sums = 04d226e7e748141d447ea28535890631
 	md5sums = c2ccbfca8c29fb6d960206af335c1d8e
-	md5sums = b21033ca08953e7ce8304a208869eed1
+	md5sums = 5898cf09e6abd4c0e8b526a61b2d63b3
 	md5sums = d928ecb61da7628d4e7981ebf7e4c879
 	md5sums = 5cf84ebbd3c787b56198c32a91b4df16
 	md5sums = f49ac3b9f5146e33ce587e6b23eb1a86
-	md5sums = eb9fd90a3b18bfeebbed7e0e6056079c
+	md5sums = 2cf74781f6b742d6b7e6f7251f49311a
 
 pkgname = firefox-kde-opensuse
 
diff --git a/2000_system_harfbuzz_support.patch b/0004-bmo-847568-Support-system-harfbuzz.patch
index 37017f9623de..f6e650396fd6 100644
--- a/2000_system_harfbuzz_support.patch
+++ b/0004-bmo-847568-Support-system-harfbuzz.patch
@@ -1,18 +1,30 @@
-# HG changeset patch
-# Parent  ddfced51baf26d84a283f2838dc4cf3a1dbff7ec
-Add ability to use system-harfbuzz instead of bundled.
+From 4057cc754b266a29b97ca5735439f22780e3897c Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 6 Apr 2020 19:32:39 +0200
+Subject: [PATCH 04/34] bmo#847568: Support system harfbuzz
 
-https://bugzilla.mozilla.org/show_bug.cgi?id=847568
+Allow building against system-wide harfbuzz.
+
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=847568
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ config/system-headers.mozbuild  | 7 +++++++
+ dom/base/moz.build              | 3 +++
+ gfx/moz.build                   | 4 +++-
+ gfx/skia/generate_mozbuild.py   | 3 +++
+ gfx/skia/moz.build              | 3 +++
+ gfx/thebes/moz.build            | 3 +++
+ intl/unicharutil/util/moz.build | 3 +++
+ netwerk/dns/moz.build           | 3 +++
+ toolkit/library/moz.build       | 3 +++
+ toolkit/moz.configure           | 9 +++++++++
+ 10 files changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
+index 9018d3e580..a2977231ee 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1227,16 +1227,23 @@ if CONFIG['OS_TARGET'] == 'Android':
-         'utils/TypeHelpers.h',
-         'utils/Unicode.h',
-         'utils/Vector.h',
-         'utils/VectorImpl.h',
-         'vr/gvr/capi/include/gvr_controller.h',
+@@ -1235,6 +1235,13 @@ if CONFIG['OS_TARGET'] == 'Android':
          'vr/gvr/capi/include/gvr.h',
      ]
  
@@ -26,39 +38,35 @@ diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
  if CONFIG['MOZ_JACK']:
      system_headers += [
          'jack/jack.h',
-         'jack/statistics.h',
-     ]
- 
- if CONFIG['MOZ_SYSTEM_JPEG']:
-     system_headers += [
 diff --git a/dom/base/moz.build b/dom/base/moz.build
+index fa75996f78..56652f41de 100644
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
-@@ -549,6 +549,9 @@
+@@ -559,6 +559,9 @@ FINAL_LIBRARY = "xul"
  if CONFIG["MOZ_X11"]:
      CXXFLAGS += CONFIG["TK_CFLAGS"]
  
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
++    CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 +
  GeneratedFile(
      "UseCounterList.h",
      script="gen-usecounters.py",
-
 diff --git a/gfx/moz.build b/gfx/moz.build
+index 4d6d63da9d..8222b72333 100644
 --- a/gfx/moz.build
 +++ b/gfx/moz.build
-@@ -13,6 +13,9 @@
- if CONFIG["MOZ_TREE_CAIRO"]:
-     DIRS += ["cairo"]
+@@ -10,6 +10,9 @@ with Files("**"):
+ with Files("wr/**"):
+     BUG_COMPONENT = ("Core", "Graphics: WebRender")
  
-+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    DIRS += ['harfbuzz/src']
++if not CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
++    DIRS += ["harfbuzz/src"]
 +
  DIRS += [
+     "cairo",
      "2d",
-     "ycbcr",
-@@ -22,7 +25,6 @@
+@@ -20,7 +23,6 @@ DIRS += [
      "gl",
      "layers",
      "graphite2/src",
@@ -67,14 +75,10 @@ diff --git a/gfx/moz.build b/gfx/moz.build
      "thebes",
      "ipc",
 diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
+index 7d6644f65e..ba37dc9f90 100755
 --- a/gfx/skia/generate_mozbuild.py
 +++ b/gfx/skia/generate_mozbuild.py
-@@ -93,16 +93,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
-     CXXFLAGS += [
-         '-Wno-implicit-fallthrough',
-         '-Wno-inconsistent-missing-override',
-         '-Wno-macro-redefined',
+@@ -97,6 +97,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
          '-Wno-unused-private-field',
      ]
  
@@ -82,22 +86,13 @@ diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
-     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- 
- if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
+     LOCAL_INCLUDES += [
+         "/gfx/cairo/cairo/src",
 diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
+index 4ff948f567..6e920ff27f 100755
 --- a/gfx/skia/moz.build
 +++ b/gfx/skia/moz.build
-@@ -485,16 +485,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
-     CXXFLAGS += [
-         '-Wno-implicit-fallthrough',
-         '-Wno-inconsistent-missing-override',
-         '-Wno-macro-redefined',
+@@ -489,6 +489,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
          '-Wno-unused-private-field',
      ]
  
@@ -105,75 +100,77 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
-     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- 
- if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
+     LOCAL_INCLUDES += [
+         "/gfx/cairo/cairo/src",
 diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
+index 04692dbf30..e1cbefb604 100644
 --- a/gfx/thebes/moz.build
 +++ b/gfx/thebes/moz.build
-@@ -289,6 +289,9 @@
+@@ -290,6 +290,9 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
  
  DEFINES["GRAPHITE2_STATIC"] = True
  
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++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/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
+index 897bfad92a..5a83cdb2c1 100644
 --- a/intl/unicharutil/util/moz.build
 +++ b/intl/unicharutil/util/moz.build
-@@ -25,4 +25,7 @@
+@@ -25,6 +25,9 @@ UNIFIED_SOURCES += [
      "nsUnicodeProperties.cpp",
  ]
  
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
++    CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 +
- FINAL_LIBRARY = "xul"
+ GeneratedFile(
+     "BaseChars.h",
+     script="base_chars.py",
 diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
+index 1498dd2ceb..026798bf71 100644
 --- a/netwerk/dns/moz.build
 +++ b/netwerk/dns/moz.build
-@@ -102,5 +102,8 @@
+@@ -106,6 +106,9 @@ LOCAL_INCLUDES += [
+     "/netwerk/protocol/http",
+ ]
  
++if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
++    CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
++
  USE_LIBS += ["icu"]
  
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
  if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-     CXXFLAGS += ["-Wno-error=shadow"]
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
+index 5e2d8cb4cd..4b7194e9e2 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -238,6 +238,9 @@
- OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"]
- OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"]
+@@ -242,6 +242,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+         "-lgvr",
+     ]
  
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
++if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
++    OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
 +
  if CONFIG["MOZ_SYSTEM_JPEG"]:
      OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+index 8bad820dce..39944c4aa1 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -475,6 +475,16 @@
-     "_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True)
+@@ -460,6 +460,15 @@ add_old_configure_assignment(
  )
+ set_define("MOZ_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True))
  
 +# HarfBuzz
 +# ==============================================================
-+option('--with-system-harfbuzz',
-+       help="Use system harfbuzz (located with pkgconfig)")
++option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)")
 +
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.7.4',
 +                                    when='--with-system-harfbuzz')
 +
 +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
@@ -181,3 +178,6 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
  # Apple platform decoder support
  # ==============================================================
  @depends(toolkit)
+-- 
+2.33.0
+
diff --git a/2001_system_graphite2_support.patch b/0005-bmo-847568-Support-system-graphite2.patch
index b83cb466f2e5..8d60f9a80454 100644
--- a/2001_system_graphite2_support.patch
+++ b/0005-bmo-847568-Support-system-graphite2.patch
@@ -1,18 +1,29 @@
-# HG changeset patch
-# Parent  df5c5a8c44bbf84528429a29aa78de4488884713
+From 1a2fe72403851b69e4e6dd04abc618ffab38fb2f Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 6 Apr 2020 19:34:44 +0200
+Subject: [PATCH 05/34] bmo#847568: Support system graphite2
+
 Allow building against system-wide graphite2.
 
-https://bugzilla.mozilla.org/show_bug.cgi?id=847568
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=847568
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ config/system-headers.mozbuild     |  6 ++++++
+ gfx/graphite2/geckoextra/moz.build | 21 +++++++++++++++++++++
+ gfx/graphite2/moz-gr-update.sh     |  7 ++++++-
+ gfx/moz.build                      |  6 +++++-
+ gfx/thebes/moz.build               |  5 ++++-
+ old-configure.in                   | 21 +++++++++++++++++++++
+ toolkit/library/moz.build          |  3 +++
+ toolkit/moz.configure              | 13 +++++++++++++
+ 8 files changed, 79 insertions(+), 3 deletions(-)
+ create mode 100644 gfx/graphite2/geckoextra/moz.build
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
+index a2977231ee..e97a65307f 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1234,16 +1234,22 @@ if CONFIG['OS_TARGET'] == 'Android':
- 
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-     system_headers += [
- 	'harfbuzz/hb-glib.h',
- 	'harfbuzz/hb-ot.h',
+@@ -1242,6 +1242,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
  	'harfbuzz/hb.h',
      ]
  
@@ -25,13 +36,9 @@ diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
  if CONFIG['MOZ_JACK']:
      system_headers += [
          'jack/jack.h',
-         'jack/statistics.h',
-     ]
- 
- if CONFIG['MOZ_SYSTEM_JPEG']:
-     system_headers += [
 diff --git a/gfx/graphite2/geckoextra/moz.build b/gfx/graphite2/geckoextra/moz.build
 new file mode 100644
+index 0000000000..24e8d7a032
 --- /dev/null
 +++ b/gfx/graphite2/geckoextra/moz.build
 @@ -0,0 +1,21 @@
@@ -57,9 +64,10 @@ new file mode 100644
 +
 +FINAL_LIBRARY = 'gkmedias'
 diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
+index b91d9c161c..a97e6eb203 100755
 --- a/gfx/graphite2/moz-gr-update.sh
 +++ b/gfx/graphite2/moz-gr-update.sh
-@@ -1,11 +1,12 @@
+@@ -1,6 +1,7 @@
  #!/bin/bash
  
  # Script used to update the Graphite2 library in the mozilla source tree
@@ -67,17 +75,7 @@ diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
  
  # This script lives in gfx/graphite2, along with the library source,
  # but must be run from the top level of the mozilla-central tree.
- 
- # Run as
- #
- #    ./gfx/graphite2/moz-gr-update.sh RELEASE
- #
-@@ -32,22 +33,26 @@ echo "This directory contains the Graphi
- echo "$TARBALL" >> gfx/graphite2/README.mozilla
- echo ""
- echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
- 
- # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h)
+@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
  #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  
@@ -95,27 +93,23 @@ diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
  
  echo
  echo If gfx/graphite2/src/files.mk has changed, please make corresponding
- echo changes to gfx/graphite2/src/moz.build
- echo
- 
- echo
- echo Now use hg commands to create a patch for the mozilla tree.
 diff --git a/gfx/moz.build b/gfx/moz.build
+index 8222b72333..16a2b401db 100644
 --- a/gfx/moz.build
 +++ b/gfx/moz.build
-@@ -13,6 +13,11 @@
- if CONFIG["MOZ_TREE_CAIRO"]:
-     DIRS += ["cairo"]
+@@ -10,6 +10,11 @@ with Files("**"):
+ with Files("wr/**"):
+     BUG_COMPONENT = ("Core", "Graphics: WebRender")
  
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    DIRS += ['graphite2/geckoextra']
++if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
++    DIRS += ["graphite2/geckoextra"]
 +else:
-+    DIRS += ['graphite2/src' ]
++    DIRS += ["graphite2/src"]
 +
- if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-     DIRS += ['harfbuzz/src']
+ if not CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+     DIRS += ["harfbuzz/src"]
  
-@@ -24,7 +29,6 @@
+@@ -22,7 +27,6 @@ DIRS += [
      "qcms",
      "gl",
      "layers",
@@ -124,32 +118,30 @@ diff --git a/gfx/moz.build b/gfx/moz.build
      "thebes",
      "ipc",
 diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
+index e1cbefb604..4e5d693394 100644
 --- a/gfx/thebes/moz.build
 +++ b/gfx/thebes/moz.build
-@@ -287,7 +287,10 @@
+@@ -288,7 +288,10 @@ if CONFIG["MOZ_WAYLAND"]:
  
  LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
  
 -DEFINES["GRAPHITE2_STATIC"] = True
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
++if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
++    CXXFLAGS += CONFIG["MOZ_GRAPHITE2_CFLAGS"]
 +else:
 +    DEFINES["GRAPHITE2_STATIC"] = True
  
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-     CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+ if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+     CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 diff --git a/old-configure.in b/old-configure.in
+index 78c358a3b1..2a9b8ad1d7 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -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>])
-         CPPFLAGS="$_SAVE_CPPFLAGS"
+@@ -2205,6 +2205,27 @@ if test "$USE_FC_FREETYPE"; then
      fi
  fi
  
- dnl ========================================================
++dnl ========================================================
 +dnl Check for graphite2
 +dnl ========================================================
 +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
@@ -170,39 +162,34 @@ diff --git a/old-configure.in b/old-configure.in
 +    CFLAGS=$_SAVE_CFLAGS
 +fi
 +
-+dnl ========================================================
- dnl Check if we need the 32-bit Linux SSE2 error dialog
- dnl ========================================================
- 
- AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
- 
  dnl ========================================================
- dnl Check for pixman and cairo
+ dnl Check if we need the 32-bit Linux SSE2 error dialog
  dnl ========================================================
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
+index 4b7194e9e2..077f3f2556 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -238,6 +238,9 @@
- OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"]
- OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"]
+@@ -242,6 +242,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+         "-lgvr",
+     ]
  
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
++if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
++    OS_LIBS += CONFIG["MOZ_GRAPHITE2_LIBS"]
 +
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-     OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+ if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+     OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+index 39944c4aa1..ed1244266c 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -475,6 +475,21 @@
-     "_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True)
+@@ -460,6 +460,19 @@ add_old_configure_assignment(
  )
+ set_define("MOZ_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True))
  
 +# Graphite2
 +# ==============================================================
-+option('--with-system-graphite2',
-+       help="Use system graphite2 (located with pkgconfig)")
++option('--with-system-graphite2', help="Use system graphite2 (located with pkgconfig)")
 +
 +@depends('--with-system-graphite2')
 +def check_for_graphite2(value):
@@ -213,9 +200,9 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 +
 +set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
 +
-+
  # HarfBuzz
  # ==============================================================
- option('--with-system-harfbuzz',
+ option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)")
+-- 
+2.33.0
 
- 
diff --git a/7002_system_av1_support.patch b/0006-bmo-1559213-Support-system-av1.patch
index 8142e50532ee..56872d8238c0 100644
--- a/7002_system_av1_support.patch
+++ b/0006-bmo-1559213-Support-system-av1.patch
@@ -1,7 +1,7 @@
-From 5abc4e0e050beb42c18f102803388d07d7c577f2 Mon Sep 17 00:00:00 2001
+From 4fa01b19e05ade439a2b7b600d55f3ae88e8ede9 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:36:02 +0200
-Subject: [PATCH 06/39] bmo#1559213: Support system av1
+Subject: [PATCH 06/34] bmo#1559213: Support system av1
 
 Allow building against system-wide av1.
 
@@ -15,10 +15,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  4 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/config/external/moz.build b/config/external/moz.build
-index 4e9888f365..bf1e255107 100644
+index 0ca007a425..5baf34432c 100644
 --- a/config/external/moz.build
 +++ b/config/external/moz.build
-@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+@@ -51,8 +51,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
      external_dirs += ["media/libvpx"]
  
  if CONFIG["MOZ_AV1"]:
@@ -31,10 +31,10 @@ index 4e9888f365..bf1e255107 100644
  if not CONFIG["MOZ_SYSTEM_PNG"]:
      external_dirs += ["media/libpng"]
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 27b5171d0a..c6213f1d96 100644
+index e97a65307f..ca0e6a0ad8 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1300,6 +1300,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
+@@ -1299,6 +1299,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
          'proxy.h',
      ]
  
@@ -66,10 +66,10 @@ index 16ca8a9cbc..b349dcbe6d 100644
  if CONFIG["MOZ_OMX"]:
      EXPORTS += [
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 31ab9c7add..9eb0a51d2d 100644
+index ed1244266c..b5fd725a46 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -559,14 +559,29 @@ def av1(value):
+@@ -544,14 +544,29 @@ def av1(value):
      if value:
          return True
  
@@ -101,14 +101,14 @@ index 31ab9c7add..9eb0a51d2d 100644
  def dav1d_nasm(target):
      if target.cpu in ("x86", "x86_64"):
          return namespace(version="2.14", what="AV1")
-@@ -576,6 +591,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
+@@ -561,6 +576,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
  set_define("MOZ_DAV1D_ASM", dav1d_asm)
  set_config("MOZ_AV1", av1)
  set_define("MOZ_AV1", av1)
 +set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True))
  
- # Built-in fragmented MP4 support.
+ # JXL Image Codec Support
  # ==============================================================
 -- 
-2.31.1
+2.33.0
 
diff --git a/0025-Fix-building-with-PGO-when-using-GCC.patch b/0025-Fix-building-with-PGO-when-using-GCC.patch
index 3740d954b875..e24bac5a55cf 100644
--- a/0025-Fix-building-with-PGO-when-using-GCC.patch
+++ b/0025-Fix-building-with-PGO-when-using-GCC.patch
@@ -1,7 +1,7 @@
-From 9b403dc8840d1f16ace76a9410fe003434a96e1b Mon Sep 17 00:00:00 2001
+From df1845c40a704c7095cbab1da965605e7cf8d33d Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 2 Jul 2020 18:05:03 +0200
-Subject: [PATCH 25/37] Fix building with PGO when using GCC
+Subject: [PATCH 25/35] Fix building with PGO when using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -13,22 +13,16 @@ diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo
 index 30b8b27fc4..95852d7c21 100644
 --- a/build/moz.configure/lto-pgo.configure
 +++ b/build/moz.configure/lto-pgo.configure
-@@ -84,12 +84,13 @@
- @imports(_from="__builtin__", _import="min")
+@@ -85,7 +85,7 @@
  def pgo_flags(compiler, profdata, target_is_windows):
      if compiler.type == "gcc":
-+        profile_use = "-fprofile-use"
          return namespace(
-             gen_cflags=["-fprofile-generate"],
+-            gen_cflags=["-fprofile-generate"],
++            gen_cflags=["-fprofile-generate", "-DMOZ_PROFILE_INSTRUMENTATION"],
              gen_ldflags=["-fprofile-generate"],
--            use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
--            use_ldflags=["-fprofile-use"],
-+            use_cflags=[profile_use, "-fprofile-correction", "-Wcoverage-mismatch"],
-+            use_ldflags=[profile_use],
-         )
- 
-     if compiler.type in ("clang-cl", "clang"):
-     
+             use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
+             use_ldflags=["-fprofile-use"],
+
 diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
 index 7f3de106ab..89289a7756 100755
 --- a/build/pgo/profileserver.py
@@ -81,5 +75,5 @@ index 7f3de106ab..89289a7756 100755
          if llvm_profdata:
              profraw_files = glob.glob("*.profraw")
 -- 
-2.31.1
+2.32.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 72e068919e38..40438c100919 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ _pgo=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=91.0.2
+pkgver=92.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
@@ -28,7 +28,7 @@ depends=('libxt' 'mime-types'
          # system harfbuzz
          'harfbuzz'
          # system graphite
-         'graphite-mozilla'
+         'graphite'
          # system webp
          'libwebp'
          # system libevent
@@ -52,7 +52,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'pulseaudio: Audio support')
 provides=("firefox=${pkgver}")
 conflicts=('firefox')
-_patchrev=8bdd012e04c6e6c3f01d937faf16f3474685b9cb
+_patchrev=a0c9416afc032611d6171e58cf711d3cb86c705f
 options=('!emptydirs')
 _patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev
 _repo=https://hg.mozilla.org/mozilla-unified
@@ -76,10 +76,12 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         # end
 	add_missing_pgo_rule.patch
         pgo_fix_missing_kdejs.patch
-        2000_system_harfbuzz_support.patch
-        2001_system_graphite2_support.patch
+        # use system harfbuzz
+        0004-bmo-847568-Support-system-harfbuzz.patch
+        # use system graphite2
+        0005-bmo-847568-Support-system-graphite2.patch
         # use sytem av1
-        7002_system_av1_support.patch
+        0006-bmo-1559213-Support-system-av1.patch
         # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
         0001-Use-remoting-name-for-GDK-application-names.patch
         # reenable system sqlite
@@ -141,10 +143,13 @@ prepare() {
   
   # Add globalmenu support
   patch -Np1 -i "$srcdir/unity-menubar.patch"
-  
-  patch -Np1 -i "$srcdir"/2000_system_harfbuzz_support.patch
-  patch -Np1 -i "$srcdir"/2001_system_graphite2_support.patch
-  patch -Np1 -i "$srcdir"/7002_system_av1_support.patch
+
+  # use system harfbuzz
+  patch -Np1 -i "$srcdir"/0004-bmo-847568-Support-system-harfbuzz.patch
+  # use system graphite2
+  patch -Np1 -i "$srcdir"/0005-bmo-847568-Support-system-graphite2.patch
+  # use sytem av1
+  patch -Np1 -i "$srcdir"/0006-bmo-1559213-Support-system-av1.patch
 
   # Fix MOZILLA#1530052
   patch -Np1 -i "$srcdir"/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -275,22 +280,22 @@ md5sums=('SKIP'
          '4c23d9c0a691d70919beb1dafbbecbd3'
          '05bb69d25fb3572c618e3adf1ee7b670'
          'c0f68250d27f208efcdee710207cd3e4'
-         '43c65f6513fbc28aaa8238ad3bdb4e26'
+         '9fbe0e41f2d08f9b7509c4afc77e02ee'
          '14ada9ebd479223d5f95a615caa50bcd'
          '0a5733b7a457a2786c2dd27626a1bf88'
-         '0d7f0fe667c3e9e54f95fa51e9560eed'
+         '9ad2dc49bf1cf74f70df2917d673c888'
          'fe24f5ea463013bb7f1c12d12dce41b2'
          '3c383d371d7f6ede5983a40310518715'
-         '6a1ed12b8dbac57722436a2987e3ea33'
-         '791db11feed7c4130b5af80b85ebcfbb'
-         '967b311e1a5c988a257b51d97633fba4'
+         '33f9a50bb1c0152c8f73afad90caf673'
+         '10039de04111c320b075d1db592658b7'
+         '32749b8718999bcba34a508189046b5c'
          'e7994b3b78b780ebe610ba3d87247e40'
          '00abc3976f028f8fe07111b9e687b574'
          'c7b492df4fbf42ffe8aea4c0afb89921'
          '04d226e7e748141d447ea28535890631'
          'c2ccbfca8c29fb6d960206af335c1d8e'
-         'b21033ca08953e7ce8304a208869eed1'
+         '5898cf09e6abd4c0e8b526a61b2d63b3'
          'd928ecb61da7628d4e7981ebf7e4c879'
          '5cf84ebbd3c787b56198c32a91b4df16'
          'f49ac3b9f5146e33ce587e6b23eb1a86'
-         'eb9fd90a3b18bfeebbed7e0e6056079c')
+         '2cf74781f6b742d6b7e6f7251f49311a')
diff --git a/fix-wayland-build.patch b/fix-wayland-build.patch
index e3a58c6ef2dd..703b1a8c1faf 100644
--- a/fix-wayland-build.patch
+++ b/fix-wayland-build.patch
@@ -1,25 +1,19 @@
 Description: Fix FTBFS on bionic. Compiler errors:
- In file included from Unified_cpp_widget_gtk2.cpp:2:
- In file included from /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.cpp:12:
- /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:53:30: error: unknown type name 'nsWaylandDragContext'
-   void SetWaylandDragContext(nsWaylandDragContext* aDragContext);
-                              ^
- /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:54:3: error: unknown type name 'nsWaylandDragContext'
-   nsWaylandDragContext* GetWaylandDragContext();
-   ^
- /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:62:10: error: use of undeclared identifier 'nsWaylandDragContext'
-   RefPtr<nsWaylandDragContext> mDragContext;
-          ^
+ In file included from Unified_cpp_widget_gtk1.cpp:2:
+ /<<BUILDDIR>>/firefox-92.0~b2+build1/widget/gtk/WaylandBuffer.cpp:261:39: error: unknown type name 'GLContext'; did you mean 'EGLContext'?
+    const LayoutDeviceIntSize& aSize, GLContext* aGL) {
+                                      ^~~~~~~~~
+
 Author: Rico Tzschichholz <ricotz@ubuntu.com>
 
---- a/widget/gtk/nsClipboardWayland.h
-+++ b/widget/gtk/nsClipboardWayland.h
-@@ -37,6 +37,8 @@
-   nsTArray<GdkAtom> mTargetMIMETypes;
- };
+--- a/widget/gtk/WaylandBuffer.cpp
++++ b/widget/gtk/WaylandBuffer.cpp
+@@ -258,7 +258,7 @@
+ 
+ /* static */
+ RefPtr<WaylandBufferDMABUF> WaylandBufferDMABUF::Create(
+-    const LayoutDeviceIntSize& aSize, GLContext* aGL) {
++    const LayoutDeviceIntSize& aSize, gl::GLContext* aGL) {
+   RefPtr<WaylandBufferDMABUF> buffer = new WaylandBufferDMABUF(aSize);
  
-+class nsWaylandDragContext;
-+
- class WaylandDataOffer : public DataOffer {
-  public:
-   explicit WaylandDataOffer(wl_data_offer* aWaylandDataOffer);
+   const auto flags =
diff --git a/unity-menubar.patch b/unity-menubar.patch
index 0c4103b66447..e404f73da79a 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -3517,7 +3517,7 @@
 +{
 +    RefPtr<ComputedStyle> style =
 +        nsComputedDOMStyle::GetComputedStyleNoFlush(
-+            mContent->AsElement(), nullptr);
++            mContent->AsElement());
 +
 +    return style.forget();
 +}