summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhawkeye1164772019-07-11 11:55:41 +0200
committerhawkeye1164772019-07-11 11:55:41 +0200
commit8396e1c06e58d10fb4723ccc2aea9ab1c1c039c3 (patch)
treecbb5649f945f56798529630e9c62ef00db87ce2a
parent20240c953f69978252a1d5fbc897d38aeb1f966b (diff)
downloadaur-8396e1c06e58d10fb4723ccc2aea9ab1c1c039c3.tar.gz
Bump
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD7
-rw-r--r--waterfox-install-dir.patch12
3 files changed, 7 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b689f577a0e..d8d2b2df724 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 = 56.2.11
- pkgrel = 4
+ pkgver = 56.2.12
+ pkgrel = 1
url = https://www.waterfox.net/
arch = x86_64
license = MPL
@@ -43,12 +43,12 @@ pkgbase = waterfox-kde
optdepends = alsa-lib: Audio support
optdepends = jack: Audio support
optdepends = speech-dispatcher: Text-to-Speech
- provides = waterfox=56.2.11
+ provides = waterfox=56.2.12
conflicts = waterfox
options = !emptydirs
options = !makeflags
options = zipman
- source = git+https://github.com/MrAlex94/Waterfox.git#commit=63b480e7462482482f6609c305cd793d938f58c0
+ source = git+https://github.com/MrAlex94/Waterfox.git#commit=1bc2fb60abf0fa173b69ca94f660115d76f09f4f
source = waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/waterfox.desktop
source = kde.js::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/kde.js
source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/distribution.ini
diff --git a/PKGBUILD b/PKGBUILD
index ed034f506d6..94ace93c8df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Based on firefox-kde Manjaro's PKGBUILD
pkgname=waterfox-kde
-pkgver=56.2.11
-pkgrel=4
+pkgver=56.2.12
+pkgrel=1
pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
arch=('x86_64')
license=('MPL')
@@ -24,7 +24,7 @@ conflicts=('waterfox')
options=('!emptydirs' '!makeflags' 'zipman')
_patchrev=7339b115a221
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=63b480e7462482482f6609c305cd793d938f58c0
+_commit=1bc2fb60abf0fa173b69ca94f660115d76f09f4f
source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
"waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/waterfox.desktop"
"kde.js::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/kde.js"
@@ -84,7 +84,6 @@ ac_add_options --prefix=/usr
ac_add_options --with-app-name=waterfox
ac_add_options --with-app-basename=Waterfox
ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.waterfoxproject
# Library and chrome format
ac_add_options --enable-chrome-format=omni
diff --git a/waterfox-install-dir.patch b/waterfox-install-dir.patch
deleted file mode 100644
index 51fe4ba0a85..00000000000
--- a/waterfox-install-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk
---- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200
-+++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200
-@@ -4,7 +4,7 @@
- # whether a normal build is happening or whether the check is running.
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifndef TOP_DIST
- TOP_DIST = dist