summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhawkeye1164772020-04-08 11:20:15 +0200
committerhawkeye1164772020-04-08 11:20:15 +0200
commite6e6152dd188566994937a6542c04323db7c61c6 (patch)
treec7ac1eaf8a2783643680b3a6a1f4113215b28097
parentbc6958bb71338268d6dafc8f5ef9cc4fd741b7f1 (diff)
downloadaur-e6e6152dd188566994937a6542c04323db7c61c6.tar.gz
New version
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD24
2 files changed, 16 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f95186d33df..f473b8e2fae 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.03.1
+ pkgver = 2020.04
pkgrel = 0
url = https://www.waterfox.net/
arch = x86_64
@@ -27,7 +27,6 @@ pkgbase = waterfox-classic-kpe
depends = dbus-glib
depends = ffmpeg
depends = nss>=3.34
- depends = hunspell
depends = sqlite
depends = ttf-font
depends = icu
@@ -42,14 +41,15 @@ pkgbase = waterfox-classic-kpe
optdepends = alsa-lib: Audio support
optdepends = jack: Audio support
optdepends = speech-dispatcher: Text-to-Speech
- provides = waterfox-classic=2020.03.1
+ optdepends = hunspell-en_US: Spell checking, American English
+ provides = waterfox-classic=2020.04
conflicts = waterfox-classic
conflicts = waterfox-kde
replaces = waterfox-kde
options = !emptydirs
options = !makeflags
options = zipman
- source = git+https://github.com/MrAlex94/Waterfox.git#commit=3d16cde6ab44fdb52b0355974c0f6b4496387640
+ source = git+https://github.com/MrAlex94/Waterfox.git#commit=5c5f42717434038ef4ab01def2f4546e83d0531a
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
@@ -59,8 +59,7 @@ pkgbase = waterfox-classic-kpe
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 = classic-kde-2020.03.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/classic-kde-2020.03.patch
- source = classic-kde-xul-2020.03.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/classic-kde-xul-2020.03.patch
- source = dark-mode.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/dark-mode.patch
+ source = classic-kde-xul-2020.04.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/classic-kde-xul-2020.04.patch
sha256sums = SKIP
sha256sums = 03b734e8127678ebb260f69702f3be3cba1431c70b67a6e9f0dae62df091f516
sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
@@ -71,8 +70,7 @@ pkgbase = waterfox-classic-kpe
sha256sums = 877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8
sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
sha256sums = 6ff820e43a48ce9450e59e02877ff574a1921d0b286737d55949ad40865add08
- sha256sums = ac853e8cbc376b2f40622b88bce52631fc373d31421243a4f28506488dfe3323
- sha256sums = 8adb921550c88ff5bae7b9661f4003f4e1e431c34febc949c3e8439f8cfe3ca0
+ sha256sums = 7b408abf1048c7da504ba1e8fe1da51199f6c011bbe80af1595d9fd810445612
pkgname = waterfox-classic-kpe
diff --git a/PKGBUILD b/PKGBUILD
index 4107ec3421c..b28b1caa884 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: meatatt <meatatt at aliyun dot com>
pkgname=waterfox-classic-kpe
-pkgver=2020.03.1
+pkgver=2020.04
pkgrel=0
pkgdesc="Customizable privacy conscious web browser with better integration with KDE"
arch=('x86_64')
license=('MPL')
url="https://www.waterfox.net/"
depends=('gtk3' 'gtk2' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'ffmpeg'
- 'nss>=3.34' 'hunspell' 'sqlite' 'ttf-font' 'icu' 'kwaterfoxhelper' 'nspr>=4.15' 'hicolor-icon-theme' 'jemalloc' 'libevent')
+ 'nss>=3.34' 'sqlite' 'ttf-font' 'icu' 'kwaterfoxhelper' 'nspr>=4.15' 'hicolor-icon-theme' 'jemalloc' 'libevent')
makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'inetutils' 'xorg-server-xvfb'
'autoconf2.13' 'rust' 'clang' 'llvm' 'git')
optdepends=('networkmanager: Location detection via available WiFi networks'
@@ -17,14 +17,15 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'pulseaudio: Audio support'
'alsa-lib: Audio support'
'jack: Audio support'
- 'speech-dispatcher: Text-to-Speech')
+ 'speech-dispatcher: Text-to-Speech'
+ 'hunspell-en_US: Spell checking, American English')
provides=("waterfox-classic=${pkgver}")
conflicts=('waterfox-classic' 'waterfox-kde')
replaces=('waterfox-kde')
options=('!emptydirs' '!makeflags' 'zipman')
_patchrev=7339b115a221
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=3d16cde6ab44fdb52b0355974c0f6b4496387640
+_commit=5c5f42717434038ef4ab01def2f4546e83d0531a
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"
@@ -35,8 +36,7 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
"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
"classic-kde-2020.03.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/classic-kde-2020.03.patch"
- "classic-kde-xul-2020.03.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/classic-kde-xul-2020.03.patch"
- "dark-mode.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/dark-mode.patch")
+ "classic-kde-xul-2020.04.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/classic-kde-xul-2020.04.patch")
sha256sums=('SKIP'
'03b734e8127678ebb260f69702f3be3cba1431c70b67a6e9f0dae62df091f516'
'0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
@@ -47,8 +47,7 @@ sha256sums=('SKIP'
'877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8'
'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
'6ff820e43a48ce9450e59e02877ff574a1921d0b286737d55949ad40865add08'
- 'ac853e8cbc376b2f40622b88bce52631fc373d31421243a4f28506488dfe3323'
- '8adb921550c88ff5bae7b9661f4003f4e1e431c34febc949c3e8439f8cfe3ca0')
+ '7b408abf1048c7da504ba1e8fe1da51199f6c011bbe80af1595d9fd810445612')
prepare() {
# Fix openSUSE's patches for Waterfox
@@ -69,8 +68,6 @@ prepare() {
patch -Np1 -i ../classic-kde-xul-2020.03.patch
patch -Np1 -i ../pgo_fix_missing_kdejs.patch
- patch -Np1 -i ../dark-mode.patch
-
cat >.mozconfig <<END
export CC=clang
export CXX=clang++
@@ -105,7 +102,6 @@ ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
ac_add_options --with-system-png
ac_add_options --with-system-libevent
-ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
ac_add_options --enable-system-pixman
@@ -201,6 +197,9 @@ pref("distribution.searchplugins.defaultLocale", "en-US");
// Use OS regional settings for date and time
pref("intl.regional_prefs.use_os_locales", true);
+
+// Use system's dictionaries
+pref("spellchecker.dictionary_path", "/usr/share/hunspell");
END
install -Dm644 "$srcdir/kde.js" "$pkgdir/usr/lib/waterfox-classic/browser/defaults/preferences/kde.js"
@@ -228,9 +227,6 @@ END
rm -r "$pkgdir"/usr/lib/waterfox-classic/dictionaries
fi
- ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/waterfox-classic/dictionaries"
- ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/waterfox-classic/hyphenation"
-
# Install a wrapper to avoid confusion about binary path
install -Dm755 /dev/stdin "$pkgdir/usr/bin/waterfox-classic" <<END
#!/bin/sh