New release

3 files changed, 17 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14d9b1fa2ba9..7f870355c98f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.2
-# Thu Feb 15 14:48:10 UTC 2018
+# Wed Mar 21 15:34:05 UTC 2018
 pkgbase = cliqz
 	pkgdesc = Firefox-based privacy aware web browser, build from sources
-	pkgver = 1.18.0
+	pkgver = 1.19.0
 	pkgrel = 1
 	url = https://cliqz.com/
 	arch = i686
@@ -23,8 +23,8 @@ pkgbase = cliqz
 	makedepends = clang
 	makedepends = llvm
 	makedepends = libnotify
+	makedepends = gtk2
 	depends = gtk3
-	depends = gtk2
 	depends = mozilla-common
 	depends = libxt
 	depends = startup-notification
@@ -45,10 +45,8 @@ pkgbase = cliqz
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://github.com/cliqz-oss/browser-f/archive/1.18.0.tar.gz
-	source = 0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
-	sha256sums = 34fe2236256603a2b74249c34dd9832015c6c9547928d795106c9efcfed7d9ef
-	sha256sums = e8a695bd6a007525390c502739c0f00d5d753a1bde7053c21c712075f2c2994d
+	source = https://github.com/cliqz-oss/browser-f/archive/1.19.0.tar.gz
+	sha256sums = 352e68c9cf1c72f6776c66c017219821fc8d9e548ec9a9032993773454c0132a
 
 pkgname = cliqz
 
diff --git a/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch b/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
deleted file mode 100644
index 7c33f7a70d35..000000000000
--- a/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2877a352715ce7e30ef364722757c6ec380236b1 Mon Sep 17 00:00:00 2001
-Message-Id: <2877a352715ce7e30ef364722757c6ec380236b1.1518037075.git.jan.steffens@gmail.com>
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Thu, 18 Jan 2018 15:18:37 -0700
-Subject: [PATCH] Bug 1430274 - Define MOZ_ALSA for more source files. r=jld
-
----
- security/sandbox/linux/moz.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 681d658bfeb7..1a49b548af2d 100644
---- a/security/sandbox/linux/moz.build
-+++ b/security/sandbox/linux/moz.build
-@@ -78,6 +78,9 @@ if CONFIG['MOZ_GMP_SANDBOX']:
-         'SandboxOpenedFiles.cpp',
-     ]
- 
-+if CONFIG['MOZ_ALSA']:
-+    DEFINES['MOZ_ALSA'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
--- 
-2.16.1
-
diff --git a/PKGBUILD b/PKGBUILD
index a98224735e79..9c693841494d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Étienne Deparis <etienne@depar.is>
 pkgname=cliqz
 _pkgname=browser-f
-pkgver=1.18.0
+pkgver=1.19.0
 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"
 arch=(i686 x86_64)
 url="https://cliqz.com/"
 license=(MPL2)
-depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
+depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
          nss hunspell sqlite ttf-font libpulse libvpx icu libevent libpng libjpeg-turbo)
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm libnotify)
+             autoconf2.13 rust clang llvm libnotify gtk2)
 conflicts=(cliqz-bin)
-source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz"
-        0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch)
-sha256sums=('34fe2236256603a2b74249c34dd9832015c6c9547928d795106c9efcfed7d9ef'
-            'e8a695bd6a007525390c502739c0f00d5d753a1bde7053c21c712075f2c2994d')
+source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz")
+sha256sums=('352e68c9cf1c72f6776c66c017219821fc8d9e548ec9a9032993773454c0132a')
 options=(!emptydirs !makeflags !strip)
 
 prepare() {
@@ -43,9 +41,6 @@ END
   # Remove -lcrmf from old configure scripts
   sed -i 's/NSS_LIBS="$NSS_LIBS -lcrmf"/NSS_LIBS="$NSS_LIBS"/' old-configure.in
 
-  # https://bugs.archlinux.org/task/57285
-  patch -Np1 -i "$srcdir/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch"
-
   # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
   # Note: These are for Arch Linux use ONLY. For your own distribution, please
   # get your own set of keys. Feel free to contact foutrelis@archlinux.org for
@@ -132,18 +127,18 @@ package() {
   install -D -m644 /dev/stdin "$_vendorjs" <<END
 // Disable update check
 pref("app.update.enabled", false);
-
-// Disable tracking (don't know if still used)
-pref("beacon.enabled", false);
+// But keep search engines updates
+pref("browser.search.update", true);
 
 // Use the classical backspace action
 pref("browser.backspace_action", 0);
 
-// Weird disabled options
-pref("browser.search.update", true);
-
 // Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
 END
 
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"