summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉtienne Deparis2017-12-08 15:54:54 +0100
committerÉtienne Deparis2017-12-08 15:55:17 +0100
commit3681d0e24a6995355f1298e0f02339a26476abbd (patch)
treeb5b0c6847173fcaef8d46bfa0e3fedfc8a2b5d6a
parent96167bc413ed595f54260469276be0bf3a2149d2 (diff)
downloadaur-3681d0e24a6995355f1298e0f02339a26476abbd.tar.gz
New 1.17.1 using upstream tag as a source. Use system libs and hardening when pertinent
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD40
2 files changed, 31 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c1ffd36992..bb3c7fe7e04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by makepkg 5.0.2
-# Tue Dec 5 10:34:43 UTC 2017
+# Fri Dec 8 14:53:34 UTC 2017
pkgbase = cliqz
pkgdesc = Firefox-based privacy aware web browser, build from sources
pkgver = 1.17.1
- pkgrel = 1
+ pkgrel = 2
url = https://cliqz.com/
arch = i686
arch = x86_64
@@ -22,6 +22,7 @@ pkgbase = cliqz
makedepends = rust
makedepends = clang
makedepends = llvm
+ makedepends = libnotify
depends = gtk3
depends = gtk2
depends = mozilla-common
@@ -35,17 +36,19 @@ pkgbase = cliqz
depends = sqlite
depends = ttf-font
depends = libpulse
+ depends = icu
+ depends = libevent
conflicts = cliqz-bin
options = !emptydirs
options = !makeflags
options = !strip
- source = https://github.com/cliqz-oss/browser-f/archive/88a3c2f0245c5748c4f217fc5f1aaed780541e0b.tar.gz
+ source = https://github.com/cliqz-oss/browser-f/archive/1.17.1.tar.gz
source = wifi-disentangle.patch
source = wifi-fix-interface.patch
source = no-plt.diff
source = 0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch
source = 0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch
- sha256sums = 43e7873a43684b5827eb4ebeeeb47506cd84f22fa36855324f1e7c0db05ba7a3
+ sha256sums = a13c32904e8e7e15fe12283ada81ad09f2f9c1c86476776beb43f346861b54ac
sha256sums = f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed
sha256sums = e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1
sha256sums = ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa
diff --git a/PKGBUILD b/PKGBUILD
index bcfa5159ca7..e66a78dac1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,24 @@
pkgname=cliqz
_pkgname=browser-f
pkgver=1.17.1
-pkgrel=1
-_commitid=88a3c2f0245c5748c4f217fc5f1aaed780541e0b
+pkgrel=2
_cqzbuildid=20171130123422
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
- nss hunspell sqlite ttf-font libpulse)
+ nss hunspell sqlite ttf-font libpulse icu libevent)
makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
- autoconf2.13 rust clang llvm)
+ autoconf2.13 rust clang llvm libnotify)
conflicts=(cliqz-bin)
-source=("https://github.com/cliqz-oss/browser-f/archive/${_commitid}.tar.gz"
+source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz"
wifi-disentangle.patch
wifi-fix-interface.patch
no-plt.diff
0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch
0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch)
-sha256sums=('43e7873a43684b5827eb4ebeeeb47506cd84f22fa36855324f1e7c0db05ba7a3'
+sha256sums=('a13c32904e8e7e15fe12283ada81ad09f2f9c1c86476776beb43f346861b54ac'
'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed'
'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1'
'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
@@ -30,8 +29,11 @@ sha256sums=('43e7873a43684b5827eb4ebeeeb47506cd84f22fa36855324f1e7c0db05ba7a3'
options=(!emptydirs !makeflags !strip)
prepare() {
- cd "$srcdir/${_pkgname}-${_commitid}/mozilla-release"
+ cd "$srcdir/${_pkgname}-$pkgver/mozilla-release"
+ # Do not try to upload anything anywhere
sed -i 's/ifeq ($(OS_ARCH), Linux)/ifeq ($(OS_ARCH), Nope)/' toolkit/mozapps/installer/upload-files.mk
+
+ # Patch future desktop file, which does not seems to be embed
sed -i "s/@MOZ_APP_DISPLAYNAME@/$pkgname/g" toolkit/mozapps/installer/linux/rpm/mozilla.desktop
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
@@ -47,6 +49,9 @@ Name[fr]=Nouvelle fenêtre en mode oubli
Exec=/usr/lib/cliqz/cliqz --private-window %u
END
+ # Remove -lcrmf from old configure scripts
+ sed -i 's/NSS_LIBS="$NSS_LIBS -lcrmf"/NSS_LIBS="$NSS_LIBS"/' old-configure.in
+
# https://bugzilla.mozilla.org/show_bug.cgi?id=1360278
patch -Np1 -i "$srcdir/0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch"
@@ -77,14 +82,21 @@ 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-rust-simd
ac_add_options --enable-stylo
+ac_add_options --enable-default-toolkit=cairo-gtk3
# System libraries
ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
+ac_add_options --with-system-libevent
+ac_add_options --with-system-nss
+ac_add_options --enable-pulseaudio
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
@@ -96,20 +108,20 @@ END
}
build() {
- cd "$srcdir/${_pkgname}-${_commitid}"
+ cd "$srcdir/${_pkgname}-$pkgver"
# Hardening
LDFLAGS+=" -Wl,-z,now"
# Avoid duplicate compilation options
march=$(gcc -Q --help=target | grep march | sed -nr 's/^.*\s+([^\s]+)$/\1/p')
- CFLAGS="-march=${march} -mtune=generic -O2 -fstack-protector-strong -fno-plt"
+ CFLAGS="-march=${march} -mtune=generic -O2 -fstack-protector-strong -fno-plt -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=coverage-mismatch"
CPPFLAGS="-D_FORTIFY_SOURCE=2"
CXXFLAGS="$CFLAGS"
export CQZ_RELEASE_CHANNEL=release
export CQZ_VERSION=$pkgver
- export CQZ_BUILD_ID=$_cqzbuildid
+ export CQZ_BUILD_ID="$_cqzbuildid"
./magic_build_and_package.sh
}
@@ -120,11 +132,11 @@ package() {
ln -s "/usr/lib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
cd "$srcdir"
- mv "$_pkgname-${_commitid}/obj/dist/$pkgname-$pkgver.en-US.linux-x86_64.tar.bz2" .
+ mv "${_pkgname}-$pkgver/obj/dist/$pkgname-$pkgver.en-US.linux-x86_64.tar.bz2" .
tar xjf "$pkgname-$pkgver.en-US.linux-x86_64.tar.bz2"
cp -R "$pkgname" "$pkgdir/usr/lib/"
- cd "${_pkgname}-${_commitid}"
+ cd "${_pkgname}-$pkgver"
for size in 16 22 24 32 48 256; do
install -D -m644 "mozilla-release/browser/branding/cliqz/default$size.png" \
"$pkgdir/usr/share/icons/hicolor/$sizex$size/apps/$pkgname.png"
@@ -153,8 +165,4 @@ END
install -D -m644 mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \
"$pkgdir/usr/share/applications/$pkgname.desktop"
-
- # Use system certificates
- ln -srf "$pkgdir/usr/lib/libnssckbi.so" \
- "$pkgdir/usr/lib/$pkgname/libnssckbi.so"
}