diff options
| -rw-r--r-- | network/midori/README | 10 | ||||
| -rw-r--r-- | network/midori/doinst.sh | 16 | ||||
| -rw-r--r-- | network/midori/midori.SlackBuild | 47 | ||||
| -rw-r--r-- | network/midori/midori.info | 10 | ||||
| -rw-r--r-- | network/midori/slack-desc | 6 |
5 files changed, 24 insertions, 65 deletions
diff --git a/network/midori/README b/network/midori/README index 16ec7ed18a..d8f163a4e0 100644 --- a/network/midori/README +++ b/network/midori/README @@ -1,7 +1,7 @@ Midori is a lightweight, webkit-based web browser. Features: - * Full integration with GTK+2 + * Full integration with GTK+3 * Fast rendering with WebKit * Tabs, windows and session management * Flexibly configurable Web Search. @@ -10,11 +10,3 @@ 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 webkitgtk3 and libunique3 (instead of webkitgtk -and libunique) are required. diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh index 8505e6eaff..4a25de5e6f 100644 --- a/network/midori/doinst.sh +++ b/network/midori/doinst.sh @@ -1,19 +1,3 @@ -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/xdg/midori/extensions/adblock/config.new - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index 99efa991c7..8aeed3e3ed 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -5,7 +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-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # # All rights reserved. # @@ -27,7 +27,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=midori -VERSION=${VERSION:-0.5.11} +SRCNAM=core +VERSION=${VERSION:-9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,22 +62,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="ON" -else - ENABLE_GTK3="OFF" -fi - set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${VERSION}_all_.tar.?z* -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -87,30 +80,20 @@ find -L . \ 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" \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG + -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DVALA_CFLAGS="$SLKCFLAGS" \ + -G Ninja \ + .. + ninja + DESTDIR=$PKG ninja install 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 docs have been taken care by make install +rm -fR $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a HACKING TODO TRANSLATE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/midori/midori.info b/network/midori/midori.info index a2abab3152..516e7ec757 100644 --- a/network/midori/midori.info +++ b/network/midori/midori.info @@ -1,10 +1,10 @@ PRGNAM="midori" -VERSION="0.5.11" -HOMEPAGE="http://midori-browser.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/midori_0.5.11_all_.tar.bz2" -MD5SUM="fcc03ef759fce4fe9f2446d9da4a065e" +VERSION="9.0" +HOMEPAGE="https://midori-browser.org/" +DOWNLOAD="https://github.com/midori-browser/core/archive/v9.0/midori-9.0.tar.gz" +MD5SUM="b39172aeb754e666f044d69828f82bcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="vala webkit2gtk" +REQUIRES="libpeas webkit2gtk" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/network/midori/slack-desc b/network/midori/slack-desc index bddbb483ce..15edff5601 100644 --- a/network/midori/slack-desc +++ b/network/midori/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| midori: midori (simple web-browser) midori: -midori: midori is a simple web-browser, based on the webkit framework. +midori: midori is a simple web-browser, based on the webkit framework +midori: and gtk+3. midori: +midori: Homepage: https://midori-browser.org midori: midori: -midori: Homepage: http://midori-browser.org/ -midori: midori: midori: midori: |