[Lunar-commits] <moonbase-other> midori: version bump & general overhaul

[v4hn]

commit 755e4e211436405bef436862d8dab9ab5e713061
Author: v4hn <me at v4hn.de>
Date: Sat, 05 Jul 2014 01:29:37 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/755e4e211436405bef436862d8dab9ab5e713061

midori: version bump & general overhaul

They changed the build system in a minor release
and messed up the tarball -.-
---
  web/midori/BUILD     | +2/-14    
  web/midori/CONFIGURE | +0/-1     
  web/midori/DEPENDS   | +9/-5     
  web/midori/DETAILS   | +6/-6     
  web/midori/PRE_BUILD | +4/-0     
  5 files changed, 21 insertions(+), 26 deletions(-)

--- a/web/midori/BUILD
+++ b/web/midori/BUILD
@@ -1,15 +1,3 @@
-(
+OPTS+=" -DUSE_GTK3=1" &&
 
-  ./waf configure --prefix=/usr              \
-                  --sysconfdir=/etc          \
-                  --localstatedir=/var       \
-                  --infodir=/usr/share/info  \
-                  --mandir=/usr/share/man    \
-                  --enable-addons            \
-                  --disable-nls              \
-                  $OPTS  &&
-  ./waf &&
-  prepare_install &&
-  ./waf install
-
-) > $C_FIFO 2>&1
+default_cmake_build
--- a/web/midori/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery ADDONS "Enable addons?" y "--enable-addons" "--disable-addons"
--- a/web/midori/DEPENDS
+++ b/web/midori/DEPENDS
@@ -1,10 +1,14 @@
-depends  webkit
+depends  glib-2
+depends  gtk+-3
+depends  webkitgtk3
 depends  vala
+depends  libxml2
+depends  libsoup
+depends  sqlite
+depends  libnotify
 
-optional_depends libunique  "--enable-unique"    "--disable-unique"    "for single instance midori"
-optional_depends gtk-doc    "--enable-apidocs"   "--disable-apidocs"   "enable creation of apidocs"
-optional_depends libnotify  "--enable-libnotify" "--disable-libnotify" "for notification support"
-optional_depends zeitgeist  "--enable-zeitgeist" "--disable-zeitgeist" "for zeitgeist support"
+optional_depends gtk-doc    "-DUSE_APIDOCS=1"   "-DUSE_APIDOCS=0"   "build API documentation"
+optional_depends zeitgeist  "-DUSE_ZEITGEIST=1" "-DUSE_ZEITGEIST=0" "for zeitgeist support"
 
 # this is a runtime dependency *shudder*
 optional_depends glib-networking "" "" "for TLS/SSL (https) encryption support"
--- a/web/midori/DETAILS
+++ b/web/midori/DETAILS
@@ -1,11 +1,11 @@
           MODULE=midori
-         VERSION=0.5.2
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://archive.xfce.org/src/apps/midori/${VERSION%.*}
-      SOURCE_VFY=sha1:447f19716cff4d10163e21f236b37efdf4d67d44
-        WEB_SITE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
+         VERSION=0.5.8
+          SOURCE=${MODULE}_${VERSION}_all_.tar.bz2
+      SOURCE_URL=http://midori-browser.org/downloads
+      SOURCE_VFY=sha1:238bbf4935e409bc41fcba5b8407f3e30ea017f6
+        WEB_SITE=http://www.midori-browser.org
          ENTERED=20070921
-         UPDATED=20130518
+         UPDATED=20140704
            SHORT="A lightweight WebKit/Gtk+-2 based browser"
 
 cat << EOF
--- /dev/null
+++ b/web/midori/PRE_BUILD
@@ -0,0 +1,4 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+
+unpack $SOURCE