summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
author Pierre Cazenave <pwcazenaveatgmaildotcom>2011-01-01 12:03:38 -0500
committer Robby Workman <rworkman@slackbuilds.org>2011-01-02 00:27:35 -0600
commit84f4ead27546fa4f3815b377f32ab160ecb6a9ba (patch)
treea791ec70edbb77480d327813bf4d2f1ffb994e92 /network
parent54ab180396756abc5cff2349b7d32664381b5aff (diff)
downloadslackbuilds-84f4ead27546fa4f3815b377f32ab160ecb6a9ba.tar.gz
slackbuilds-84f4ead27546fa4f3815b377f32ab160ecb6a9ba.tar.xz
network/midori: Updated for version 0.2.9.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/midori/README8
-rw-r--r--network/midori/midori-katze-throbber-0.2.9.patch18
-rw-r--r--network/midori/midori.SlackBuild16
-rw-r--r--network/midori/midori.info10
-rw-r--r--network/midori/slack-desc4
5 files changed, 40 insertions, 16 deletions
diff --git a/network/midori/README b/network/midori/README
index c8456017d8..7708a1d356 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 0000000000..ec66122a46
--- /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 9d0e08b6e5..cefe680817 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 50fc727c22..2efc871004 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 3fc10e812c..c8665ea826 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