From 84f4ead27546fa4f3815b377f32ab160ecb6a9ba Mon Sep 17 00:00:00 2001
From: Pierre Cazenave <pwcazenaveatgmaildotcom>
Date: Sat, 1 Jan 2011 12:03:38 -0500
Subject: network/midori: Updated for version 0.2.9.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 network/midori/README                            |  8 ++------
 network/midori/midori-katze-throbber-0.2.9.patch | 18 ++++++++++++++++++
 network/midori/midori.SlackBuild                 | 16 +++++++++++++---
 network/midori/midori.info                       | 10 +++++-----
 network/midori/slack-desc                        |  4 ++--
 5 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 network/midori/midori-katze-throbber-0.2.9.patch

(limited to 'network/midori')

diff --git a/network/midori/README b/network/midori/README
index c8456017d885..7708a1d3567e 100644
--- a/network/midori/README
+++ b/network/midori/README
@@ -5,9 +5,5 @@ can be grabbed via git and making minor changes to the buildscript:
 
 git clone http://software.twotoasts.de/media/midori.git midori
 
-Note: To build midori, libsexy, libunique and webkit are required, all of 
-which are available at slackbuilds.org.
-
-When upgrading from 0.2.2 to 0.2.6, be aware the config file for libadblock
-in midori has moved from /etc/midori to /etc/xdg/midori/. If you have a
-custom config, you will need to manually move it over.
+Note: 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
new file mode 100644
index 000000000000..ec66122a466f
--- /dev/null
+++ b/network/midori/midori-katze-throbber-0.2.9.patch
@@ -0,0 +1,18 @@
+--- 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 9d0e08b6e5d8..cefe6808175e 100644
--- a/network/midori/midori.SlackBuild
+++ b/network/midori/midori.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=midori
-VERSION=0.2.6
+VERSION=0.2.9
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +70,14 @@ 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 \) \
@@ -82,13 +90,15 @@ export CXXFLAGS="$SLKCFLAGS"
 
 ./waf configure \
    --prefix=/usr \
-   --libdir=/usr/lib$LIBDIRSUFFIX \
+   --libdir=/usr/lib${LIBDIRSUFFIX} \
    --docdir=/usr/doc/$PRGNAM-$VERSION \
    --sysconfdir=/etc \
    --localstatedir=/var \
-   --libdir=/usr/lib${LIBDIRSUFFIX} \
+   --datarootdir=/usr/share/ \
+   --mandir=/usr/man \
    --enable-unique \
    --enable-addons
+
 ./waf build
 ./waf install --destdir=$PKG
 
diff --git a/network/midori/midori.info b/network/midori/midori.info
index 50fc727c2256..2efc87100466 100644
--- a/network/midori/midori.info
+++ b/network/midori/midori.info
@@ -1,10 +1,10 @@
 PRGNAM="midori"
-VERSION="0.2.6"
+VERSION="0.2.9"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.6.tar.bz2"
-MD5SUM="249ddb3485d8246e0fda25dd735953f0"
+DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.9.tar.bz2"
+MD5SUM="a5821d8e31fa944374ed51c09ca4e740"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Pierre Cazemave"
+MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave <at> gmail <dot> com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
diff --git a/network/midori/slack-desc b/network/midori/slack-desc
index 3fc10e812c0d..c8665ea82662 100644
--- a/network/midori/slack-desc
+++ b/network/midori/slack-desc
@@ -7,9 +7,9 @@
 
       |-----handy-ruler---------------------------------------------------------|
 midori: midori (simple web-browser)
-midori: 
+midori:
 midori: midori is a simple web-browser, based on the webkit framework.
-midori: 
+midori:
 midori:
 midori:
 midori: http://www.twotoasts.de/index.php?/pages/midori_summary.html
-- 
cgit v1.2.3