From 2fba1c878b57d3afa631b9369518be5d21221c09 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 27 Mar 2021 10:25:10 +0100
Subject: 20210327.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 network/midori/midori.SlackBuild | 47 +++++++++++++---------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

(limited to 'network/midori/midori.SlackBuild')

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
-- 
cgit v1.2.3