From 006518d2484b7a792ad5fe777f0dc3a4f45a36eb Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Sat, 10 Feb 2018 20:19:56 -0600 Subject: network/lxi-tools: Updated for version 1.18. Signed-off-by: Nate Bargmann Signed-off-by: Willy Sudiarto Raharjo --- network/lxi-tools/README | 3 +++ network/lxi-tools/doinst.sh | 3 +++ network/lxi-tools/lxi-gui.desktop | 11 ++++++++++ network/lxi-tools/lxi-tools.SlackBuild | 24 ++++++++++++++++++++-- network/lxi-tools/lxi-tools.info | 6 +++--- network/lxi-tools/slack-desc | 4 ++-- network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff | 19 +++++++++++++++++ 7 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 network/lxi-tools/doinst.sh create mode 100644 network/lxi-tools/lxi-gui.desktop create mode 100644 network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff (limited to 'network') diff --git a/network/lxi-tools/README b/network/lxi-tools/README index a42359ddde..e3b0dedfd9 100644 --- a/network/lxi-tools/README +++ b/network/lxi-tools/README @@ -5,3 +5,6 @@ spectrum analyzers etc. All features are consolidated in the 'lxi' application which provides a simple commandline interface to discover LXI instruments, send SCPI commands, and capture screenshots from supported LXI instruments. + +The lxi-tools package now features an optional GUI that requires the qt5 +package. Enable it with: GUI=yes ./lxi-tools.SlackBuild diff --git a/network/lxi-tools/doinst.sh b/network/lxi-tools/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/network/lxi-tools/doinst.sh @@ -0,0 +1,3 @@ +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/lxi-tools/lxi-gui.desktop b/network/lxi-tools/lxi-gui.desktop new file mode 100644 index 0000000000..fb17ad31d9 --- /dev/null +++ b/network/lxi-tools/lxi-gui.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.18 +Name=LXI-GUI +Comment=LAN eXtensions for Instrumentation GUI +Exec=lxi-gui +Icon=lxi-tools +Terminal=false +X-MultipleArgs=false +Type=Application +Categories=Network +StartupNotify=true diff --git a/network/lxi-tools/lxi-tools.SlackBuild b/network/lxi-tools/lxi-tools.SlackBuild index e6e04c9ef7..84b8e45170 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.16} +VERSION=${VERSION:-1.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,6 +40,12 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "${GUI:-no}" = "no" ]; then + BUILD_GUI="--disable-lxi-gui" +else + BUILD_GUI="--enable-lxi-gui" +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -69,12 +75,18 @@ 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 {} \; +if [ x"${GUI}" = "xyes" ]; then + patch -p1 --verbose < $CWD/src_gui_lxi-gui_Makefile.am.diff + autoreconf --force -v --install +fi + LIBS="-lncurses" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux \ + $BUILD_GUI make make install DESTDIR=$PKG @@ -92,5 +104,13 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +if [ x"${GUI}" = "xyes" ]; then + mkdir -p $PKG/usr/share/applications + cp -a $CWD/lxi-gui.desktop $PKG/usr/share/applications + mkdir -p $PKG/usr/share/pixmaps + convert src/gui/lxi-gui/lxi-tools_256x256.png -resize 48x48 $PKG/usr/share/pixmaps/lxi-tools.png + cat $CWD/doinst.sh > $PKG/install/doinst.sh +fi + cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/lxi-tools/lxi-tools.info b/network/lxi-tools/lxi-tools.info index 31536eba35..08e42c6da8 100644 --- a/network/lxi-tools/lxi-tools.info +++ b/network/lxi-tools/lxi-tools.info @@ -1,8 +1,8 @@ PRGNAM="lxi-tools" -VERSION="1.16" +VERSION="1.18" HOMEPAGE="https://lxi-tools.github.io/" -DOWNLOAD="https://github.com/lxi-tools/lxi-tools/releases/download/v1.16/lxi-tools-1.16.tar.xz" -MD5SUM="9ed03fb08abcf69aad631cda76bcbc12" +DOWNLOAD="https://github.com/lxi-tools/lxi-tools/releases/download/v1.18/lxi-tools-1.18.tar.xz" +MD5SUM="dc0925d98c7533d891b64cb5b43aab35" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="liblxi" diff --git a/network/lxi-tools/slack-desc b/network/lxi-tools/slack-desc index a566eb8ab2..af2e1e30a9 100644 --- a/network/lxi-tools/slack-desc +++ b/network/lxi-tools/slack-desc @@ -15,5 +15,5 @@ lxi-tools: lxi-tools: All features are consolidated in the 'lxi' application which provides lxi-tools: a simple commandline interface to discover LXI instruments, send lxi-tools: SCPI commands, and capture screenshots from supported LXI -lxi-tools: instruments. -lxi-tools: +lxi-tools: instruments. An optional GUI is now available that provides a Qt5 +lxi-tools: based interface to these functions. diff --git a/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff b/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff new file mode 100644 index 0000000000..5ccf5b2721 --- /dev/null +++ b/network/lxi-tools/src_gui_lxi-gui_Makefile.am.diff @@ -0,0 +1,19 @@ +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 + + Makefile.qmake: lxi-gui.pro +- $(QTCHOOSER) -run-tool=qmake -qt=5 -makefile -o Makefile.qmake lxi-gui.pro \ ++ $(QMAKE) -makefile -o Makefile.qmake lxi-gui.pro \ + INCDIR="$(SNAPCRAFT_STAGE)/$(includedir)" \ + 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