diff options
| -rw-r--r-- | network/midori/README | 6 | ||||
| -rw-r--r-- | network/midori/doinst.sh | 2 | ||||
| -rw-r--r-- | network/midori/midori.SlackBuild | 15 | ||||
| -rw-r--r-- | network/midori/midori.info | 6 |
4 files changed, 17 insertions, 12 deletions
diff --git a/network/midori/README b/network/midori/README index f4ae8cf0d9..c8456017d8 100644 --- a/network/midori/README +++ b/network/midori/README @@ -1,9 +1,13 @@ 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: +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. diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh index 379c620aa8..59f020d806 100644 --- a/network/midori/doinst.sh +++ b/network/midori/doinst.sh @@ -12,7 +12,7 @@ config() { } config etc/xdg/midori/search.new -config etc/midori/extensions/libadblock.so/config.new +config etc/xdg/midori/extensions/libadblock.so/config.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index 3c9a606f70..9d0e08b6e5 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -1,9 +1,9 @@ #!/bin/sh -# Slackware build script for midori +# Slackware build script for midori. # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com> -# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> +# Copyright 2009-2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # # All rights reserved. # @@ -25,17 +25,15 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=midori -VERSION=0.2.2 +VERSION=0.2.6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$( uname -m ) ;; + *) ARCH=$( uname -m ) ;; esac fi @@ -49,6 +47,9 @@ DOCS="AUTHORS COPYING ChangeLog EXPAT HACKING INSTALL TODO TRANSLATE docs/user/m if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -93,7 +94,7 @@ export CXXFLAGS="$SLKCFLAGS" # Don't clobber existing configs mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new -mv $PKG/etc/midori/extensions/libadblock.so/config $PKG/etc/midori/extensions/libadblock.so/config.new +mv $PKG/etc/xdg/midori/extensions/libadblock.so/config $PKG/etc/xdg/midori/extensions/libadblock.so/config.new cp -a $DOCS $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 f17885c214..50fc727c22 100644 --- a/network/midori/midori.info +++ b/network/midori/midori.info @@ -1,8 +1,8 @@ PRGNAM="midori" -VERSION="0.2.2" +VERSION="0.2.6" HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html" -DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.2.tar.bz2" -MD5SUM="14f81a7a10f80a173da1b5e88713400b" +DOWNLOAD="http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.6.tar.bz2" +MD5SUM="249ddb3485d8246e0fda25dd735953f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Pierre Cazemave" |