Thu Apr 26 00:01:31 UTC 2012

2 files changed, 56 insertions, 16 deletions

diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch
new file mode 100644
index 000000000..2debc92fe
--- /dev/null
+++ b/community/midori/0001-Fix-libsoup-version-check-defines.patch
@@ -0,0 +1,28 @@
+From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian@twotoasts.de>
+Date: Mon, 16 Apr 2012 17:17:23 +0000
+Subject: Fix libsoup version check #defines
+
+Fixes: https://bugs.launchpad.net/midori/+bug/983137
+---
+diff --git a/wscript b/wscript
+index db74324..c7a0c87 100644
+--- a/wscript
++++ b/wscript
+@@ -260,11 +260,11 @@ def configure (conf):
+     check_pkg ('libsoup-2.4', '2.27.90')
+     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
+     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
+-        conf.define ('LIBSOUP_2_29_3', 1)
++        conf.define ('HAVE_LIBSOUP_2_29_3', 1)
+     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
+-        conf.define ('LIBSOUP_2_29_91', 1)
++        conf.define ('HAVE_LIBSOUP_2_29_91', 1)
+     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
+-        conf.define ('LIBSOUP_2_37_1', 1)
++        conf.define ('HAVE_LIBSOUP_2_37_1', 1)
+     check_pkg ('libxml-2.0', '2.6')
+     check_pkg ('sqlite3', '3.0', True, var='SQLITE')
+ 
+--
+cgit v0.9.0.3
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 22da899e8..8e1242d7b 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,40 +1,52 @@
-# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $
+# $Id: PKGBUILD 69842 2012-04-24 15:19:18Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
 pkgver=0.4.5
-pkgrel=1
-pkgdesc="A lightweight web browser based on Gtk WebKit"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc="Lightweight web browser based on Gtk WebKit"
+arch=('x86_64' 'i686')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 license=('LGPL2.1')
 install=midori.install
 depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('14288197a1e2251b7c0803e1448daa0e')
+options=('!emptydirs')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        0001-Fix-libsoup-version-check-defines.patch)
+sha256sums=('7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84'
+            '0095c23247c62b6a4b3ab4312f68b49e2d0974ce3fd701a2ce0114817c7bd399')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
+  # FS#29468
+  patch -Np1 -i "$srcdir"/0001-Fix-libsoup-version-check-defines.patch
+
+  ./configure \
+    --prefix=/usr \
+    --jobs=${MAKEFLAGS/-j/} \
+	  --enable-addons \
+	  --disable-hildon \
+	  --enable-unique \
+	  --enable-nls \
+	  --enable-docs \
+	  --enable-apidocs
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et: