diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 78 | ||||
-rw-r--r-- | no-crmf.diff | 15 |
3 files changed, 69 insertions, 40 deletions
@@ -1,9 +1,9 @@ # Generated by makepkg 5.0.2 -# Wed Aug 2 17:01:01 UTC 2017 +# Wed Sep 6 10:11:53 UTC 2017 pkgbase = cliqz pkgdesc = Firefox-based privacy aware web browser, build from sources - pkgver = 1.14.1 - pkgrel = 3 + pkgver = 1.15.0 + pkgrel = 1 url = https://cliqz.com/ arch = i686 arch = x86_64 @@ -14,12 +14,12 @@ pkgbase = cliqz makedepends = python2 makedepends = yasm makedepends = mesa + makedepends = imake makedepends = gconf makedepends = inetutils makedepends = xorg-server-xvfb makedepends = autoconf2.13 makedepends = rust - makedepends = gcc5 depends = gtk3 depends = gtk2 depends = mozilla-common @@ -27,7 +27,6 @@ pkgbase = cliqz depends = startup-notification depends = mime-types depends = dbus-glib - depends = alsa-lib depends = ffmpeg depends = nss depends = hunspell @@ -35,14 +34,15 @@ pkgbase = cliqz depends = ttf-font depends = libpulse depends = icu - depends = libvpx conflicts = cliqz-bin options = !emptydirs options = !makeflags options = !strip - source = https://github.com/cliqz-oss/browser-f/archive/1.14.1.tar.gz + source = https://github.com/cliqz-oss/browser-f/archive/1.15.0.tar.gz + source = no-crmf.diff source = fix-wifi-scanner.diff - sha256sums = 2cbef2d9a57f54de9c1582cfbe1e578997151eb3090071bb937da52e7354aebf + sha256sums = 52b7a3c91ef4d6751a48ced5cb7bc6f1e3b4a13311ffbef7e008233936530ed3 + sha256sums = fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8 pkgname = cliqz @@ -1,26 +1,28 @@ # Maintainer: Étienne Deparis <etienne@depar.is> pkgname=cliqz _pkgname=browser-f -pkgver=1.14.1 -pkgrel=3 -_cqzbuildid=20170706154045 +pkgver=1.15.0 +pkgrel=1 +_cqzbuildid=20170830153152 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 alsa-lib ffmpeg - nss hunspell sqlite ttf-font libpulse icu libvpx) -makedepends=(unzip zip diffutils python2 yasm mesa gconf inetutils xorg-server-xvfb - autoconf2.13 rust gcc5) +depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg + nss hunspell sqlite ttf-font libpulse icu) +makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb + autoconf2.13 rust) conflicts=(cliqz-bin) source=("https://github.com/cliqz-oss/browser-f/archive/${pkgver}.tar.gz" + 'no-crmf.diff' 'fix-wifi-scanner.diff') -sha256sums=('2cbef2d9a57f54de9c1582cfbe1e578997151eb3090071bb937da52e7354aebf' +sha256sums=('52b7a3c91ef4d6751a48ced5cb7bc6f1e3b4a13311ffbef7e008233936530ed3' + 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8') options=(!emptydirs !makeflags !strip) prepare() { - cd $srcdir/$_pkgname-$pkgver/mozilla-release + cd $srcdir/${_pkgname}-${pkgver}/mozilla-release sed -i 's/ifeq ($(OS_ARCH), Linux)/ifeq ($(OS_ARCH), Nope)/' toolkit/mozapps/installer/upload-files.mk 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 @@ -31,14 +33,14 @@ Actions=new-forget-window; [Desktop Action new-forget-window] Name=New Forget Window -Name[de]=Neues privates Fenste +Name[de]=Neues Vergessen Fenster Name[en_US]=New Forget Window -Name[fr]=Nouvelle fenêtre de navigation privée +Name[fr]=Nouvelle fenêtre en mode oubli Exec=/usr/lib/cliqz/cliqz --private-window %u END - # Quickfix only for 1.14.1 - echo "$pkgver" > browser/config/version_display.txt + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i $srcdir/no-crmf.diff # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 patch -Np1 -i $srcdir/fix-wifi-scanner.diff @@ -55,7 +57,9 @@ END # more information. echo -n "16674381-f021-49de-8622-3021c5942aff" > browser/mozilla-desktop-geoloc-api.key - cat > .mozconfig <<END + cat >> browser/config/cliqz-release.mozconfig <<END + +# Milouse Archlinux specific additions ac_add_options --prefix=/usr ac_add_options --enable-gold ac_add_options --enable-pie @@ -65,10 +69,8 @@ ac_add_options --enable-optimize="-O2" 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-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi @@ -77,26 +79,19 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --disable-updater +ac_add_options --enable-default-toolkit=cairo-gtk3 STRIP_FLAGS="--strip-debug" END } build() { - cd $srcdir/$_pkgname-$pkgver - - # Rewrite to avoid multiple -pipe - march=$(gcc -Q --help=target | grep march | sed -nr 's/^.*\s+([^\s]+)$/\1/p') - CFLAGS="-march=${march} -mtune=generic -O2 -fstack-protector-strong" - CXXFLAGS="-march=${march} -mtune=generic -O2 -fstack-protector-strong" + cd $srcdir/${_pkgname}-$pkgver - # Hardening is currently deactivated as it hangs on my current machine # Hardening LDFLAGS+=" -Wl,-z,now" - # Ugly graphic glitches if compiled with gcc7 - export CXX=/usr/bin/g++-5 - export CC=/usr/bin/gcc-5 + CPPFLAGS+=" -O2" export CQZ_RELEASE_CHANNEL=release export CQZ_VERSION=$pkgver @@ -106,23 +101,42 @@ build() { } package() { - cd $srcdir - install -d -m755 ${pkgdir}/usr/{bin,lib} ln -s /usr/lib/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname} - mv $_pkgname-$pkgver/obj/dist/${pkgname}-${pkgver}.en-US.linux-x86_64.tar.bz2 . + cd $srcdir + 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}-$pkgver for size in 16 22 24 32 48 256; do - install -D -m644 $_pkgname-$pkgver/mozilla-release/browser/branding/cliqz/default$size.png \ + install -D -m644 mozilla-release/browser/branding/cliqz/default$size.png \ ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png done - install -D -m644 $_pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -d -m755 ${pkgdir}/usr/lib/${pkgname}/browser/defaults/preferences + _vendorjs=${pkgdir}/usr/lib/${pkgname}/browser/defaults/preferences/vendor.js + 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); + +// 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); +END + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m644 $_pkgname-$pkgver/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \ + install -D -m644 mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop } diff --git a/no-crmf.diff b/no-crmf.diff new file mode 100644 index 000000000000..242304eb4182 --- /dev/null +++ b/no-crmf.diff @@ -0,0 +1,15 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP |