ham/linpsk: Updated for version 1.3.5.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 59 insertions, 16 deletions

diff --git a/ham/linpsk/linpsk.SlackBuild b/ham/linpsk/linpsk.SlackBuild
index 8b76e32d02..cf82250b9e 100644
--- a/ham/linpsk/linpsk.SlackBuild
+++ b/ham/linpsk/linpsk.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=linpsk
-VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tgz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -77,17 +77,15 @@ 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 {} \;
 
-qmake -o Makefile linpsk.pro
-make
-
-mkdir -p $PKG/usr/bin
-install -m 755 bin/linpsk $PKG/usr/bin/
+# removes a few "comparison of pointer with integer zero" errors
+# and a missing Qt header
+patch -p1 <$CWD/pointer_null.patch
 
-mkdir -p $PKG/usr/share/applications
-install -m 644 $CWD/linpsk.desktop $PKG/usr/share/applications
+# Qt5's qmake errors out
+qmake-qt4 -o - linpsk.pro | sed "s,usr/local,usr,g" > Makefile
 
-mkdir -p $PKG/usr/share/pixmaps
-install -m 644 images/linpsk.png $PKG/usr/share/pixmaps
+make
+make install INSTALL_ROOT=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/ham/linpsk/linpsk.info b/ham/linpsk/linpsk.info
index 69a2bbd4d6..5da1fcb56b 100644
--- a/ham/linpsk/linpsk.info
+++ b/ham/linpsk/linpsk.info
@@ -1,10 +1,10 @@
 PRGNAM="linpsk"
-VERSION="1.2"
+VERSION="1.3.5"
 HOMEPAGE="http://linpsk.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/linpsk/linpsk-1.2.tgz"
-MD5SUM="674c783fd772a532a7b8a107ae69ec1e"
+DOWNLOAD="https://downloads.sourceforge.net/project/linpsk/linpsk/linpsk-1.3.5.tar.gz"
+MD5SUM="f0ec386f2e06d800c278e4ee28fd5eba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="JK Wood"
 EMAIL="joshuakwood@gmail.com"
diff --git a/ham/linpsk/pointer_null.patch b/ham/linpsk/pointer_null.patch
new file mode 100644
index 0000000000..7c3da4c821
--- /dev/null
+++ b/ham/linpsk/pointer_null.patch
@@ -0,0 +1,45 @@
+diff -Naur a/gui/crxdisplay.cpp b/gui/crxdisplay.cpp
+--- a/gui/crxdisplay.cpp	2017-02-07 15:10:47.000000000 +0000
++++ b/gui/crxdisplay.cpp	2022-02-13 12:27:01.631479349 +0000
+@@ -78,7 +78,7 @@
+         Sound = new WaveInput ( -1 );
+     else
+       Sound = new CSound ( settings.serial );
+-    if ( Sound <= NULL )
++    if ( Sound <= (void *) NULL )
+       return false;
+ 
+     connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_rxdata() ) );
+diff -Naur a/gui/linpsk.cpp b/gui/linpsk.cpp
+--- a/gui/linpsk.cpp	2017-02-07 15:10:47.000000000 +0000
++++ b/gui/linpsk.cpp	2022-02-13 12:28:37.937992591 +0000
+@@ -410,7 +410,7 @@
+       Modulator = new BpskModulator ( 11025, Frequency, TxBuffer );
+       break; */
+   }
+-  if ( Sound <= NULL ) // Only create Sound Device once for output
++  if ( Sound <= (void *) NULL ) // Only create Sound Device once for output
+   {
+     if ( settings.DemoMode )
+     {
+@@ -421,7 +421,7 @@
+       Sound = new CSound ( settings.serial );
+     connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_txdata() ) );
+   }
+-  if ( Sound <= NULL )
++  if ( Sound <= (void *) NULL )
+   {
+     QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" );
+     TxDisplay->TxFunctions->setStatus ( ON );
+diff -Naur a/gui/modemenu.cpp b/gui/modemenu.cpp
+--- a/gui/modemenu.cpp	2017-02-07 15:10:47.000000000 +0000
++++ b/gui/modemenu.cpp	2022-02-13 12:45:09.832995118 +0000
+@@ -18,7 +18,7 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
+-
++#include <QButtonGroup>
+ #include "modemenu.h"
+ #include "parameter.h"
+ #include "crxchannel.h"