From b52c56d04b3d102e2b2262367f5a054bbb5badb7 Mon Sep 17 00:00:00 2001
From: Nate Bargmann <n0nb@arrl.net>
Date: Sun, 18 Mar 2018 12:44:58 -0500
Subject: network/lxi-tools: Updated for version 1.19

Signed-off-by: Nate Bargmann <n0nb@arrl.net>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/lxi-tools/configure.ac.diff                | 14 ++++++++++++++
 network/lxi-tools/lxi-tools.SlackBuild             |  7 +++++--
 network/lxi-tools/lxi-tools.info                   |  8 ++++----
 network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff | 20 +++++++++-----------
 4 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 network/lxi-tools/configure.ac.diff

(limited to 'network')

diff --git a/network/lxi-tools/configure.ac.diff b/network/lxi-tools/configure.ac.diff
new file mode 100644
index 0000000000..5ab256e8e2
--- /dev/null
+++ b/network/lxi-tools/configure.ac.diff
@@ -0,0 +1,14 @@
+diff -Nur lxi-tools-1.19.orig/configure.ac lxi-tools-1.19/configure.ac > configure.ac.diff
+--- lxi-tools-1.19.orig/configure.ac	2018-03-10 18:54:41.000000000 -0600
++++ lxi-tools-1.19/configure.ac	2018-03-18 07:21:43.825850367 -0500
+@@ -14,8 +14,8 @@
+ AC_CHECK_LIB([readline], [readline], [], [AC_MSG_ERROR(libreadline not found)])
+ AC_CHECK_LIB([lxi], [lxi_connect], [], [AC_MSG_ERROR(liblxi not found)])
+ 
+-# Check for Lua 5.2
+-PKG_CHECK_MODULES([lua], [lua5.2])
++# Check for Lua 5.1 or newer
++PKG_CHECK_MODULES([lua], [lua >= 5.1])
+ 
+ # Handle bash completion
+ AC_ARG_WITH([bash-completion-dir],
diff --git a/network/lxi-tools/lxi-tools.SlackBuild b/network/lxi-tools/lxi-tools.SlackBuild
index 84b8e45170..5d6ac937d3 100644
--- a/network/lxi-tools/lxi-tools.SlackBuild
+++ b/network/lxi-tools/lxi-tools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lxi-tools
-VERSION=${VERSION:-1.18}
+VERSION=${VERSION:-1.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,11 +75,14 @@ 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 {} \;
 
+patch -p1 --verbose < $CWD/configure.ac.diff
+
 if [ x"${GUI}" = "xyes" ]; then
     patch -p1 --verbose < $CWD/src_gui_lxi-gui_Makefile.am.diff
-    autoreconf --force -v --install
 fi
 
+autoreconf --force -v --install
+
 LIBS="-lncurses" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/lxi-tools/lxi-tools.info b/network/lxi-tools/lxi-tools.info
index 08e42c6da8..61633da0e9 100644
--- a/network/lxi-tools/lxi-tools.info
+++ b/network/lxi-tools/lxi-tools.info
@@ -1,10 +1,10 @@
 PRGNAM="lxi-tools"
-VERSION="1.18"
+VERSION="1.19"
 HOMEPAGE="https://lxi-tools.github.io/"
-DOWNLOAD="https://github.com/lxi-tools/lxi-tools/releases/download/v1.18/lxi-tools-1.18.tar.xz"
-MD5SUM="dc0925d98c7533d891b64cb5b43aab35"
+DOWNLOAD="https://github.com/lxi-tools/lxi-tools/releases/download/v1.19/lxi-tools-1.19.tar.xz"
+MD5SUM="89c36a7aec17c1a5c020fba178cc141d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="liblxi"
+REQUIRES="liblxi lua"
 MAINTAINER="Nate Bargmann"
 EMAIL="n0nb@arrl.net"
diff --git a/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff b/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff
index 5ccf5b2721..777aec22cd 100644
--- a/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff
+++ b/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff
@@ -1,19 +1,17 @@
-diff -Nur lxi-tools-1.18.orig/src/gui/lxi-gui/Makefile.am lxi-tools-1.18/src/gui/lxi-gui/Makefile.am > src_gui_lxi-gui_Makefile.am.diff
---- lxi-tools-1.18.orig/src/gui/lxi-gui/Makefile.am	2018-01-29 20:02:39.000000000 -0600
-+++ lxi-tools-1.18/src/gui/lxi-gui/Makefile.am	2018-02-10 08:09:20.049138969 -0600
-@@ -11,12 +11,13 @@
-              workerthread.h
-
+--- lxi-tools-1.19.orig/src/gui/lxi-gui/Makefile.am	2018-02-08 17:12:32.000000000 -0600
++++ lxi-tools-1.19/src/gui/lxi-gui/Makefile.am	2018-03-18 07:57:42.523615101 -0500
+@@ -13,11 +13,12 @@
+ QT_SELECT ?= 5
+ 
  Makefile.qmake: lxi-gui.pro
--	$(QTCHOOSER) -run-tool=qmake -qt=5 -makefile -o Makefile.qmake lxi-gui.pro \
+-	$(QTCHOOSER) -run-tool=qmake -qt=$(QT_SELECT) -makefile -o Makefile.qmake lxi-gui.pro \
 +	$(QMAKE) -makefile -o Makefile.qmake lxi-gui.pro \
- 		INCDIR="$(SNAPCRAFT_STAGE)/$(includedir)" \
- 		LIBDIR="$(SNAPCRAFT_STAGE)/$(libdir)" \
+ 		QT_INCDIR="$(SNAPCRAFT_STAGE)/$(includedir)" \
+ 		QT_LIBDIR="$(SNAPCRAFT_STAGE)/$(libdir)" \
  		SNAPCRAFT="$(SNAPCRAFT)" \
- 		SNAPCRAFT_STAGE="$(SNAPCRAFT_STAGE)" \
 -		$(QMAKE_ARGUMENTS)
 +		$(QMAKE_ARGUMENTS) \
 +		LIBS="-lncurses"
-
+ 
  all-local: Makefile.qmake
  	$(MAKE) -f Makefile.qmake $(AM_MAKEFLAGS) all
-- 
cgit v1.2.3