summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhawkeye1164772020-02-22 17:00:30 +0100
committerhawkeye1164772020-02-22 17:00:30 +0100
commitb542abcf9f171ca3693181cac56b01b0e81bf3b5 (patch)
tree57b972914fd194d22a0659f6f21dea50f196d57e
parent181c8ed0eabfc0595a94be5d85c689d1d7f0ca10 (diff)
downloadaur-b542abcf9f171ca3693181cac56b01b0e81bf3b5.tar.gz
2020.02.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD20
2 files changed, 16 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3fcce14a5c0..caa1e6f7776 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = waterfox-classic-kpe
pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
- pkgver = 2020.02
+ pkgver = 2020.02.1
pkgrel = 0
url = https://www.waterfox.net/
arch = x86_64
@@ -42,15 +42,15 @@ pkgbase = waterfox-classic-kpe
optdepends = alsa-lib: Audio support
optdepends = jack: Audio support
optdepends = speech-dispatcher: Text-to-Speech
- provides = waterfox-classic=2020.02
- provides = waterfox-classic-kde=2020.02
+ provides = waterfox-classic=2020.02.1
+ provides = waterfox-classic-kde=2020.02.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=df884bb1dbafb2c23595ec74b0fd74bc92e5c3c7
+ source = git+https://github.com/MrAlex94/Waterfox.git#commit=b09d5851a2bce79c96a66602ea527ad28a672660
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
@@ -60,6 +60,7 @@ pkgbase = waterfox-classic-kpe
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 = Bug1387912.patch::https://github.com/mozilla/gecko-dev/commit/8e8d4fdf49032bbd235cc745be2eece2ddfe4141.patch
sha256sums = SKIP
sha256sums = 2b6438946169935ec87fc2e5f3377f6d92a00ba7ad6ef5ab2e60340588dc74ea
sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
@@ -70,6 +71,7 @@ pkgbase = waterfox-classic-kpe
sha256sums = 0ec569e42cc6e6dab4bbb2d078210acf57bcbe6f16afb2dbeb5b6ff9d0809c87
sha256sums = 877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8
sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
+ sha256sums = 4e94ecbd0903218ed8603e1979f8a405b7c4eebd684f20dfba7c249288136d8d
pkgname = waterfox-classic-kpe
diff --git a/PKGBUILD b/PKGBUILD
index fe563ef6872..ff0f610ecf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: meatatt <meatatt at aliyun dot com>
pkgname=waterfox-classic-kpe
-pkgver=2020.02
+pkgver=2020.02.1
pkgrel=0
pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
arch=('x86_64')
@@ -24,7 +24,7 @@ replaces=('waterfox-kde')
options=('!emptydirs' '!makeflags' 'zipman')
_patchrev=7339b115a221
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=df884bb1dbafb2c23595ec74b0fd74bc92e5c3c7
+_commit=b09d5851a2bce79c96a66602ea527ad28a672660
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"
@@ -34,7 +34,8 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
no-plt.diff
"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)
+ pgo_fix_missing_kdejs.patch
+ "Bug1387912.patch::https://github.com/mozilla/gecko-dev/commit/8e8d4fdf49032bbd235cc745be2eece2ddfe4141.patch")
sha256sums=('SKIP'
'2b6438946169935ec87fc2e5f3377f6d92a00ba7ad6ef5ab2e60340588dc74ea'
'0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
@@ -44,12 +45,10 @@ sha256sums=('SKIP'
'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
'0ec569e42cc6e6dab4bbb2d078210acf57bcbe6f16afb2dbeb5b6ff9d0809c87'
'877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8'
- 'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e')
+ 'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
+ '4e94ecbd0903218ed8603e1979f8a405b7c4eebd684f20dfba7c249288136d8d')
prepare() {
- mkdir path
- ln -s /usr/bin/python2 path/python
-
# Fix openSUSE's patches for Waterfox
#sed -i 's/Firefox/Waterfox/g' $srcdir/mozilla-kde-$_patchrev.patch
#sed -i 's/KMOZILLAHELPER/KWATERFOXHELPER/g' $srcdir/mozilla-kde-$_patchrev.patch
@@ -99,7 +98,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 --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
@@ -122,6 +120,8 @@ ac_add_options --disable-parental-controls
ac_add_options --disable-accessibility
ac_add_options --disable-gconf
+ac_add_options --disable-elf-hack
+
# If you want to have text-to-speech support, comment this line:
ac_add_options --disable-webspeech
@@ -168,12 +168,12 @@ END
echo "Patching for Jack"
patch -Np1 -i ../jack-system-ports.patch
+ patch -Np1 -i ../Bug1387912.patch
+
}
build() {
cd Waterfox
-
- export PATH="$srcdir/path:$PATH"
./mach build
}