From 3e4cf418a57ba9767614862154e4c6f2be374f29 Mon Sep 17 00:00:00 2001
From: "alan.aveNOrsaSP@AMcox.net" <alan.aveNOrsaSP@AMcox.net>
Date: Wed, 4 Sep 2024 07:51:55 +0700
Subject: [PATCH] ham/CubicSDR: Update dependency.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 ham/CubicSDR/CubicSDR.SlackBuild | 44 --------------------------------
 ham/CubicSDR/CubicSDR.info       |  8 +++---
 2 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/ham/CubicSDR/CubicSDR.SlackBuild b/ham/CubicSDR/CubicSDR.SlackBuild
index 9370235c5c..a6427fbb37 100644
--- a/ham/CubicSDR/CubicSDR.SlackBuild
+++ b/ham/CubicSDR/CubicSDR.SlackBuild
@@ -73,49 +73,6 @@ rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-# static wxWidgets
-
-STATICWXWIDGETS_DESTDIR=$TMP/$PRGNAM-$VERSION/wxWidgets-staticlib
-mkdir -p $STATICWXWIDGETS_DESTDIR
-
-VERWXWIDGETS=${VERWXWIDGETS:-3.1.5}
-
-tar xvf $CWD/wxWidgets-$VERWXWIDGETS.tar.bz2
-cd wxWidgets-$VERWXWIDGETS
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-  ./autogen.sh
-
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS -std=c++0x" \
-  ./configure \
-    --with-opengl \
-    --disable-shared \
-    --enable-monolithic \
-    --with-libjpeg \
-    --with-libtiff \
-    --with-libpng \
-    --with-zlib \
-    --disable-sdltest \
-    --enable-unicode \
-    --enable-display \
-    --enable-propgrid \
-    --disable-webview \
-    --disable-webviewwebkit \
-    --prefix="$STATICWXWIDGETS_DESTDIR"
-
-  make
-  make install
-
-cd ..
-
-# build CubicSDR
-
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -132,7 +89,6 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DwxWidgets_CONFIG_EXECUTABLE=$STATICWXWIDGETS_DESTDIR/bin/wx-config \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/ham/CubicSDR/CubicSDR.info b/ham/CubicSDR/CubicSDR.info
index df7d9a9b34..a1156865bf 100644
--- a/ham/CubicSDR/CubicSDR.info
+++ b/ham/CubicSDR/CubicSDR.info
@@ -1,12 +1,10 @@
 PRGNAM="CubicSDR"
 VERSION="0.2.7"
 HOMEPAGE="https://github.com/cjcliffe/CubicSDR/"
-DOWNLOAD="https://github.com/cjcliffe/CubicSDR/archive/0.2.7/CubicSDR-0.2.7.tar.gz \
-          https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxWidgets-3.1.5.tar.bz2"
-MD5SUM="6e4cfeab14d9ec54daaed6079a5312ae \
-        8b2ac42364a02bb5f3df22e1b1a517e5"
+DOWNLOAD="https://github.com/cjcliffe/CubicSDR/archive/0.2.7/CubicSDR-0.2.7.tar.gz"
+MD5SUM="6e4cfeab14d9ec54daaed6079a5312ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SoapySDR liquid-dsp"
+REQUIRES="SoapySDR liquid-dsp wxWidgets"
 MAINTAINER="Alan Aversa"
 EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"