summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
-rw-r--r--extension.patch22
-rw-r--r--ua.patch22
4 files changed, 60 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 45f69d1b0316..cfe3260d0b4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = waterfox-kde
pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
pkgver = 2019.10
- pkgrel = 1
+ pkgrel = 2
url = https://www.waterfox.net/
arch = x86_64
license = MPL
@@ -58,6 +58,8 @@ pkgbase = waterfox-kde
source = waterfox-kde-56.2.10.1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/patches/waterfox-kde-56.2.10.1.patch
source = dont-statically-link-libstdc++.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/patches/dont-statically-link-libstdc%2B%2B.patch
source = pgo_fix_missing_kdejs.patch
+ source = extension.patch
+ source = ua.patch
sha256sums = SKIP
sha256sums = 64d5587093e4d32b0111adf8f531a2e3bfe24e76b8f5166e31cebcad7add8f81
sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
@@ -68,6 +70,8 @@ pkgbase = waterfox-kde
sha256sums = b55833542edf8cad2b73cf36dac6c667e588dcf79a99b570c5eca645698b80f7
sha256sums = 877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8
sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
+ sha256sums = 87b4b11ab95d90d4e84dfb53f785c8cbf233044b8950979b624af8ca6f720d59
+ sha256sums = e179856821d463be8ceb75313fa8eb44be7d8580c81b4897e867fefc3e89a864
pkgname = waterfox-kde
diff --git a/PKGBUILD b/PKGBUILD
index b0e3fc0766e2..da672590b3cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=waterfox-kde
pkgver=2019.10
-pkgrel=1
+pkgrel=2
pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
arch=('x86_64')
license=('MPL')
@@ -34,7 +34,9 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
no-plt.diff
"waterfox-kde-56.2.10.1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/patches/waterfox-kde-56.2.10.1.patch"
"dont-statically-link-libstdc++.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/patches/dont-statically-link-libstdc%2B%2B.patch"
- pgo_fix_missing_kdejs.patch)
+ pgo_fix_missing_kdejs.patch
+ extension.patch
+ ua.patch)
sha256sums=('SKIP'
'64d5587093e4d32b0111adf8f531a2e3bfe24e76b8f5166e31cebcad7add8f81'
'0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
@@ -44,7 +46,9 @@ sha256sums=('SKIP'
'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
'b55833542edf8cad2b73cf36dac6c667e588dcf79a99b570c5eca645698b80f7'
'877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8'
- 'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e')
+ 'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
+ '87b4b11ab95d90d4e84dfb53f785c8cbf233044b8950979b624af8ca6f720d59'
+ 'e179856821d463be8ceb75313fa8eb44be7d8580c81b4897e867fefc3e89a864')
prepare() {
mkdir path
@@ -64,6 +68,10 @@ prepare() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
patch -Np1 -i ../no-plt.diff
+ patch -Np1 -i ../extension.patch
+
+ patch -Np1 -i ../ua.patch
+
cat >.mozconfig <<END
export CC=clang
export CXX=clang++
diff --git a/extension.patch b/extension.patch
new file mode 100644
index 000000000000..9aab23d4eef0
--- /dev/null
+++ b/extension.patch
@@ -0,0 +1,22 @@
+From 68014c079a1d4afa26aaad13466fcc76d0f6dcc4 Mon Sep 17 00:00:00 2001
+From: Alex Kontos <MrAlex94@users.noreply.github.com>
+Date: Wed, 16 Oct 2019 21:45:24 +0100
+Subject: [PATCH] Fix usage of undefined variable extension
+
+---
+ toolkit/components/extensions/extension-process-script.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/toolkit/components/extensions/extension-process-script.js b/toolkit/components/extensions/extension-process-script.js
+index 8509335993ba..6f2b385df93b 100644
+--- a/toolkit/components/extensions/extension-process-script.js
++++ b/toolkit/components/extensions/extension-process-script.js
+@@ -303,7 +303,7 @@ ExtensionManager = {
+ policy = new WebExtensionPolicy({
+ id: data.id,
+ mozExtensionHostname: data.uuid,
+- name: extension.name,
++ name: data.name,
+ baseURL: data.resourceURL,
+
+ permissions: Array.from(data.permissions),
diff --git a/ua.patch b/ua.patch
new file mode 100644
index 000000000000..3430c9405e4f
--- /dev/null
+++ b/ua.patch
@@ -0,0 +1,22 @@
+From 02999ce8d80bd2d996e61faaec654a69820d6c65 Mon Sep 17 00:00:00 2001
+From: hawkeye116477 <hawkeye116477@gmail.com>
+Date: Wed, 16 Oct 2019 18:47:51 +0200
+Subject: [PATCH] Restore user-agent overrides for Linux
+
+---
+ browser/installer/package-manifest.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+index d5f12ce064bc..52a686a67b0c 100644
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -146,7 +146,7 @@
+ @BINPATH@/@DLL_PREFIX@mozavcodec@DLL_SUFFIX@
+ #endif
+ @RESPATH@/browser/blocklist.xml
+-#ifdef XP_WIN
++#if defined(XP_WIN) || defined(XP_LINUX)
+ @BINPATH@/browser/ua-update.json
+ #endif
+ #ifdef XP_MACOSX