[arch-commits] Commit in midori/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Sunday, May 7, 2017 @ 15:12:51
  Author: arodseth
Revision: 227257

upgpkg: midori 0.5.11-6

Modified:
  midori/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-07 13:45:43 UTC (rev 227256)
+++ PKGBUILD	2017-05-07 15:12:51 UTC (rev 227257)
@@ -1,6 +1,5 @@
 # $Id$
 # Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
@@ -8,7 +7,7 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=5
+pkgrel=6
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -27,15 +26,27 @@
 source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2")
 sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # The latest release of vala is a bit stricter than the previous one
+  sed 's/protected Tally/public Tally/g' -i midori/midori-notebook.vala
+  sed 's/%d other files/%u other files/g' -i extensions/transfers.vala
+  for f in transfers adblock/widgets apps history-list notes; do
+      sed 's/.remove (iter/.remove (ref iter/g' -i "extensions/$f.vala"
+  done
+}
+
 build() {
   cd "$pkgname-$pkgver"
+
   mkdir -p build
   cd build
-  # HALF_BRO_INCOM_WEBKIT2=ON sets USE_GTK3=ON
   cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DHALF_BRO_INCOM_WEBKIT2=ON \
+    -DCMAKE_C_FLAGS="$CFLAGS -w" \
     -G Ninja
   ninja
 }