New version 1.11.1

1 files changed, 35 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1a79f1117a39..6f3c97ca758f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=cliqz
 _pkgname=browser-f
 _vendorname=CLIQZ
-pkgver=1.11.0
+pkgver=1.11.1
 pkgrel=1
 pkgdesc="Firefox-based privacy aware web browser"
 arch=('i686' 'x86_64')
@@ -14,13 +14,9 @@ depends=('alsa-lib' 'dbus-glib' 'ffmpeg' 'gtk2' 'gtk3' 'hunspell'
          'ttf-font')
 makedepends=('python2' 'zip' 'autoconf2.13' 'yasm' 'libidl2' 'linux-api-headers')
 conflicts=('cliqz-bin')
-source=("https://github.com/cliqz-oss/browser-f/archive/${pkgver}.tar.gz"
-        "mozconfig"
-        "cliqz")
-sha256sums=('ae35e3ac2ac6df6e53fdee30b0053bdf7c79c77f174632b58bdcfcbac99f5cf4'
-            'ebb68a51d1289f53e1adb9501d4309db9a0cc73d6eb8da6dc86143f0879b6fc7'
-            'cd07bf42ad08a626250572890f1a038a85bc7715637371b23c11b39690ab9c7a')
-
+source=("https://github.com/cliqz-oss/browser-f/archive/${pkgver}.tar.gz")
+sha256sums=('653df00962403baada8632cd07a129601d43b77dbc0ca025521fd84a567c9681')
+options=(!emptydirs !makeflags !strip)
 
 prepare() {
   cd $srcdir/$_pkgname-$pkgver/mozilla-release
@@ -28,7 +24,33 @@ prepare() {
   sed -i "s/@MOZ_APP_DISPLAYNAME@/$_vendorname/g" toolkit/mozapps/installer/linux/rpm/mozilla.desktop
   sed -i "s/@MOZ_APP_NAME@/$pkgname/g" toolkit/mozapps/installer/linux/rpm/mozilla.desktop
 
-  cp ../../mozconfig .mozconfig
+  cat >.mozconfig <<END
+ac_add_options --prefix=/usr
+ac_add_options --enable-gold
+ac_add_options --enable-pie
+ac_add_options --enable-rust
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+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
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-alsa
+ac_add_options --disable-updater
+
+STRIP_FLAGS="--strip-debug"
+END
 }
 
 build() {
@@ -40,16 +62,16 @@ build() {
   # Hardening
   LDFLAGS+=" -Wl,-z,now"
 
-  # GCC 6
-  CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-schedule-insns2"
-
   ./magic_build_and_package.sh
 }
 
 package() {
   cd $srcdir
 
-  install -d -m755 ${pkgdir}/usr/lib
+  install -d -m755 ${pkgdir}/usr/{bin,lib}
+
+  ln -s /usr/lib/${_vendorname}/${_vendorname} ${pkgdir}/usr/bin/${pkgname}
+
   mv $_pkgname-$pkgver/obj/dist/$_vendorname-$pkgver.en-US.linux-x86_64.tar.bz2 .
   tar xjf $_vendorname-$pkgver.en-US.linux-x86_64.tar.bz2
   cp -R $_vendorname ${pkgdir}/usr/lib/
@@ -63,6 +85,4 @@ package() {
 
   install -D -m644 $_pkgname-$pkgver/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \
                    ${pkgdir}/usr/share/applications/${pkgname}.desktop
-
-  install -D -m755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
 }