From 01a9b94af945f5a3d755c3ad10e7d34fa178fac8 Mon Sep 17 00:00:00 2001
From: Jesús Eduardo <heckyel@openmailbox.org>
Date: Fri, 12 May 2017 15:30:53 -0500
Subject: midori: rebuild

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

(limited to 'libre/midori/PKGBUILD')

diff --git a/libre/midori/PKGBUILD b/libre/midori/PKGBUILD
index d55184ef1..4ee1072ad 100644
--- a/libre/midori/PKGBUILD
+++ b/libre/midori/PKGBUILD
@@ -5,11 +5,11 @@
 # Contributor (Arch): rabyte <rabyte.at.gmail.dot.com>
 # Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org>
 # Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: André Silva <emulatorman@riseup.net>
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=5.parabola1
+pkgrel=5.parabola2
 pkgdesc='Lightweight web browser (GTK3), without non-privacy search engines'
 arch=('x86_64' 'i686' 'armv7h')
 url='http://www.midori-browser.org/'
@@ -30,7 +30,8 @@ sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  # remove non-privacy search engines
+  
+  # Remove non-privacy search engines
   sed -i 's|Duck Duck Go|DuckDuckGo HTML|
           s|duckduckgo[.]com|duckduckgo.com/html|
           \|Yahoo|d
@@ -46,10 +47,19 @@ prepare() {
           \|Localize text or URL|d
           \|translate[.]google[.]com/?q=|d
          ' config/search
+         
+  # 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
@@ -57,6 +67,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DHALF_BRO_INCOM_WEBKIT2=ON \
+    -DCMAKE_C_FLAGS="$CFLAGS -w" \
     -G Ninja
   ninja
 }
-- 
cgit v1.2.3