diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2013-12-17 00:31:58 +0700 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2013-12-17 11:00:45 -0600 |
| commit | 9bc3ea0fdbfff707d1bf447c761a6a0208ff2372 (patch) | |
| tree | afc63980dd15866a55ced468aff9b74afa9949e3 | |
| parent | 0a57c024b4de1522397670b6b38436a17b771db8 (diff) | |
| download | slackbuilds-9bc3ea0fdbfff707d1bf447c761a6a0208ff2372.tar.gz | |
network/midori: Updated for version 0.5.6.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | network/midori/midori.SlackBuild | 43 | ||||
| -rw-r--r-- | network/midori/midori.info | 10 |
2 files changed, 26 insertions, 27 deletions
diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index e8b39343ae..ad9ad72577 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -5,6 +5,7 @@ # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com> # Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # Copyright 2012-2013 Roberto Neri, Palermo, Italy +# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # # All rights reserved. # @@ -26,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=midori -VERSION=${VERSION:-0.5.5} +VERSION=${VERSION:-0.5.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,9 +64,9 @@ 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" + ENABLE_GTK3="ON" else - ENABLE_GTK3="disable" + ENABLE_GTK3="OFF" fi set -eu @@ -76,7 +77,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/${PRGNAM}_${VERSION}_all_.tar.?z* cd $PRGNAM-$VERSION - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -84,29 +84,28 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -export CCFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" - -./waf configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --datarootdir=/usr/share/ \ - --mandir=/usr/man \ - --$ENABLE_GTK3-gtk3 \ - --disable-zeitgeist - -./waf build -./waf install --destdir=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DDATADIR=/usr/share/$PRGNAM \ + -DUSE_ZEITGEIST=OFF \ + -DUSE_GTK3="$ENABLE_GTK3" \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. # Don't clobber existing configs 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" +# The other docs have been taken care by make install +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a HACKING 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 deee3066df..ff99dbe52d 100644 --- a/network/midori/midori.info +++ b/network/midori/midori.info @@ -1,10 +1,10 @@ PRGNAM="midori" -VERSION="0.5.5" +VERSION="0.5.6" HOMEPAGE="http://midori-browser.org/" -DOWNLOAD="http://www.midori-browser.org/downloads/midori_0.5.5_all_.tar.bz2" -MD5SUM="b99e87d4b73a4732ed1c1e591f0242ac" +DOWNLOAD="http://www.midori-browser.org/downloads/midori_0.5.6_all_.tar.bz2" +MD5SUM="62ee86eb103b74efe71d40e343120a3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunique vala webkitgtk" -MAINTAINER="Roberto Neri" -EMAIL="rneri@libero.it" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" |