wf-g 6.0.7 and new diff script for it

6 files changed, 63 insertions, 21 deletions

diff --git a/waterfox-g/debian/add_new_i18n_packages.sh b/waterfox-g/debian/add_new_i18n_packages.sh
index ee7631a..8575aca 100755
--- a/waterfox-g/debian/add_new_i18n_packages.sh
+++ b/waterfox-g/debian/add_new_i18n_packages.sh
@@ -15,13 +15,15 @@ for _lang in "${_languages[@]}"; do
     cat <<EOT >> $SCRIPT_PATH/control
 Package: $_pkgname
 Architecture: all
-Depends: \${misc:Depends}, waterfox-g (>= \${source:Version})
+Depends: \${misc:Depends}, waterfox-g-kpe (>= \${source:Version})
 Replaces: $_pkgname_trans4 (<< 4.1.1-0~), $_pkgname_trans3 (<< 4.1.1-0~)
 Breaks: $_pkgname_trans4 (<< 4.1.1-0~), $_pkgname_trans3 (<< 4.1.1-0~)
 Description: $_locale_desc language pack for Waterfox G
  This package contains $_locale_desc translations for Waterfox G
 
 EOT
+# stackrpms,2
+sed -i -r -e '/^Depends:/s/waterfox-g-kpe/waterfox-g/g;' $SCRIPT_PATH/control
 touch $SCRIPT_PATH/${_pkgname}.install
 
     cat <<EOT > $SCRIPT_PATH/${_pkgname}.install
diff --git a/waterfox-g/debian/build.sh b/waterfox-g/debian/build.sh
index b7a1f9e..99fc473 100755
--- a/waterfox-g/debian/build.sh
+++ b/waterfox-g/debian/build.sh
@@ -27,11 +27,7 @@ export NASM=/usr/lib/nasm-mozilla/bin/nasm
 fi
 
 # For successfull LTO build, we need to use matching LLVM version
-if test `lsb_release -sc` = "bionic" || test `lsb_release -sc` = "focal" || test `lsb_release -sc` = "buster" || test `lsb_release -sc` = "bullseye"; then
-export PATH=/usr/lib/llvm-13/bin/:$PATH
-fi
-
-if test `lsb_release -sc` = "jammy"; then
+if test `lsb_release -sc` = "bionic" || test `lsb_release -sc` = "buster" || test `lsb_release -sc` = "bullseye" || test `lsb_release -sc` = "jammy" || test `lsb_release -sc` = "focal"; then
 export PATH=/usr/lib/llvm-15/bin/:$PATH
 fi
 
diff --git a/waterfox-g/debian/changelog b/waterfox-g/debian/changelog
index d85c707..0e835a3 100644
--- a/waterfox-g/debian/changelog
+++ b/waterfox-g/debian/changelog
@@ -1,8 +1,53 @@
-waterfox-g (6.0.2-1+stackrpms) obs; urgency=medium
+waterfox-g (6.0.7-100+stackrpms) obs; urgency=medium
 
     * Fork to remove KDE bits
 
- -- B. Stack <bgstack15@gmail.com>  Mon, 09 Oct 2023 12:43:32 -0400
+ -- B. Stack <bgstack15@gmail.com>  Thu, 25 Jan 2024 15:17:36 -0500
+
+waterfox-g-kpe (6.0.7-0) obs; urgency=medium
+
+    * Emoji support updated to 15.0.
+    * Security fixes
+    * You should now be able to Refresh your profile in about:support.
+    * NVIDIA Super Resolution should now work correctly, when toggling gfx.webrender.super-resolution.nvidia to true.
+
+ -- hawkeye116477 <hawkeye116477@gmail.com>  Thu, 21 Dec 2023 13:48:16 +0100
+
+waterfox-g-kpe (6.0.6-0) obs; urgency=medium
+
+    * DNS over Oblivious HTTP is now powered by Fastly!
+    * You can now choose to disable closing windows or tabs with Ctrl+W by setting browser.closeShortcut.disabled to true in about:config.
+    * Improved support for JPEG XL. Waterfox can now act as the default image viewer for such image files.
+    * Security fixes
+
+ -- hawkeye116477 <hawkeye116477@gmail.com>  Tue, 21 Nov 2023 13:44:11 +0100
+
+waterfox-g-kpe (6.0.5-0) obs; urgency=medium
+
+    * Security fixes
+    * Modal dialogues that display checkboxes would erroneously have two checkboxes, even if they werent meant to. This has now been fixed.
+
+ -- hawkeye116477 <hawkeye116477@gmail.com>  Wed, 25 Oct 2023 16:16:14 +0200
+
+waterfox-g-kpe (6.0.4-0) obs; urgency=medium
+
+    * On pages that try to load mixed content, Waterfox will attempt to upgrade non secure content.
+    * When closing multiple tabs to the left or right, Waterfox will now show the correct close dialogue.
+    * If DNS requests take too long, Waterfox will fallback to your default DNS much quicker.
+    * Waterfox will no longer decode URLs when copying them. This should allow easier sharing.
+    * You can now disable Oblivious DNS via the Preferences page.
+
+ -- hawkeye116477 <hawkeye116477@gmail.com>  Tue, 10 Oct 2023 19:18:03 +0200
+
+waterfox-g-kpe (6.0.3-0) obs; urgency=medium
+
+    * Hovering over inactive tabs will once again show the close button.
+    * Waterfox will be less strict with its public key pinning, which should resolve issues some users had connecting to certain websites.
+    * The extension button should no longer be missing! For the time being, moving it around has been disabled.
+    * When you click on the address bar, your top sites will now show.
+    * If you are closing more than 1 tab, you will now receive a prompt.
+
+ -- hawkeye116477 <hawkeye116477@gmail.com>  Tue, 10 Oct 2023 15:08:49 +0200
 
 waterfox-g-kpe (6.0.2-0) obs; urgency=medium
 
@@ -38,7 +83,6 @@ waterfox-g-kpe (5.1.12-0) obs; urgency=medium
 
  -- hawkeye116477 <hawkeye116477@gmail.com>  Sat, 02 Sep 2023 14:07:45 +0200
 
-
 waterfox-g-kpe (5.1.10-0) obs; urgency=medium
 
     * Added various security fixes.
diff --git a/waterfox-g/debian/control b/waterfox-g/debian/control
index 15d7853..19ea797 100644
--- a/waterfox-g/debian/control
+++ b/waterfox-g/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: B. Stack <bgstack15@gmail.com>
 XSBC-Original-Maintainer: hawkeye116477 <hawkeye116477@gmail.com>
-Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.66), libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-13 | clang-14 | clang-15, llvm-dev (>= 5.0) | llvm-13-dev | llvm-14-dev | llvm-15-dev, lld (>= 5.0) | lld-13 | lld-14 | lld-15, rustc (>= 1.66.0~), libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.24.3~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-13-dev | libclang-14-dev | libclang-15-dev, libstdc++6 (>= 7.0) | gcc-mozilla (>= 7), bc, libpci-dev
+Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.66), libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-13 | clang-14 | clang-15, llvm-dev (>= 5.0) | llvm-13-dev | llvm-14-dev | llvm-15-dev, lld (>= 5.0) | lld-13 | lld-14 | lld-15, rustc (>= 1.66.0~), libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.24.3~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-14-dev | libclang-15-dev, libclang-16-dev, libclang-rt-dev | libclang-rt-15-dev | libclang-rt-16-dev | libclang-common-15-dev, libstdc++6 (>= 7.0) | gcc-mozilla (>= 7), bc, libpci-dev
 Standards-Version: 3.9.7
 Homepage: https://www.waterfox.net/
 
diff --git a/waterfox-g/debian/usr.bin.waterfox-g b/waterfox-g/debian/usr.bin.waterfox-g
index e588573..4e3773d 100644
--- a/waterfox-g/debian/usr.bin.waterfox-g
+++ b/waterfox-g/debian/usr.bin.waterfox-g
@@ -3,16 +3,16 @@
 # Original Author: Jamie Strandboge <jamie@canonical.com>
 
 # Declare an apparmor variable to help with overrides
-@{MOZ_LIBDIR}=/usr/lib/waterfox-g4
+@{MOZ_LIBDIR}=/usr/lib/waterfox-g
 
 #include <tunables/global>
 
 # We want to confine the binaries that match:
-#  /usr/lib/waterfox-g4/waterfox-g4
-#  /usr/lib/waterfox-g4/waterfox-g4
+#  /usr/lib/waterfox-g/waterfox-g
+#  /usr/lib/waterfox-g/waterfox-g
 # but not:
-#  /usr/lib/waterfox-g4/waterfox-g4.sh
-/usr/lib/waterfox-g4/waterfox-g4{,*[^s][^h]} {
+#  /usr/lib/waterfox-g/waterfox-g.sh
+/usr/lib/waterfox-g/waterfox-g{,*[^s][^h]} {
   #include <abstractions/audio>
   #include <abstractions/cups-client>
   #include <abstractions/dbus-strict>
@@ -80,8 +80,8 @@
   /etc/wildmidi/wildmidi.cfg r,
 
   # waterfox specific
-  /etc/waterfox-g4*/ r,
-  /etc/waterfox-g4*/** r,
+  /etc/waterfox-g*/ r,
+  /etc/waterfox-g*/** r,
 
   # firefox specific
   #/etc/xul-ext/** r,
@@ -224,9 +224,9 @@
   }
 
   # Addons
-  #include <abstractions/ubuntu-browsers.d/waterfox-g4>
+  #include <abstractions/ubuntu-browsers.d/waterfox-g>
   /usr/lib/waterfox/kwaterfoxhelper Cxr -> sanitized_helper,
 
   # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.waterfox-g4>
+  #include <local/usr.bin.waterfox-g>
 }
diff --git a/waterfox-g/debian/waterfox-g.dsc b/waterfox-g/debian/waterfox-g.dsc
index 11b4ec8..5492892 100644
--- a/waterfox-g/debian/waterfox-g.dsc
+++ b/waterfox-g/debian/waterfox-g.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: waterfox-g
 Binary: waterfox-g
 Architecture: any
-Version: 5.1.10-1+stackrpms
+Version: 6.0.7-100+stackrpms
 Maintainer: hawkeye116477 <hawkeye116477@gmail.com>
 Homepage: https://www.waterfox.net
 Standards-Version: 3.9.7
-Build-Depends: debhelper (>= 9), autoconf2.13, libgtk-3-dev (>= 3.14), libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm (>= 1.1), build-essential, libxt-dev, python3 (>= 3.5), zip, unzip, cargo (>= 0.59), libgl1-mesa-dev, libnotify-dev (>= 0.4), binutils-avr, libfreetype6-dev (>= 2.0.1), libfontconfig1-dev, pkg-config, libtinfo-dev | libncurses-dev, clang (>= 5.0) | clang-10 | clang-11 | clang-12 | clang-13, llvm-dev (>= 5.0) | llvm-10-dev | llvm-11-dev | llvm-12-dev | llvm-13-dev, lld (>= 5.0) | lld-10 | lld-11 | lld-12 | lld-13, rustc (>= 1.59.0~), libxext-dev, libglib2.0-dev (>= 2.18), libpango1.0-dev (>= 1.14.0), libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, libfile-fcntllock-perl, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev (>= 1.16.1.1~), libevent-dev (>= 1.4.1), libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.24.2), nodejs (>= 10.21) | nodejs-mozilla (>= 10.21), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-10-dev | libclang-11-dev | libclang-12-dev | libclang-13-dev, libstdc++6 (>= 7.0) | gcc-mozilla (>= 7), bc
+Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.66), libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-14 | clang-15 | clang-16, llvm-dev (>= 5.0) | llvm-14-dev | llvm-15-dev | llvm-16-dev, lld (>= 5.0) | lld-14 | lld-15 | lld-16, rustc (>= 1.66.0~), libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.24.3~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-14-dev | libclang-15-dev | libclang-16-dev, libclang-rt-dev | libclang-rt-15-dev | libclang-rt-16-dev | libclang-common-15-dev, libstdc++6 (>= 7.0) | gcc-mozilla (>= 7), bc, libpci-dev
 Package-List:
  waterfox-g deb web optional arch=any
 Files: