summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD27
-rw-r--r--rust_1.39.patch24
3 files changed, 15 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 723e2fbe1d8..b382df1f39d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = waterfox-classic-kpe
pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
- pkgver = 2019.10
- pkgrel = 3
+ pkgver = 2019.12
+ pkgrel = 0
url = https://www.waterfox.net/
arch = x86_64
license = MPL
@@ -43,27 +43,24 @@ pkgbase = waterfox-classic-kpe
optdepends = alsa-lib: Audio support
optdepends = jack: Audio support
optdepends = speech-dispatcher: Text-to-Speech
- provides = waterfox-classic=2019.10
- provides = waterfox-classic-kde=2019.10
+ provides = waterfox-classic=2019.12
+ provides = waterfox-classic-kde=2019.12
conflicts = waterfox-classic
conflicts = waterfox-kde
replaces = waterfox-kde
options = !emptydirs
options = !makeflags
options = zipman
- source = git+https://github.com/MrAlex94/Waterfox.git#commit=f80144efd74f252d18ff8b26fbaea26e5ee03147
+ source = git+https://github.com/MrAlex94/Waterfox.git#commit=8864e433baf07e995e7047e840d8f94d8f1b2496
source = waterfox-classic.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/waterfox-classic.desktop
source = kde.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/kde.js
source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/distribution.ini
source = waterfox-classic.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/waterfox-classic.1
source = jack-system-ports.patch
source = no-plt.diff
- source = waterfox-classic-kde-2019.10.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/waterfox-classic-kde-2019.10.patch
+ source = waterfox-classic-kde-2019.12.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/waterfox-classic-kde-2019.12.patch
source = dont-statically-link-libstdc++.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/dont-statically-link-libstdc%2B%2B.patch
source = pgo_fix_missing_kdejs.patch
- source = restore_ua_overrides.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/restore_ua_overrides.patch
- source = bmo1480003.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/bmo1480003.patch
- source = rust_1.39.patch
sha256sums = SKIP
sha256sums = b0ec717b10494dad234a10c9ba9c2a89ed52fd0afbc3b98bb8c4f9c5dd4755a0
sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
@@ -71,12 +68,9 @@ pkgbase = waterfox-classic-kpe
sha256sums = 3b3089733bde4c0f945b0da4043950717af7f3993dd0b9eb3ca769c27c194422
sha256sums = be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c
sha256sums = ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa
- sha256sums = 6a74ac7235014aa78793a2cf15d870bb3bdd79b7eced35f993ad323563b056d7
+ sha256sums = 0ec569e42cc6e6dab4bbb2d078210acf57bcbe6f16afb2dbeb5b6ff9d0809c87
sha256sums = 877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8
sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
- sha256sums = e179856821d463be8ceb75313fa8eb44be7d8580c81b4897e867fefc3e89a864
- sha256sums = 56e5ed40df1cb84606e9d095b05e5e8d9a397198a1eb6491e208d5f888266ee7
- sha256sums = e5a1cc8d651744252910f9b3090d0f284445d8a480a14ec649411c487083a3c7
pkgname = waterfox-classic-kpe
diff --git a/PKGBUILD b/PKGBUILD
index a062999ece2..6b5b4eab4e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: meatatt <meatatt at aliyun dot com>
pkgname=waterfox-classic-kpe
-pkgver=2019.10
-pkgrel=3
+pkgver=2019.12
+pkgrel=0
pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
arch=('x86_64')
license=('MPL')
@@ -24,7 +24,7 @@ replaces=('waterfox-kde')
options=('!emptydirs' '!makeflags' 'zipman')
_patchrev=7339b115a221
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=f80144efd74f252d18ff8b26fbaea26e5ee03147
+_commit=8864e433baf07e995e7047e840d8f94d8f1b2496
source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
"waterfox-classic.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/waterfox-classic.desktop"
"kde.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/kde.js"
@@ -32,12 +32,9 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
"waterfox-classic.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/waterfox-classic.1"
jack-system-ports.patch
no-plt.diff
- "waterfox-classic-kde-2019.10.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/waterfox-classic-kde-2019.10.patch"
+ "waterfox-classic-kde-2019.12.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/waterfox-classic-kde-2019.12.patch"
"dont-statically-link-libstdc++.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/dont-statically-link-libstdc%2B%2B.patch"
- pgo_fix_missing_kdejs.patch
- "restore_ua_overrides.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/restore_ua_overrides.patch"
- "bmo1480003.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/bmo1480003.patch"
- rust_1.39.patch)
+ pgo_fix_missing_kdejs.patch)
sha256sums=('SKIP'
'b0ec717b10494dad234a10c9ba9c2a89ed52fd0afbc3b98bb8c4f9c5dd4755a0'
'0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
@@ -45,12 +42,9 @@ sha256sums=('SKIP'
'3b3089733bde4c0f945b0da4043950717af7f3993dd0b9eb3ca769c27c194422'
'be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c'
'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
- '6a74ac7235014aa78793a2cf15d870bb3bdd79b7eced35f993ad323563b056d7'
+ '0ec569e42cc6e6dab4bbb2d078210acf57bcbe6f16afb2dbeb5b6ff9d0809c87'
'877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8'
- 'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
- 'e179856821d463be8ceb75313fa8eb44be7d8580c81b4897e867fefc3e89a864'
- '56e5ed40df1cb84606e9d095b05e5e8d9a397198a1eb6491e208d5f888266ee7'
- 'e5a1cc8d651744252910f9b3090d0f284445d8a480a14ec649411c487083a3c7')
+ 'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e')
prepare() {
mkdir path
@@ -70,11 +64,6 @@ prepare() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
patch -Np1 -i ../no-plt.diff
- patch -Np1 -i ../restore_ua_overrides.patch
-
- patch -Np1 -i ../bmo1480003.patch
-
- patch -Np1 -i ../rust_1.39.patch
cat >.mozconfig <<END
export CC=clang
@@ -171,7 +160,7 @@ END
#patch -Np1 -i "../firefox-kde-$_patchrev.patch"
#patch -Np1 -i "../fix_waterfox_browser-kde_xul.patch"
#patch -Np1 -i "../fix_crash_e10s_upload_cancel.patch"
- patch -Np1 -i "../waterfox-classic-kde-2019.10.patch"
+ patch -Np1 -i "../waterfox-classic-kde-2019.12.patch"
patch -Np1 -i "../pgo_fix_missing_kdejs.patch"
# https://bugs.archlinux.org/task/52183
diff --git a/rust_1.39.patch b/rust_1.39.patch
deleted file mode 100644
index b1998111eb1..00000000000
--- a/rust_1.39.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From bd989e56d13b046b7a0fc0292b9ae2c4b788f519 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 11 Nov 2019 16:04:41 +0100
-Subject: [PATCH] nsstring: Fix build with rust-1.39
-
-rust-1.39 deprecated the "try!" call in favor of "?" which then breaks
-nsstring because it treats warnings as errors.
----
- xpcom/rust/nsstring/src/lib.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xpcom/rust/nsstring/src/lib.rs b/xpcom/rust/nsstring/src/lib.rs
-index dddc8b81ca40..dd4f62538bcb 100644
---- a/xpcom/rust/nsstring/src/lib.rs
-+++ b/xpcom/rust/nsstring/src/lib.rs
-@@ -113,7 +113,7 @@
- //! which invoke their member's destructors through C++ code.
-
- #![allow(non_camel_case_types)]
--#![deny(warnings)]
-+//#![deny(warnings)]
-
- #[macro_use]
- extern crate bitflags;