summaryrefslogtreecommitdiffstats
path: root/ham
diff options
context:
space:
mode:
author Matteo Bernardini2020-01-03 23:09:25 +0100
committer Matteo Bernardini2020-01-03 23:09:25 +0100
commit95008285045d7130c028d6755dcc2bae5387cb22 (patch)
tree65f9ab22c4711d52dbe2d3a77112b00e4a8e051d /ham
parent66bb71ec178eb531b8a07c19457800341c8f0d9f (diff)
downloadslackbuilds-current-20200103.1.tar.gz
20200103.1 global branch merge.current-20200103.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'ham')
-rw-r--r--ham/fldigi/fldigi.SlackBuild2
-rw-r--r--ham/soundmodem/soundmodem.SlackBuild2
-rw-r--r--ham/svxlink/gcc6.patch23
-rw-r--r--ham/svxlink/svxlink.SlackBuild5
4 files changed, 29 insertions, 3 deletions
diff --git a/ham/fldigi/fldigi.SlackBuild b/ham/fldigi/fldigi.SlackBuild
index b45d7c3250..b0aafdefae 100644
--- a/ham/fldigi/fldigi.SlackBuild
+++ b/ham/fldigi/fldigi.SlackBuild
@@ -68,7 +68,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/ham/soundmodem/soundmodem.SlackBuild b/ham/soundmodem/soundmodem.SlackBuild
index 4f724fcbb9..17a2e7fdfc 100644
--- a/ham/soundmodem/soundmodem.SlackBuild
+++ b/ham/soundmodem/soundmodem.SlackBuild
@@ -64,7 +64,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS -fgnu89-inline" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/ham/svxlink/gcc6.patch b/ham/svxlink/gcc6.patch
new file mode 100644
index 0000000000..3d01b118ae
--- /dev/null
+++ b/ham/svxlink/gcc6.patch
@@ -0,0 +1,23 @@
+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 486723dbbc..b1165941f3 100644
--- a/ham/svxlink/svxlink.SlackBuild
+++ b/ham/svxlink/svxlink.SlackBuild
@@ -107,12 +107,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 {} \;
+# From upstream
+patch -p2 < $CWD/gcc6.patch
+
mkdir -p build
cd build
cmake \
$BUILD_QTEL \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DLOCAL_STATE_DIR=/var \