New version

3 files changed, 7 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d73c5d9085..8d7d93aa17c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = waterfox-classic-kpe
 	pkgdesc = Customizable privacy conscious web browser with better integration with KDE
-	pkgver = 2020.07
+	pkgver = 2020.07.1
 	pkgrel = 0
 	url = https://www.waterfox.net/
 	arch = x86_64
@@ -42,14 +42,14 @@ pkgbase = waterfox-classic-kpe
 	optdepends = jack: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = waterfox-classic=2020.07
+	provides = waterfox-classic=2020.07.1
 	conflicts = waterfox-classic
 	conflicts = waterfox-kde
 	replaces = waterfox-kde
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#commit=a9ff8a87b824791dfeddf82e6609f35677db8008
+	source = git+https://github.com/MrAlex94/Waterfox.git#commit=16b860889bf5b4539d2103b23c8ef3625ac63929
 	source = waterfox-classic.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/29877042dd393774197b134426e37cb0dbabef34/waterfox-classic-kpe/waterfox-classic.desktop
 	source = kde.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/29877042dd393774197b134426e37cb0dbabef34/waterfox-classic-kpe/kde.js
 	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/29877042dd393774197b134426e37cb0dbabef34/waterfox-classic-kpe/distribution.ini
@@ -60,7 +60,6 @@ pkgbase = waterfox-classic-kpe
 	source = pgo_fix_missing_kdejs.patch
 	source = classic-kde.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/29877042dd393774197b134426e37cb0dbabef34/waterfox-classic-kpe/patches/classic-kde.patch
 	source = classic-kde-xul.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/29877042dd393774197b134426e37cb0dbabef34/waterfox-classic-kpe/patches/classic-kde-xul.patch
-	source = BMO1640982.patch
 	sha256sums = SKIP
 	sha256sums = 03b734e8127678ebb260f69702f3be3cba1431c70b67a6e9f0dae62df091f516
 	sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
@@ -72,7 +71,6 @@ pkgbase = waterfox-classic-kpe
 	sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
 	sha256sums = 6ff820e43a48ce9450e59e02877ff574a1921d0b286737d55949ad40865add08
 	sha256sums = 7b408abf1048c7da504ba1e8fe1da51199f6c011bbe80af1595d9fd810445612
-	sha256sums = 33d7feed2093e45a3849785daf67a506052bc37f5c7e3813f7d318b9cfeb5129
 
 pkgname = waterfox-classic-kpe
 
diff --git a/BMO1640982.patch b/BMO1640982.patch
deleted file mode 100644
index 0759571e50d..00000000000
--- a/BMO1640982.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 62bf60d79c7023ecd187a68f779fad6126924a4c Mon Sep 17 00:00:00 2001
-Date: Wed, 22 Jul 2020 17:16:03 +0200
-Subject: [PATCH] Bug 1640982 - Set CARGO_PROFILE_RELEASE_LTO=true when
- enabling rust LTO.
-
----
- config/rules.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/config/rules.mk b/config/rules.mk
-index 21f3d69724c6..429194a4d0a6 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -867,7 +867,11 @@ cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds.
-+# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
-+# for newer ones that support it. Combining the latter with -Clto works, so
-+# set both everywhere.
- cargo_rustc_flags += -C lto
-+export CARGO_PROFILE_RELEASE_LTO=true
- endif
- endif
- 
diff --git a/PKGBUILD b/PKGBUILD
index 296e0143d60..68b0abe88bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: meatatt <meatatt at aliyun dot com>
 
 pkgname=waterfox-classic-kpe
-pkgver=2020.07
+pkgver=2020.07.1
 pkgrel=0
 pkgdesc="Customizable privacy conscious web browser with better integration with KDE"
 arch=('x86_64')
@@ -25,7 +25,7 @@ replaces=('waterfox-kde')
 options=('!emptydirs' '!makeflags' 'zipman')
 _filesrev=29877042dd393774197b134426e37cb0dbabef34
 _filesurl=https://raw.githubusercontent.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/$_filesrev/waterfox-classic-kpe
-_commit=a9ff8a87b824791dfeddf82e6609f35677db8008
+_commit=16b860889bf5b4539d2103b23c8ef3625ac63929
 source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "waterfox-classic.desktop::$_filesurl/waterfox-classic.desktop"
         "kde.js::$_filesurl/kde.js"
@@ -36,8 +36,7 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "dont-statically-link-libstdc++.patch::$_filesurl/patches/dont-statically-link-libstdc%2B%2B.patch"
         pgo_fix_missing_kdejs.patch
         "classic-kde.patch::$_filesurl/patches/classic-kde.patch"
-        "classic-kde-xul.patch::$_filesurl/patches/classic-kde-xul.patch"
-        BMO1640982.patch)
+        "classic-kde-xul.patch::$_filesurl/patches/classic-kde-xul.patch")
 sha256sums=('SKIP'
             '03b734e8127678ebb260f69702f3be3cba1431c70b67a6e9f0dae62df091f516'
             '0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
@@ -49,7 +48,7 @@ sha256sums=('SKIP'
             'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
             '6ff820e43a48ce9450e59e02877ff574a1921d0b286737d55949ad40865add08'
             '7b408abf1048c7da504ba1e8fe1da51199f6c011bbe80af1595d9fd810445612'
-            '33d7feed2093e45a3849785daf67a506052bc37f5c7e3813f7d318b9cfeb5129')
+            )
 
 prepare() {
   # Fix openSUSE's patches for Waterfox
@@ -70,8 +69,6 @@ prepare() {
   patch -Np1 -i ../classic-kde-xul.patch
   patch -Np1 -i ../pgo_fix_missing_kdejs.patch
 
-  patch -Np1 -i ../BMO1640982.patch
-
   cat >.mozconfig <<END
 export CC=clang
 export CXX=clang++