From bf22379f50b53e5865d8ffc499fd7873dd01b34f Mon Sep 17 00:00:00 2001
From: dr460nf1r3 <njcrypted@protonmail.com>
Date: Wed, 28 Apr 2021 17:13:28 +0200
Subject: [PATCH] Update with Librewolf & Plasmafox changes

---
 .SRCINFO                                  |  2 +-
 PKGBUILD                                  | 16 +++++++++++-----
 fix-hidden-buttons-with-csd-menubar.patch | 13 +++++++++++++
 mozilla-kde-plasmafox88.patch             |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 fix-hidden-buttons-with-csd-menubar.patch

diff --git a/.SRCINFO b/.SRCINFO
index 549f4d07acc..58a60e23e86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firedragon
 	pkgdesc = Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE
 	pkgver = 88.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://gitlab.com/dr460nf1r3/settings/
 	install = firedragon.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index a47858c1578..100753f8ec4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=firedragon
 _pkgname=FireDragon
 pkgver=88.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE"
 arch=(x86_64 aarch64)
 backup=('usr/lib/firedragon/firedragon.cfg'
@@ -37,9 +37,9 @@ install=$pkgname.install
 _arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk
 _linux_commit=9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf
 _settings_commit=1b9cc88ccf64993951fe28cf426cf883e37e1b4d
-_mbrev=2377
+_mbrev=2389
 _patchrevsuse=3fdf082cf93d94e4289e552cbd9988601044576a
-_pfdate=20210419
+_pfdate=20210420
 _patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrevsuse
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         $pkgname.desktop
@@ -53,6 +53,7 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         firefox-kde-$_patchrevsuse.patch::$_patchurl/firefox/firefox-kde.patch
         mozilla-kde-plasmafox88.patch
         mozilla-nongnome-proxies-$_patchrevsuse.patch::$_patchurl/mozilla-nongnome-proxies.patch
+        fix-hidden-buttons-with-csd-menubar.patch
         0004-bmo-847568-Support-system-harfbuzz.patch
         0005-bmo-847568-Support-system-graphite2.patch
         0006-bmo-1559213-Support-system-av1.patch
@@ -68,12 +69,13 @@ sha256sums=('6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297'
             'SKIP'
             'af9d9341917cf3c5844fc46597ad2d842642c937c9be574bfacfe5c242b1114c'
             '3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd'
-            '85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f'
+            '860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7'
             'f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9'
             '6ca7ff71cb4a7c72eca39769afe8e18ec81cba36d9b570df15fc243867049243'
             '0ae5bce3da13b7f58e37be6d7115bef323256d776195279592f4371179497f8a'
-            '1bc7bd9c5af98071b89917a1421535c0313f07c1db72f6a9bd5f600d5b370b4d'
+            '9398b1e00e843776baa6396e1a5ffd3852439efe73e76f80acefb23a617dc3ac'
             'fbd95cbcbc32673ef549b43b0d2de3ef0ef4fa303b6336e64993f2c8a73264e4'
+            '482935782429b30f5e1581347a9a798705068c40f20bf4eee9304a254fd81bc8'
             'e17f631bc9b1873419ff10fef5fad6061e8695b961b6bb90616ec04444834608'
             '00d3524f5361614fee7eb448a528a0b53833f0a328055e17e07ea38038e5aa70'
             'be41698666dbd321884c35b661c3ac457ecc5bf699fe2374ad6ad9273c6489e4'
@@ -102,6 +104,9 @@ prepare() {
   patch -Np1 -i ../mozilla-kde-plasmafox88.patch
   patch -Np1 -i ../firefox-kde-$_patchrevsuse.patch
   
+  # Ubuntu patches
+  patch -Np1 -i ../fix-hidden-buttons-with-csd-menubar.patch
+  
   # Gentoo patches
   echo "---- Gentoo patches"
   patch -Np1 -i ../0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
@@ -268,6 +273,7 @@ build() {
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
+  export MOZ_ENABLE_FULL_SYMBOLS=1
   export MACH_USE_SYSTEM_PYTHON=1
 
   # LTO needs more open files
diff --git a/fix-hidden-buttons-with-csd-menubar.patch b/fix-hidden-buttons-with-csd-menubar.patch
new file mode 100644
index 00000000000..321b417083d
--- /dev/null
+++ b/fix-hidden-buttons-with-csd-menubar.patch
@@ -0,0 +1,13 @@
+Fix window buttons in case CSD when globalmenu is active
+(taken from firefox-kde-opensuse)
+
+--- a/browser/base/content/browser.css
++++ b/browser/base/content/browser.css
+@@ -334,5 +334,5 @@ toolbar[customizing] #whats-new-menu-button {
+ %ifdef MENUBAR_CAN_AUTOHIDE
+ #toolbar-menubar[autohide=true]:not([inactive]) + #TabsToolbar > .titlebar-buttonbox-container {
+-  visibility: hidden;
++  visibility: visible;
+ }
+ %endif
+ 
diff --git a/mozilla-kde-plasmafox88.patch b/mozilla-kde-plasmafox88.patch
index 5ae3ad4a021..0b14f3e7c72 100644
--- a/mozilla-kde-plasmafox88.patch
+++ b/mozilla-kde-plasmafox88.patch
@@ -1938,4 +1938,4 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  
    return giovfs->ShowURIForInput(mPath);
  #elif defined(MOZ_WIDGET_ANDROID)
-   // Try to get a mimetype, if this fails just use the file uri alone
\ No newline at end of file
+   // Try to get a mimetype, if this fails just use the file uri alone