From 859074d1e59a25ba5c6c0847c7426040fa49c03f Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 1 Feb 2020 11:30:01 +0100
Subject: 20200201.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 desktop/yad/yad.SlackBuild | 18 ++++++++++++------
 desktop/yad/yad.info       |  8 ++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'desktop/yad')

diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild
index 0b08f08e7a..d96ebb91ee 100644
--- a/desktop/yad/yad.SlackBuild
+++ b/desktop/yad/yad.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for yad
 
 # Copyright 2010-2014 Charles <SlackBuilds@catcons.co.uk>
-# Copyright 2015-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yad
-VERSION=${VERSION:-0.40.0}
+VERSION=${VERSION:-4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,8 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-GTK=${GTK:-2}
-if pkg-config --exists webkit-1.0 ; then HTML="--enable-html" ; else HTML="" ; fi
+if pkg-config --exists webkit2gtk-4.0 ; then HTML="--enable-html" ; else HTML="" ; fi
+if pkg-config --exists gtksourceview-3.0 ; then SOURCEVIEW="--enable-sourceview" ; else SOURCEVIEW="" ; fi
 
 set -e
 
@@ -73,6 +73,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+autoreconf -vif
+intltoolize
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,8 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-rgb=/usr/share/X11/rgb.txt \
   --enable-icon-browser \
-  --with-gtk=gtk$GTK \
+  --enable-pfd \
+  --enable-tray \
+  --enable-spell \
   $HTML \
+  $SOURCEVIEW \
   --build=$ARCH-slackware-linux
 
 make
@@ -95,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/yad/yad.info b/desktop/yad/yad.info
index a5a5b9d17e..2498c778cb 100644
--- a/desktop/yad/yad.info
+++ b/desktop/yad/yad.info
@@ -1,8 +1,8 @@
 PRGNAM="yad"
-VERSION="0.40.0"
-HOMEPAGE="https://sourceforge.net/projects/yad-dialog/"
-DOWNLOAD="https://downloads.sf.net/yad-dialog/yad-0.40.0.tar.xz"
-MD5SUM="82d458a2e1695dd0709f71ad26109812"
+VERSION="4.1"
+HOMEPAGE="https://github.com/v1cont/yad/"
+DOWNLOAD="https://github.com/v1cont/yad/archive/4.1/yad-4.1.tar.gz"
+MD5SUM="8b16119570fb03e3804bb6b33108eb9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3