ham/xdemorse: Updated for 3.6.5. i486->i586. Fix README.

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

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

4 files changed, 14 insertions, 29 deletions

diff --git a/ham/xdemorse/README b/ham/xdemorse/README
index 4b28e41987..5c0a4e6232 100644
--- a/ham/xdemorse/README
+++ b/ham/xdemorse/README
@@ -1,7 +1,7 @@
-xdemorse is a GTK+ based Morse code signal decoder. It has an 
-integer-arithmetic FFT-derived "waterfall" display of the incoming 
-audio signal's spectrum, as well as a 'scope-like display of the 
-audio detector's output and status of the mark/space discriminator 
-("slicer"). xdemorse also has CAT for the FT847 and FT857 and 
-this can be used to net the receiver's frequency to the incoming 
+xdemorse is a GTK+ based Morse code signal decoder. It has an
+integer-arithmetic FFT-derived "waterfall" display of the incoming
+audio signal's spectrum, as well as a 'scope-like display of the
+audio detector's output and status of the mark/space discriminator
+("slicer"). xdemorse also has CAT for the FT847 and FT857 and
+this can be used to net the receiver's frequency to the incoming
 signal, by clicking near its trace in the waterfall display.
diff --git a/ham/xdemorse/xdemorse.SlackBuild b/ham/xdemorse/xdemorse.SlackBuild
index df92b66a11..01c902a56a 100644
--- a/ham/xdemorse/xdemorse.SlackBuild
+++ b/ham/xdemorse/xdemorse.SlackBuild
@@ -23,14 +23,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xdemorse
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,8 +48,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar -xvf $CWD/${PRGNAM}_$VERSION.orig.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -77,9 +77,6 @@ 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 {} \;
 
-# Fixup desktop file a tad
-patch -p1 < $CWD/xdemorse.desktop.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/ham/xdemorse/xdemorse.desktop.patch b/ham/xdemorse/xdemorse.desktop.patch
deleted file mode 100644
index 6a2667bef7..0000000000
--- a/ham/xdemorse/xdemorse.desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xdemorse-3.0.1/files/xdemorse.desktop xdemorse-3.0.1.patched/files/xdemorse.desktop
---- xdemorse-3.0.1/files/xdemorse.desktop	2014-03-06 00:47:02.000000000 -0500
-+++ xdemorse-3.0.1.patched/files/xdemorse.desktop	2020-01-17 11:03:18.745024631 -0500
-@@ -4,6 +4,6 @@
- Comment=Decode Morse signals to Text
- Exec=xdemorse
- Type=Application
--Icon=xdemorse.xpm
--Categories=Audio
-+Icon=/usr/share/pixmaps/xdemorse.xpm
-+Categories=AudioVideo;Audio;HamRadio;
- Keywords=hamradio;amateur;radio;morse;code;gtk;signal
diff --git a/ham/xdemorse/xdemorse.info b/ham/xdemorse/xdemorse.info
index 597532d2b4..f630a15f10 100644
--- a/ham/xdemorse/xdemorse.info
+++ b/ham/xdemorse/xdemorse.info
@@ -1,8 +1,8 @@
 PRGNAM="xdemorse"
-VERSION="3.0.1"
+VERSION="3.6.5"
 HOMEPAGE="https://www.qsl.net/5b4az/"
-DOWNLOAD="https://www.qsl.net/5b4az/pkg/morse/xdemorse/xdemorse-3.0.1.tar.bz2"
-MD5SUM="f1460c60df73ae9a7bc5bd8f71cf263c"
+DOWNLOAD="http://ftp.debian.org/debian/pool/main/x/xdemorse/xdemorse_3.6.5.orig.tar.bz2"
+MD5SUM="be235ea4af07c3b77443937e484cc402"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""