diff options
| -rw-r--r-- | network/midori/README | 2 | ||||
| -rw-r--r-- | network/midori/doinst.sh | 27 | ||||
| -rw-r--r-- | network/midori/midori.SlackBuild | 50 | ||||
| -rw-r--r-- | network/midori/midori.info | 14 | ||||
| -rw-r--r-- | network/midori/slack-desc | 2 |
5 files changed, 62 insertions, 33 deletions
diff --git a/network/midori/README b/network/midori/README index 2d25eaef1c..f4ae8cf0d9 100644 --- a/network/midori/README +++ b/network/midori/README @@ -5,5 +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, and webkit are required, all of +Note: To build midori, libsexy, libunique and webkit are required, all of which are available at slackbuilds.org. diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh index cf492c479d..379c620aa8 100644 --- a/network/midori/doinst.sh +++ b/network/midori/doinst.sh @@ -1,3 +1,26 @@ -if [ -x /usr/bin/gtk-update-icon-cache ] && [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/xdg/midori/search.new +config etc/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 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index d8f336c1e1..32760e310e 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -3,6 +3,8 @@ # Slackware build script for midori # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com> +# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,35 +24,38 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -set -eu - PRGNAM=midori -VERSION=0.1.1 +VERSION=0.2.2 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} -TAG=${TAG=_SBo} +TAG=${TAG:-_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS ChangeLog INSTALL HACKING NEWS TODO" +DOCS="AUTHORS COPYING ChangeLog EXPAT HACKING INSTALL TODO TRANSLATE docs/user/midori.txt" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi +set -eu + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION || exit 1 +cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -62,30 +67,29 @@ find . \ export CCFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -./waf configure --prefix=/usr +./waf configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-unique \ + --enable-addons ./waf build ./waf install --destdir=$PKG -# Standard autotools available, too. -#./autogen.sh -#CFLAGS="$SLKCFLAGS" \ -#CXXFLAGS="$SLKCFLAGS" \ -#./configure \ -# --prefix=/usr \ -# --libdir=/usr/lib \ -# || exit 1 - -#make || exit 1 -#make install-strip DESTDIR=$PKG || exit 1 +# 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 -# Docs -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/midori.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/midori.SlackBuild +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM ) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/midori/midori.info b/network/midori/midori.info index 7d7cae408a..f17885c214 100644 --- a/network/midori/midori.info +++ b/network/midori/midori.info @@ -1,8 +1,10 @@ PRGNAM="midori" -VERSION="0.1.1" -HOMEPAGE="http://software.twotoasts.de/?page=midori" -DOWNLOAD="http://goodies.xfce.org/releases/midori/midori-0.1.1.tar.bz2" -MD5SUM="801cb2debb7b60a8c2525a237e37fa18" -MAINTAINER="alkos333" -EMAIL="me@alkos333.net" +VERSION="0.2.2" +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_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Pierre Cazemave" +EMAIL="pwcazenave <at> gmail <dot> com" APPROVED="Erik Hanson" diff --git a/network/midori/slack-desc b/network/midori/slack-desc index 71b68f1857..3fc10e812c 100644 --- a/network/midori/slack-desc +++ b/network/midori/slack-desc @@ -12,7 +12,7 @@ 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 midori: midori: midori: |