From bd0c0592a627608f51ac8eaf5b50c9e25dda9242 Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Tue, 22 Feb 2022 17:49:48 +1300
Subject: ham/svxlink: Fix github tarball handling.

Drop already applied upstream patch.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 ham/svxlink/gcc6.patch         | 23 -----------------------
 ham/svxlink/svxlink.SlackBuild |  5 +----
 ham/svxlink/svxlink.info       |  2 +-
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 ham/svxlink/gcc6.patch

(limited to 'ham')

diff --git a/ham/svxlink/gcc6.patch b/ham/svxlink/gcc6.patch
deleted file mode 100644
index 3d01b118ae..0000000000
--- a/ham/svxlink/gcc6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 611cc5cc134f710f94fc8987375259bd8af34604 Mon Sep 17 00:00:00 2001
-From: Tobias Blomberg <git@sm0svx.shacknet.nu>
-Date: Mon, 19 Jun 2017 22:04:20 +0200
-Subject: [PATCH] Fix compilation problem in Async::AudioDeviceAlsa
-
-- On newer compilers the compilation would fail on ambiguous call to abs
----
- src/async/audio/AsyncAudioDeviceAlsa.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/async/audio/AsyncAudioDeviceAlsa.cpp b/src/async/audio/AsyncAudioDeviceAlsa.cpp
-index 17d255e8..15d760d5 100644
---- a/src/async/audio/AsyncAudioDeviceAlsa.cpp
-+++ b/src/async/audio/AsyncAudioDeviceAlsa.cpp
-@@ -548,7 +548,7 @@ bool AudioDeviceAlsa::initParams(snd_pcm_t *pcm_handle)
-     return false;
-   }
- 
--  if (::abs(real_rate - sample_rate) > 100)
-+  if (::abs(static_cast<int>(real_rate) - sample_rate) > 100)
-   {
-     cerr << "*** ERROR: The sample rate could not be set to "
-          << sample_rate << "Hz for ALSA device \"" << dev_name << "\". "
diff --git a/ham/svxlink/svxlink.SlackBuild b/ham/svxlink/svxlink.SlackBuild
index d9972ea44f..8dc2402d42 100644
--- a/ham/svxlink/svxlink.SlackBuild
+++ b/ham/svxlink/svxlink.SlackBuild
@@ -103,7 +103,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
 # the Github download unpacks several directories, we only need src
 # We will download a larger file but I think it's better this way
@@ -117,9 +117,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 {} \;
 
-# From upstream
-patch -p2 < $CWD/gcc6.patch
-
 mkdir -p build
 cd build
   cmake \
diff --git a/ham/svxlink/svxlink.info b/ham/svxlink/svxlink.info
index d576ee045d..507483905e 100644
--- a/ham/svxlink/svxlink.info
+++ b/ham/svxlink/svxlink.info
@@ -1,7 +1,7 @@
 PRGNAM="svxlink"
 VERSION="19.09.1"
 HOMEPAGE="http://www.svxlink.org/"
-DOWNLOAD="https://github.com/sm0svx/svxlink/archive/19.09.1.tar.gz"
+DOWNLOAD="https://github.com/sm0svx/svxlink/archive/svxlink-19.09.1.tar.gz"
 MD5SUM="e96920b98ef80f07c98648daa8363cf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3-80-g2a13