diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 54 |
2 files changed, 31 insertions, 33 deletions
@@ -1,9 +1,9 @@ # Generated by makepkg 5.1.1 -# Sat Dec 1 15:55:40 UTC 2018 +# Thu Jan 3 11:02:26 UTC 2019 pkgbase = cliqz pkgdesc = Firefox-based privacy aware web browser, build from sources - pkgver = 1.23.3 - pkgrel = 2 + pkgver = 1.24.0 + pkgrel = 1 url = https://cliqz.com/ arch = i686 arch = x86_64 @@ -46,8 +46,8 @@ pkgbase = cliqz conflicts = cliqz-bin options = !emptydirs options = !makeflags - source = https://github.com/cliqz-oss/browser-f/archive/1.23.3.tar.gz - sha256sums = 635ec83abcda27f09b6203ec919ab8aa50548659a637986f099080926d756a3b + source = https://github.com/cliqz-oss/browser-f/archive/1.24.0.tar.gz + sha256sums = a27bfe361a36271158a1bef7f25dae4803a93c38145a084258db398734235179 pkgname = cliqz @@ -1,9 +1,10 @@ # Maintainer: Étienne Deparis <etienne@depar.is> pkgname=cliqz _pkgname=browser-f -pkgver=1.23.3 -pkgrel=2 -_cqzbuildid=$(curl "http://repository.cliqz.com.s3.amazonaws.com/dist/release/$pkgver/lastbuildid") +pkgver=1.24.0 +pkgrel=1 +_cqzchannel=release +_cqzbuildid=$(curl "http://repository.cliqz.com.s3.amazonaws.com/dist/${_cqzchannel}/${pkgver}/lastbuildid") pkgdesc="Firefox-based privacy aware web browser, build from sources" arch=(i686 x86_64) url="https://cliqz.com/" @@ -17,20 +18,21 @@ makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake optdepends=('hunspell-en_US: Spell checking, American English') conflicts=(cliqz-bin) source=("https://github.com/cliqz-oss/browser-f/archive/$pkgver.tar.gz") -sha256sums=('635ec83abcda27f09b6203ec919ab8aa50548659a637986f099080926d756a3b') +sha256sums=('a27bfe361a36271158a1bef7f25dae4803a93c38145a084258db398734235179') options=(!emptydirs !makeflags) prepare() { - cd "$srcdir/${_pkgname}-$pkgver/mozilla-release" + cd "$srcdir/${_pkgname}-$pkgver/mozilla-release/toolkit/mozapps/installer" # Do not try to upload anything anywhere - sed -i 's/ifeq ($(OS_ARCH), Linux)/ifeq ($(OS_ARCH), Nope)/' toolkit/mozapps/installer/upload-files.mk + sed -i 's/ifeq ($(OS_ARCH), Linux)/ifeq ($(OS_ARCH), Nope)/' upload-files.mk + cd linux/rpm # 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 + sed -i "s/@MOZ_APP_DISPLAYNAME@/$pkgname/g" mozilla.desktop + sed -i "s/@MOZ_APP_NAME@/$pkgname/g" mozilla.desktop + sed -i "s|^Exec=${pkgname}$|Exec=/usr/lib/${pkgname}/${pkgname} %u|" mozilla.desktop - cat >> toolkit/mozapps/installer/linux/rpm/mozilla.desktop <<END + cat >> mozilla.desktop <<END Actions=new-forget-window; [Desktop Action new-forget-window] @@ -41,6 +43,8 @@ Name[fr]=Nouvelle fenêtre en mode oubli Exec=/usr/lib/cliqz/cliqz --private-window %u END + cd "$srcdir/${_pkgname}-$pkgver/mozilla-release" + # Remove -lcrmf from old configure scripts sed -i 's/NSS_LIBS="$NSS_LIBS -lcrmf"/NSS_LIBS="$NSS_LIBS"/' old-configure.in @@ -56,9 +60,6 @@ END # more information. echo -n "16674381-f021-49de-8622-3021c5942aff" > browser/mozilla-desktop-geoloc-api.key - # Please enable stylo! - sed -i '/^ac_add_options --disable-stylo$/d' browser/config/cliqz-release.mozconfig - cat >> browser/config/cliqz-release.mozconfig <<END # Archlinux specific additions @@ -67,12 +68,13 @@ ac_add_options --prefix=/usr ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-rust-simd - -# Speed up buildtime (thanks bm456) -ac_add_options --disable-debug -ac_add_options --disable-debug-symbols -ac_add_options --disable-tests -ac_add_options --disable-parental-controls +ac_add_options --enable-lto +export MOZ_PGO=1 +export CC=clang +export CXX=clang++ +export AR=llvm-ar +export NM=llvm-nm +export RANLIB=llvm-ranlib # System libraries ac_add_options --enable-pulseaudio @@ -97,7 +99,7 @@ END build() { cd "$srcdir/${_pkgname}-$pkgver" - export CQZ_RELEASE_CHANNEL=release + export CQZ_RELEASE_CHANNEL="$_cqzchannel" export CQZ_VERSION=$pkgver export CQZ_BUILD_ID="$_cqzbuildid" @@ -105,9 +107,8 @@ build() { # export CQZ_BUILD_DE_LOCALIZATION=1 export MOZ_NOSPAM=1 - - export ENABLE_CCACHE=0 - export MOZ_USING_CCACHE=0 + # LTO needs more open files + ulimit -n 4096 ./magic_build_and_package.sh } @@ -138,17 +139,14 @@ pref("browser.search.update", false); // Use the classical backspace action pref("browser.backspace_action", 0); +pref("browser.urlbar.insertMethod", 0); +pref("browser.urlbar.clickSelectsAll", false); // Use LANG environment variable to choose locale pref("intl.locale.requested", ""); // Use system-provided dictionaries pref("spellchecker.dictionary_path", "/usr/share/hunspell"); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); -pref("extensions.shield-recipe-client.enabled", false); END install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" |