summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/midori/README5
-rw-r--r--network/midori/midori.SlackBuild15
-rw-r--r--network/midori/midori.info6
3 files changed, 20 insertions, 6 deletions
diff --git a/network/midori/README b/network/midori/README
index 009d55bb01..e7e31118d8 100644
--- a/network/midori/README
+++ b/network/midori/README
@@ -10,3 +10,8 @@ Features:
* Customizable and extensible interface.
* Extensions such as Adblock, form history, mouse gestures or
cookie management.
+
+GTK3 support is disabled by default but can be enabled
+by passing GTK3=yes to the script, e.g.
+GTK3=yes ./midori.SlackBuild
+If enabled then package webkitgtk3 is required.
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild
index 6fe6ce0899..cf019455cd 100644
--- a/network/midori/midori.SlackBuild
+++ b/network/midori/midori.SlackBuild
@@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=midori
-VERSION=${VERSION:-0.4.8}
+VERSION=${VERSION:-0.5.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,6 +60,14 @@ else
LIBDIRSUFFIX=""
fi
+# GTK3 support is disabled by default but can be enabled
+# by passing GTK3=yes to the script
+if [ "${GTK3:-no}" = "yes" ]; then
+ ENABLE_GTK3="enable"
+else
+ ENABLE_GTK3="disable"
+fi
+
set -eu
rm -rf $PKG
@@ -87,8 +95,7 @@ export CXXFLAGS="$SLKCFLAGS"
--localstatedir=/var \
--datarootdir=/usr/share/ \
--mandir=/usr/man \
- --enable-unique \
- --enable-addons \
+ --$ENABLE_GTK3-gtk3 \
--disable-zeitgeist
./waf build
@@ -98,6 +105,8 @@ export CXXFLAGS="$SLKCFLAGS"
mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new
mv $PKG/etc/xdg/midori/extensions/adblock/config $PKG/etc/xdg/midori/extensions/adblock/config.new
+# The other doc files have already been copied into /usr/doc/$PRGNAM-$VERSION
+# by "./waf install"
cp -a HACKING INSTALL TODO TRANSLATE \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/midori/midori.info b/network/midori/midori.info
index bcc221c9dd..5691543df1 100644
--- a/network/midori/midori.info
+++ b/network/midori/midori.info
@@ -1,8 +1,8 @@
PRGNAM="midori"
-VERSION="0.4.8"
+VERSION="0.5.0"
HOMEPAGE="http://twotoasts.de/index.php/midori/"
-DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.4/midori-0.4.8.tar.bz2"
-MD5SUM="ce1b01fa5aa33d2ee50196df0c71e96f"
+DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.5/midori-0.5.0.tar.bz2"
+MD5SUM="ad11685633e23f8173e2cd947d945cce"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libunique vala webkitgtk"