midori-0.5.11-10.par1: rebuild

2 files changed, 28 insertions, 54 deletions

diff --git a/libre/midori/PKGBUILD b/libre/midori/PKGBUILD
index 9e2b8f68f..a77e12e44 100644
--- a/libre/midori/PKGBUILD
+++ b/libre/midori/PKGBUILD
@@ -1,76 +1,55 @@
-# $Id: PKGBUILD 209048 2017-01-25 14:27:54Z arodseth $
-# Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org>
+# Maintainer (Arch): Alexander F. Rødseth <xyproto@archlinux.org>
 # Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com>
-# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor (Arch): rabyte <rabyte@gmail.com>
+# Contributor (Arch): Johannes Krampf <wuischke@amule.org>
 # Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=6.parabola1
-pkgdesc='Lightweight web browser (GTK3), without non-privacy search engines'
-arch=('x86_64' 'i686' 'armv7h')
-url='http://www.midori-browser.org/'
-license=('LGPL2.1')
-install='midori.install'
-conflicts=('midori-gtk2')
-provides=('midori')
-replaces=('midori-gtk3')
-depends=('webkit2gtk' 'libxss' 'gcr' 'zeitgeist')
-makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja')
+pkgrel=10
+pkgrel+=.par1
+pkgdesc='Lightweight web browser, without non-privacy search engines'
+arch=('x86_64')
+arch+=('i686' 'armv7h')
+url='https://midori-browser.org/'
+license=('LGPL')
+depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss' 'webkit2gtk' 'zeitgeist')
+makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja' 'vala')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
             'gst-plugins-good: HTML5 H264 and WebM videos support'
-            'gst-libav: HTML5 H264 videos support'
-            'aria2: download utility')
+            'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
-source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2")
-sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
+# The latest release of Midori does not build with GTK+ > 3.10.
+# Using latest git commit while waiting for the next release.
+source=("$pkgname::git+https://github.com/midori-browser/core.git#commit=7dab517e66475929336e80840cce2351891dd4ef")
+md5sums=('SKIP')
+
+# NOTE: Set GTK_CSD=1 for enabling client side decorations when running Midori
 
 prepare() {
-  cd "$pkgname-$pkgver"
-  
-  # Remove non-privacy search engines
-  sed -i 's|Duck Duck Go|DuckDuckGo HTML|
-          s|duckduckgo[.]com|duckduckgo.com/html|
-          \|Yahoo|d
-          \|name=Yahoo|d
-          \|text=Yahoo Web Search|d
-          \|uri=http://search[.]yahoo[.]com/search?p=|d
-          \|token=y|d
-          \|Google|d
-          \|name=Google|d
-          \|text=Web Search|d
-          \|uri=http://www[.]google[.]com/search?q=%s|d
-          \|token=g|d
-          \|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
+  cd $pkgname
+
+  # Use DuckDuckGo HTML
+  sed -i 's|duckduckgo[.]com|duckduckgo.com/html|g' core/settings.vala
 }
 
 build() {
-  cd "$pkgname-$pkgver"
-  
   mkdir -p build
   cd build
-  cmake .. \
+  # TODO: Check if VALA_CFLAGS is respected
+  cmake "../$pkgname" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DHALF_BRO_INCOM_WEBKIT2=ON \
-    -DCMAKE_C_FLAGS="$CFLAGS -w" \
+    -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
+    -DVALA_CFLAGS="$CFLAGS -fPIC -w" \
     -G Ninja
   ninja
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install
+  DESTDIR="$pkgdir" ninja -C build install
 }
 
 # getver: -u 2 midori-browser.org/download/source
diff --git a/libre/midori/midori.install b/libre/midori/midori.install
deleted file mode 100644
index 0ca91121c..000000000
--- a/libre/midori/midori.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-  echo 'Set GTK_CSD=1 for enabling client side decorations for Midori'
-}
-
-# vim:set ts=2 sw=2 et: