summarylogtreecommitdiffstats
diff options
context:
space:
mode:
author√Čtienne Deparis2018-09-30 21:10:29 +0200
committer√Čtienne Deparis2018-09-30 21:10:29 +0200
commitd2d51dd33cb71d1f0fc5a16d45138702cbfe2402 (patch)
tree638838a856e8f5e95aaea2165ce36d593b7eb3f4
parent8776f44deaed5cb63ed85fe6617266b9d3cdb448 (diff)
downloadaur-d2d51dd33cb71d1f0fc5a16d45138702cbfe2402.tar.gz
1.22.2
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD14
-rw-r--r--init.configure.patch18
3 files changed, 9 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 624c6658aef..ee60500119b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by makepkg 5.1.1
-# Fri Sep 21 12:45:21 UTC 2018
+# Sun Sep 30 19:09:59 UTC 2018
pkgbase = cliqz
pkgdesc = Firefox-based privacy aware web browser, build from sources
- pkgver = 1.22.0
+ pkgver = 1.22.2
pkgrel = 1
url = https://cliqz.com/
arch = i686
@@ -15,7 +15,6 @@ pkgbase = cliqz
makedepends = yasm
makedepends = mesa
makedepends = imake
- makedepends = gconf
makedepends = inetutils
makedepends = xorg-server-xvfb
makedepends = autoconf2.13
@@ -41,10 +40,8 @@ pkgbase = cliqz
options = !emptydirs
options = !makeflags
options = !strip
- source = https://github.com/cliqz-oss/browser-f/archive/1.22.0.tar.gz
- source = init.configure.patch
- sha256sums = bcb598df874ba5c3fd904ea4f33b05600037062eed33a12899af1f96bda1245f
- sha256sums = 531ced6caeb57877e2b39d7aeb2eba3c03e15a1aaa5a27df3391e59b7d592549
+ source = https://github.com/cliqz-oss/browser-f/archive/1.22.2.tar.gz
+ sha256sums = 176abb4290f9009ee93797c7ad810146cc497660396f6bd45cb6c33d398d37a4
pkgname = cliqz
diff --git a/PKGBUILD b/PKGBUILD
index 79543f156c7..9e0ad6955f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: √Čtienne Deparis <etienne@depar.is>
pkgname=cliqz
_pkgname=browser-f
-pkgver=1.22.0
+pkgver=1.22.2
pkgrel=1
_cqzbuildid=$(curl "http://repository.cliqz.com.s3.amazonaws.com/dist/release/$pkgver/lastbuildid")
pkgdesc="Firefox-based privacy aware web browser, build from sources"
@@ -10,13 +10,11 @@ url="https://cliqz.com/"
license=(MPL2)
depends=(gtk2 gtk3 libxt startup-notification dbus-glib nss libvpx libevent
hunspell hunspell-en_US)
-makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
+makedepends=(unzip zip diffutils python2 yasm mesa imake inetutils xorg-server-xvfb
autoconf2.13 rust clang llvm libnotify gtk2 gtk3 wget pulseaudio)
conflicts=(cliqz-bin)
-source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz"
- init.configure.patch)
-sha256sums=('bcb598df874ba5c3fd904ea4f33b05600037062eed33a12899af1f96bda1245f'
- '531ced6caeb57877e2b39d7aeb2eba3c03e15a1aaa5a27df3391e59b7d592549')
+source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz")
+sha256sums=('176abb4290f9009ee93797c7ad810146cc497660396f6bd45cb6c33d398d37a4')
options=(!emptydirs !makeflags !strip)
prepare() {
@@ -29,9 +27,6 @@ prepare() {
sed -i "s/@MOZ_APP_NAME@/$pkgname/g" toolkit/mozapps/installer/linux/rpm/mozilla.desktop
sed -i "s|^Exec=${pkgname}$|Exec=/usr/lib/${pkgname}/${pkgname} %u|" toolkit/mozapps/installer/linux/rpm/mozilla.desktop
- # rust.configure problem
- patch build/moz.configure/init.configure ../../init.configure.patch
-
cat >> toolkit/mozapps/installer/linux/rpm/mozilla.desktop <<END
Actions=new-forget-window;
@@ -94,6 +89,7 @@ ac_add_options --enable-system-ffi
# Features
ac_add_options --enable-startup-notification
ac_add_options --disable-updater
+ac_add_options --disable-gconf
END
# Symbols are build only for windows. Have them back now
diff --git a/init.configure.patch b/init.configure.patch
deleted file mode 100644
index 0841038ef52..00000000000
--- a/init.configure.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- init.configure.upstream 2018-09-21 13:11:04.786186503 +0200
-+++ init.configure 2018-09-21 13:13:35.415460493 +0200
-@@ -591,7 +591,14 @@
- # There is also a quartet form:
- # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
-- cpu, manufacturer, os = triplet.split('-', 2)
-+ if triplet.count('-') == 1:
-+ # Some new rust targets only have one dash and follows the form:
-+ # CPU_TYPE-OPERATING_SYSTEM
-+ # See: https://github.com/rust-lang/rust/pull/52763
-+ manufacturer = None
-+ cpu, os = triplet.split('-')
-+ else:
-+ cpu, manufacturer, os = triplet.split('-', 2)
-
- # Autoconf uses config.sub to validate and canonicalize those triplets,
- # but the granularity of its results has never been satisfying to our