summarylogtreecommitdiffstats
diff options
context:
space:
mode:
author√Čtienne Deparis2018-06-06 14:43:49 +0200
committer√Čtienne Deparis2018-06-06 14:43:49 +0200
commit3b072545ac07c05153903fa1bc04353454a8e8ff (patch)
tree7b36620652796177869cacb6a73bcb2e9d606dec
parentfcd6a913143387ddf089dfc3b3ff091a27b6b384 (diff)
downloadaur-3b072545ac07c05153903fa1bc04353454a8e8ff.tar.gz
Cleanup some namcap warnings and refactor a bit the PKGBUILD
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD19
2 files changed, 15 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b12404428c7..f6cdc8a8755 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by makepkg 5.1.0
-# Wed Jun 6 12:41:58 UTC 2018
+# Wed Jun 6 12:43:20 UTC 2018
pkgbase = cliqz
pkgdesc = Firefox-based privacy aware web browser, build from sources
pkgver = 1.20.1
- pkgrel = 1
+ pkgrel = 2
url = https://cliqz.com/
arch = i686
arch = x86_64
@@ -24,24 +24,17 @@ pkgbase = cliqz
makedepends = llvm
makedepends = libnotify
makedepends = gtk2
+ makedepends = gtk3
makedepends = wget
+ depends = gtk2
depends = gtk3
- depends = mozilla-common
depends = libxt
depends = startup-notification
- depends = mime-types
depends = dbus-glib
- depends = ffmpeg
depends = nss
depends = hunspell
- depends = sqlite
- depends = ttf-font
- depends = libpulse
depends = libvpx
- depends = icu
depends = libevent
- depends = libpng
- depends = libjpeg-turbo
conflicts = cliqz-bin
options = !emptydirs
options = !makeflags
diff --git a/PKGBUILD b/PKGBUILD
index 0a65e1d6c15..54faf27a3e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,15 @@
pkgname=cliqz
_pkgname=browser-f
pkgver=1.20.1
-pkgrel=1
+pkgrel=2
_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 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
- nss hunspell sqlite ttf-font libpulse libvpx icu libevent libpng libjpeg-turbo)
+depends=(gtk2 gtk3 libxt startup-notification dbus-glib nss hunspell libvpx libevent)
makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
- autoconf2.13 rust clang llvm libnotify gtk2 wget)
+ autoconf2.13 rust clang llvm libnotify gtk2 gtk3 wget)
conflicts=(cliqz-bin)
source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz")
sha256sums=('58bfae2ce2f5e519ad07c57eaef9993250ee8afe53ae0c3f283e4d0cf7cf8e64')
@@ -61,13 +60,11 @@ END
# Archlinux specific additions
ac_add_options --with-distribution-id=org.archlinux
ac_add_options --prefix=/usr
-ac_add_options --disable-tests
ac_add_options --enable-gold
ac_add_options --enable-pie
ac_add_options --enable-hardening
ac_add_options --enable-optimize="-O2"
ac_add_options --enable-rust-simd
-ac_add_options --enable-default-toolkit=cairo-gtk3
# Speed up buildtime (thanks bm456)
ac_add_options --disable-debug
@@ -81,10 +78,10 @@ ac_add_options --with-system-bz2
ac_add_options --with-system-icu
ac_add_options --with-system-jpeg
ac_add_options --with-system-libvpx
-ac_add_options --with-system-libevent
-ac_add_options --with-system-png
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
+ac_add_options --with-system-libevent
+ac_add_options --with-system-png
ac_add_options --enable-pulseaudio
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
@@ -94,6 +91,9 @@ ac_add_options --enable-system-ffi
ac_add_options --enable-startup-notification
ac_add_options --disable-updater
END
+
+ # Symbols are build only for windows. Have them back now
+ sed -i '/^.\/mach build$/ a ./mach buildsymbols' ../magic_build_and_package.sh
}
build() {
@@ -103,6 +103,9 @@ build() {
export CQZ_VERSION=$pkgver
export CQZ_BUILD_ID="$_cqzbuildid"
+ # Uncomment the following line to have a german build
+ # export CQZ_BUILD_DE_LOCALIZATION=1
+
./magic_build_and_package.sh
}