network/midori: Updated for version 0.3.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

5 files changed, 21 insertions, 39 deletions

diff --git a/network/midori/README b/network/midori/README
index 7708a1d3567e4..b8c47a1df3a24 100644
--- a/network/midori/README
+++ b/network/midori/README
@@ -1,9 +1,15 @@
 Midori is a lightweight, webkit-based web browser.
 
-Since midori is still in heavy development, an "updated" version
-can be grabbed via git and making minor changes to the buildscript:
+Features:
+    * Full integration with GTK+ 2
+    * Fast rendering with WebKit
+    * Tabs, windows and session management
+    * Flexibly configurable Web Search.
+    * User scripts and user styles support.
+    * Straightforward bookmark management.
+    * Customizable and extensible interface.
+    * Extensions such as Adblock, form history, mouse gestures or 
+    cookie management.
 
-git clone http://software.twotoasts.de/media/midori.git midori
-
-Note: To build midori, libsexy, libunique, vala and webkit (webkitgtk) are 
+To build midori, libsexy, libunique, vala and webkit (webkitgtk) are 
 required, all of which are available at slackbuilds.org.
diff --git a/network/midori/midori-katze-throbber-0.2.9.patch b/network/midori/midori-katze-throbber-0.2.9.patch
deleted file mode 100644
index ec66122a466f4..0000000000000
--- a/network/midori/midori-katze-throbber-0.2.9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- midori-0.2.9~/katze/katze-throbber.c    2010-10-31 17:20:48.000000000 -0500
-+++ midori-0.2.9/katze/katze-throbber.c 2010-12-30 10:35:08.950402793 -0600
-@@ -855,6 +855,7 @@
- katze_throbber_expose_event (GtkWidget*      widget,
-                              GdkEventExpose* event)
- {
-+    gint ax, ay;
-     KatzeThrobber* throbber = KATZE_THROBBER (widget);
- 
-     if (G_UNLIKELY (!throbber->width || !throbber->height))
-@@ -867,7 +868,6 @@
-     if (!throbber->animated && (throbber->static_pixbuf
-         || throbber->static_icon_name || throbber->static_stock_id))
-     {
--        gint ax, ay;
-         cairo_t* cr;
- 
-         if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name))
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild
index cefe6808175ee..5200d321159f4 100644
--- a/network/midori/midori.SlackBuild
+++ b/network/midori/midori.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for midori.
 
 # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2009-2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
+# Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 #
 # All rights reserved.
 #
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=midori
-VERSION=0.2.9
+VERSION=0.3.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,14 +70,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 
-# Patch katze-throbber.c to fix bug #993 (fixes compatibility issue 
-# with Gtk+ v2.18.9 in Slackware 13.1). See:
-# http://www.twotoasts.de/bugs/index.php?do=details&task_id=993
-# Patch retrieved from upstream:
-# http://www.twotoasts.de/bugs/index.php?getfile=1002
-# Thanks to Andy Goth for the heads up.
-patch -p1 < $CWD/midori-katze-throbber-${VERSION}.patch
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -108,7 +100,9 @@ mv $PKG/etc/xdg/midori/extensions/libadblock.so/config $PKG/etc/xdg/midori/exten
 
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
+cd $PKG/usr/doc
+  ln -s $PRGNAM-$VERSION $PRGNAM
+cd -
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/midori/midori.info b/network/midori/midori.info
index 2efc87100466e..b56eaad752df4 100644
--- a/network/midori/midori.info
+++ b/network/midori/midori.info
@@ -1,10 +1,10 @@
 PRGNAM="midori"
-VERSION="0.2.9"
+VERSION="0.3.0"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.9.tar.bz2"
-MD5SUM="a5821d8e31fa944374ed51c09ca4e740"
+DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.3/midori-0.3.0.tar.bz2"
+MD5SUM="ad1cf5449331fa800001c06765341219"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave <at> gmail <dot> com"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"
diff --git a/network/midori/slack-desc b/network/midori/slack-desc
index c8665ea82662b..7cc07e6989844 100644
--- a/network/midori/slack-desc
+++ b/network/midori/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler---------------------------------------------------------|
+      |-----handy-ruler------------------------------------------------------|
 midori: midori (simple web-browser)
 midori:
 midori: midori is a simple web-browser, based on the webkit framework.