From 582158df37d29cb735148e643906359a825214a6 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 20 Oct 2023 12:51:11 -0500 Subject: [PATCH 01/26] update for chirp-next --- app/stable/pi/CHIRP.bapp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/stable/pi/CHIRP.bapp b/app/stable/pi/CHIRP.bapp index 951e150..ee4b0b9 100644 --- a/app/stable/pi/CHIRP.bapp +++ b/app/stable/pi/CHIRP.bapp @@ -14,16 +14,16 @@ INSTALL(){ #determine if 32/64 bit and set download link accordingly. issue #382 if [ `getconf LONG_BIT` = '32' ]; then - LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-armhf.AppImage" + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-next-$CHIRPDATE-armhf.AppImage" else - LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-aarch64.AppImage" + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-next-$CHIRPDATE-aarch64.AppImage" fi wget --tries 2 --connect-timeout=60 $LINK - CHIRP=$(ls | grep Chirp-daily) + CHIRP=$(ls | grep Chirp-next) sudo mv $CHIRP /usr/local/bin/chirp sudo chmod +x /usr/local/bin/chirp From bd3604bfa7de4adff517fbffe165a4d7b78b888a Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 20 Oct 2023 12:51:30 -0500 Subject: [PATCH 02/26] update for chirp-next --- app/stable/x86_64/CHIRP.bapp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/stable/x86_64/CHIRP.bapp b/app/stable/x86_64/CHIRP.bapp index d870ba9..792aa42 100755 --- a/app/stable/x86_64/CHIRP.bapp +++ b/app/stable/x86_64/CHIRP.bapp @@ -8,28 +8,29 @@ W3='https://chirp.danplanet.com/projects/chirp/wiki/Home' INSTALL(){ CUR_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" - - sudo -A apt install -y flatpak + sudo -A apt install python-wxtools -y cd ${BAPSRC} - LATEST=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ | grep flatpak | sed 's/.*href="//;s/">.*//' | head -1) - wget https://trac.chirp.danplanet.com/chirp_daily/LATEST/$LATEST - sudo -A flatpak install -y $LATEST + date=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//') + wheel=https://trac.chirp.danplanet.com/chirp_next/next-${date}/chirp-${date}-py3-none-any.whl + wget ${wheel} + pip install ${wheel} --force-reinstall + } REMOVE(){ - sudo flatpak uninstall -y chirp + pkg=$(ls ${BAPSRC} | grep chirp) + pip uninstall ${pkg} -y + cd ${BAPSRC} + rm ${pkg} } VERSION(){ - CHECK=$(flatpak list | grep chirp) - if [ -z "${CHECK}" ]; then + if ! hash chirp 2>/dev/null; then CURRENT=0 - NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ | - grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8) + NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//') else - CURRENT=$(flatpak run com.danplanet.chirp --version | awk '{print $2}' | sed 's/daily-//') - NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_daily/LATEST/ | - grep .tar.gz | awk -F 'chirp-daily-' '{print $2}' | head -c 8) + CURRENT=$(chirp --version | awk '{print $2}' | sed 's/next-//') + NEWVER=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//') fi } From 2895d08e0c7a90479f7a01b1820750ebb1803bb1 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 20 Oct 2023 12:51:37 -0500 Subject: [PATCH 03/26] update --- changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index a3345c5..2120eed 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,7 @@ -version=4.0.1 +version=4.0.2 +4.0.2 Update pi chirp to "next" version of chirp + Update x86 chrip to "next" version of chirp 4.0.1 Add build-essential to all builds add git install before running bapps add curl to all builds https://github.com/km4ack/73Linux/issues/28 From 67cc5cb614447fc7f025c7e10a3779dd636912c6 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 08:34:56 -0600 Subject: [PATCH 04/26] update path for wayland --- app/stable/pi/PAT.bapp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/stable/pi/PAT.bapp b/app/stable/pi/PAT.bapp index 1f56035..64e419b 100644 --- a/app/stable/pi/PAT.bapp +++ b/app/stable/pi/PAT.bapp @@ -40,8 +40,6 @@ INSTALL(){ #lines below configure pat with user info pat http & sudo killall pat - sed -i "s/\"mycall\": \".*\",/\"mycall\": \"${CALL}\",/" ${FIG} - sudo systemctl start pat@${WHO} sudo systemctl enable pat@${WHO} cd ${DIR} PAT_VERSION=$(pat version | awk '{print $2}' | sed 's/v0.//;s/.0//') @@ -54,7 +52,7 @@ INSTALL(){ FIG=$HOME/.wl2k/config.json else echo "pat version 12 or greater detected" - FIG=$XDG_CONFIG_HOME/pat/config.json + FIG=$HOME/.config/pat/config.json fi #set callsign sed -i "s/\"mycall\": \".*\",/\"mycall\": \"${CALL}\",/" ${FIG} @@ -73,6 +71,7 @@ INSTALL(){ jq '.hamlib_rigs = {'\"my-rig\"': {"address": "127.0.0.1:4532", "network": "tcp"}}' >~/Desktop/config.json mv ${HOME}/Desktop/config.json ${FIG} sed -i 's/"enable_http": false,/"enable_http": true,/' ${FIG} + sudo systemctl start pat@${WHO} if [ -f ${DIR}/config.json ]; then mv ${DIR}/config.json ${HOME}/.wl2k/ From f710bd4850db7f2aeba2311e883cecfb4bdffc4f Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 09:05:54 -0600 Subject: [PATCH 05/26] fix #50 --- app/stable/pi/PITERM.bapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/stable/pi/PITERM.bapp b/app/stable/pi/PITERM.bapp index 150a83c..433960d 100644 --- a/app/stable/pi/PITERM.bapp +++ b/app/stable/pi/PITERM.bapp @@ -14,7 +14,7 @@ INSTALL(){ else sudo dpkg --add-architecture armhf sudo apt update - sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf + sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf libqt5multimedia5:armhf fi wget --tries 2 --connect-timeout=60 https://www.cantab.net/users/john.wiseman/Downloads/Beta/piQtTermTCP sudo chmod +x piQtTermTCP From c05f49a9e80ca1270aadaeae7eeb3b4c7f1f059d Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 09:12:04 -0600 Subject: [PATCH 06/26] partial fix #48 --- app/stable/pi/EES.bapp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/stable/pi/EES.bapp b/app/stable/pi/EES.bapp index 6402e4b..221118b 100644 --- a/app/stable/pi/EES.bapp +++ b/app/stable/pi/EES.bapp @@ -9,8 +9,8 @@ localVer=0 INSTALL(){ #install PHP7.4 if not installed #this will also install apache2 - if ! hash php7.4 2>/dev/null; then - sudo apt install -y php7.4 + if ! hash php8.2 2>/dev/null; then + sudo apt install -y php8.2 fi #install ghostwriter if needed #this is used to mod the new index.html From 100167a8813b73646cd6126c3c7544e09dce4ee0 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 09:15:26 -0600 Subject: [PATCH 07/26] partial fix #48 --- app/stable/pi/TQSL.bapp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/stable/pi/TQSL.bapp b/app/stable/pi/TQSL.bapp index 2cc7ee4..64351ed 100644 --- a/app/stable/pi/TQSL.bapp +++ b/app/stable/pi/TQSL.bapp @@ -27,7 +27,7 @@ INSTALL(){ PACKAGE=tqsl CLEANSOURCE - sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.0-gtk3-dev + sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.2-dev cd ${BUILDDIR} || return CUR=$(curl -s http://www.arrl.org/tqsl-download | grep "for Linux" | sed 's/.*TQSL //' | awk '{print $1}') wget --tries 2 --connect-timeout=60 http://www.arrl.org/tqsl/tqsl-${CUR}.tar.gz @@ -38,7 +38,7 @@ INSTALL(){ make sudo make install sudo make clean - sudo cp ${BUILDDIR}/tqsl-${CUR}/apps/tqsl.desktop /usr/share/applications/ + } From ee675257cf4fe90814881da5e9e3157ac3d574ac Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 09:18:24 -0600 Subject: [PATCH 08/26] partial fix #48 --- app/stable/pi/XASTIR.bapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/stable/pi/XASTIR.bapp b/app/stable/pi/XASTIR.bapp index de43c64..1cd2c02 100644 --- a/app/stable/pi/XASTIR.bapp +++ b/app/stable/pi/XASTIR.bapp @@ -8,7 +8,7 @@ localVer=2.1.7 INSTALL(){ sudo apt-get -y install build-essential automake git xorg-dev libmotif-dev graphicsmagick \ - gv libcurl4-openssl-dev shapelib libshp-dev libpcre3-dev libproj-dev libdb-dev python-dev \ + gv libcurl4-openssl-dev shapelib libshp-dev libpcre3-dev libproj-dev libdb-dev python-dev-is-python3 \ libax25-dev libwebp-dev libwebp-dev libgraphicsmagick1-dev festival festival-dev cd ${BUILDDIR} || return From f9c98291c6cf55b3bdc29e07286008571b1d4fb5 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 09:22:36 -0600 Subject: [PATCH 09/26] partial fix #48 --- app/stable/pi/CQRLOG.bapp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/stable/pi/CQRLOG.bapp b/app/stable/pi/CQRLOG.bapp index 580c4be..f50ff3f 100644 --- a/app/stable/pi/CQRLOG.bapp +++ b/app/stable/pi/CQRLOG.bapp @@ -7,13 +7,13 @@ localVer=0 INSTALL(){ - sudo apt-get install -y lcl-2.0 lazarus-2.0 fp-compiler-3.2.0 fpc-3.2.0 libssl-dev git build-essential \ + sudo apt-get install -y lcl-2.2 lazarus-2.2 fp-compiler-3.2.2 fpc-3.2.2 libssl-dev git build-essential \ libmariadb-dev-compat lazarus-ide lcl lcl-gtk2 lcl-nogui lcl-units lcl-utils lazarus lazarus-doc lazarus-src \ fp-units-misc fp-units-rtl fp-utils fpc fpc-source libssl-dev default-mysql-client-core default-mysql-server \ default-mysql-server-core gawk libcgi-fast-perl libcgi-pm-perl libconfig-inifiles-perl libdbd-mysql-perl \ libdbi-perl libencode-locale-perl libfcgi-perl libhtml-parser-perl libhtml-tagset-perl \ libhtml-template-perl libhttp-date-perl libhttp-message-perl libio-html-perl liblwp-mediatypes-perl \ - libmariadb-dev-compat libnetpbm10 libreadline5 libterm-readkey-perl libtimedate-perl liburi-perl \ + libmariadb-dev-compat libnetpbm11 readline-common libterm-readkey-perl libtimedate-perl liburi-perl \ if [ -d ${BUILDDIR}/cqrlog ]; then rm -rf ${BUILDDIR}/cqrlog From eb7274bc4bbd355da46c3444ba30588d4b5a5526 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 13:20:48 -0600 Subject: [PATCH 10/26] fix #47 --- app/stable/pi/BPQ.bapp | 1 - 1 file changed, 1 deletion(-) diff --git a/app/stable/pi/BPQ.bapp b/app/stable/pi/BPQ.bapp index f32be9b..797c14e 100644 --- a/app/stable/pi/BPQ.bapp +++ b/app/stable/pi/BPQ.bapp @@ -7,7 +7,6 @@ localVer= INSTALL(){ - source ${HOME}/pi-build/config || return #install LinBPQ cd || return ########################################################################## From f1f7eefb69b5f0495cc2ef0973910ece4acb70be Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 15:22:19 -0600 Subject: [PATCH 11/26] fix 45 --- app/stable/pi/HAMLIB.bapp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/stable/pi/HAMLIB.bapp b/app/stable/pi/HAMLIB.bapp index b3d7627..0171311 100644 --- a/app/stable/pi/HAMLIB.bapp +++ b/app/stable/pi/HAMLIB.bapp @@ -26,7 +26,8 @@ INSTALL(){ PACKAGE=hamlib CLEANSOURCE - sudo apt install libusb-1.0-0 libusb-1.0-0-dev + sudo apt install libusb-1.0-0 libusb-1.0-0-dev swig + pyver=$(python3 -V | awk '{print $2}' | awk -F. '{print $1"."$2}') cd ${BUILDDIR} || return NEWRIG=$(curl -s https://sourceforge.net/projects/hamlib/files/latest/download | grep -o https://downloads.sourceforge.net/project/hamlib/hamlib/[0-9].[0-9] | @@ -49,7 +50,7 @@ INSTALL(){ rm hamlib*.tar.gz cd hamlib-4.4 - ./configure + ./configure --with-xml-support --with-python-binding PYTHON_VERSION=$pyver make -j $BAPCORE sudo make install sudo ldconfig From 56c08d90eac83d42bdb8a8d3fd2ca668964bb9b3 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 17:26:04 -0600 Subject: [PATCH 12/26] fix #52 --- data/conky/setconky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/conky/setconky b/data/conky/setconky index 95c7f27..18acdd7 100755 --- a/data/conky/setconky +++ b/data/conky/setconky @@ -1,6 +1,6 @@ CONFIG_DIR=$HOME/bin/conky CONKY_TMP=/tmp/conky.txt -CPU=$(lscpu | grep Architecture | grep arm) +CPU=$(lscpu | grep "Vendor ID" | grep ARM) if [ -z "$CPU" ]; then CONFIG_FILES=${CONFIG_DIR}/*.86 TYPE=".86" From 684c09ee920cbdb0fae0fde38fe28bb205c7e8cc Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 18:12:33 -0600 Subject: [PATCH 13/26] add python binding --- app/stable/x86_64/HAMLIB.bapp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/stable/x86_64/HAMLIB.bapp b/app/stable/x86_64/HAMLIB.bapp index f1ad6fa..5b677bd 100755 --- a/app/stable/x86_64/HAMLIB.bapp +++ b/app/stable/x86_64/HAMLIB.bapp @@ -23,7 +23,8 @@ CLEANSOURCE(){ PACKAGE=hamlib CLEANSOURCE - sudo -A apt install -y libusb-1.0-0 libusb-1.0-0-dev libnova-0.16-0 libnova-dev + sudo -A apt install -y libusb-1.0-0 libusb-1.0-0-dev libnova-0.16-0 libnova-dev swig libindi-dev libindi-data libindi-plugins + pyver=$(python3 -V | awk '{print $2}' | awk -F. '{print $1"."$2}') cd ${BAPSRC} NEWRIG=$(curl -s https://sourceforge.net/projects/hamlib/files/latest/download | grep -o https://downloads.sourceforge.net/project/hamlib/hamlib/[0-9].[0-9].[0-9] | @@ -33,7 +34,7 @@ CLEANSOURCE(){ tar -xzf hamlib-${NEWRIG}.tar.gz rm hamlib-${NEWRIG}.tar.gz cd hamlib-${NEWRIG} || return - ./configure + ./configure --with-python-binding PYTHON_VERSION=$pyver make sudo -A make install sudo -A ldconfig From 1fa74bfb7c18d68327582b18fcb3a79552358ff1 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 19:43:03 -0600 Subject: [PATCH 14/26] remove since 1.7 is stable now --- app/community/x86_64/DIREWOLF_DEV.bapp | 63 -------------------------- 1 file changed, 63 deletions(-) delete mode 100644 app/community/x86_64/DIREWOLF_DEV.bapp diff --git a/app/community/x86_64/DIREWOLF_DEV.bapp b/app/community/x86_64/DIREWOLF_DEV.bapp deleted file mode 100644 index ce60017..0000000 --- a/app/community/x86_64/DIREWOLF_DEV.bapp +++ /dev/null @@ -1,63 +0,0 @@ -BAPP=4.0 -ID=DIREWOLF_DEV -Name=direwolf_dev -Comment='Software TNC' -Ver=1.7 -localVer=1.7 - -# Install current dev version (1.7) to enable DNS-SD / Zeroconf for KISS TNC service to work with MobileMail for iOS - -INSTALL(){ - - CLEANSOURCE(){ - #this function removes any old source files before - #new files are downloaded for installation. This - #function is called by install functions below. - PACKAGE=$(ls $BUILDDIR | grep $PACKAGE) - - if [ -d $BUILDDIR/$PACKAGE ]; then - sudo rm -rf $BUILDDIR/$PACKAGE* - fi - - } - - PACKAGE=direwolf_dev - CLEANSOURCE - cd ${BUILDDIR} || return - # changed to included --branch dev - git clone --branch dev https://www.github.com/wb2osz/direwolf - cd ${BUILDDIR}/direwolf || return - mkdir build - cd build - sudo apt-get install -y libasound2-dev cmake libudev-dev - # Install libavahi-client-dev, as required for DNS-SD registration of service - sudo apt-get install -y libavahi-client-dev - cmake .. - make -j 4 - sudo make install - make install-conf - sudo make clean - sed -i "s/N0CALL/${CALL}/" "${HOME}/direwolf.conf" - sed -i 's/# ADEVICE plughw:1,0/ADEVICE plughw:3,0/' ${HOME}/direwolf.conf - sed -i '/#PTT\ \/dev\/ttyUSB0\ RTS/a #Uncomment line below for PTT with CAT through FLRIG\n#PTT RIG 2 localhost:4532' ${HOME}/direwolf.conf - -} - -VERSION(){ -if ! hash direwolf 2>/dev/null; then - CURRENT=0 - wget -P /tmp/ https://raw.githubusercontent.com/wb2osz/direwolf/master/CHANGES.md >/dev/null 2>&1 - NEWVER=$(cat /tmp/CHANGES.md | head -5 | tail -1 | awk '{ print $3 }') -else - CURRENT=$(direwolf -S -t 0 | head -1 | sed 's/Dire\ Wolf\ version\ //') - wget -P /tmp/ https://raw.githubusercontent.com/wb2osz/direwolf/master/CHANGES.md >/dev/null 2>&1 - NEWVER=$(cat /tmp/CHANGES.md | head -5 | tail -1 | awk '{ print $3 }') -fi -} - -REMOVE(){ - DIR=$(ls ${BUILDDIR} | grep direwolf) - cd ${BUILDDIR}/${DIR}/build - sudo make uninstall - rm ${HOME}/direwolf.conf ${HOME}/telem-balloon.conf ${HOME}/telem-m0xer-3.txt ${HOME}/telem-volts.conf ${HOME}/sdr.conf -} From 2831174c358374b73ca61df6f376b598fc1af785 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 29 Nov 2023 19:48:38 -0600 Subject: [PATCH 15/26] fix menu shortcut --- app/stable/x86_64/CONKY.bapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/stable/x86_64/CONKY.bapp b/app/stable/x86_64/CONKY.bapp index 86d1cf6..908150b 100755 --- a/app/stable/x86_64/CONKY.bapp +++ b/app/stable/x86_64/CONKY.bapp @@ -12,7 +12,7 @@ MENU(){ Name=Conky Prefs GenericName=Conky Prefs Comment=Update Conky Layout -Exec=${HOME}/bin/conky/set-conky +Exec=${HOME}/bin/conky/setconky Icon=${BAPDIR}/data/ico/conky.png Terminal=false Type=Application From 22835bb4b6aa8ab94bf5ef938a95821474c1bf16 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 30 Nov 2023 14:14:24 -0600 Subject: [PATCH 16/26] fix #40 --- bin/set-enviroment.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/set-enviroment.sh b/bin/set-enviroment.sh index 273ac06..1a8f57f 100755 --- a/bin/set-enviroment.sh +++ b/bin/set-enviroment.sh @@ -15,6 +15,15 @@ catch() { echo -e "\nCRITICAL: parsing error on:" } +pi_check(){ + #check is Pi OS is 32 or 64 bit + if [ `getconf LONG_BIT` = 32 ]; then + CPU=32 + elif [ `getconf LONG_BIT` = 64 ]; then + CPU=64 + fi +} + #lscpu to pull out args with sed to share to script. rm -f /tmp/bap-env-* lscpu > /tmp/bap-env-lscpu @@ -27,10 +36,10 @@ cpu=$(grep processor /proc/cpuinfo | wc -l) case "$arch" in armv7l) - CPU=32 + pi_check ;; aarch64) - CPU=64 + pi_check ;; x86_64) CPU=64 From c70758063e01689ae9f9a11984224bda1ff5ba66 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Mon, 18 Dec 2023 12:22:56 -0600 Subject: [PATCH 17/26] fix #39 --- app/stable/pi/WSJTX.bapp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/stable/pi/WSJTX.bapp b/app/stable/pi/WSJTX.bapp index d0f48fd..c3e4cc7 100644 --- a/app/stable/pi/WSJTX.bapp +++ b/app/stable/pi/WSJTX.bapp @@ -18,14 +18,14 @@ INSTALL(){ sudo rm -rf $HOME/.bap-source-files/wsjtx* if [ `getconf LONG_BIT` = '64' ]; then #64 bit link - FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep arm64 | grep https | sed 's/.*href="//' | sed 's/arm64.deb.*/arm64.deb/') + FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep arm64 | head -1 | sed 's/.*">//;s/<\/.*//') else #32bit link - FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep armhf | grep https | sed 's/.*href="//' | sed 's/_armhf.deb".*/_armhf.deb/') + FT8PKG=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep armhf | head -1 | sed 's/.*">//;s/<\/.*//') fi - PKGNAME=$(echo $FT8PKG | awk -F "/" '{print $NF}') + PKGNAME="https://wsjt.sourceforge.io/downloads/${FT8PKG}" wget --tries 2 --connect-timeout=60 $FT8PKG sudo dpkg -i $PKGNAME sudo apt install --fix-broken -y From 7ef4e4bedca78fd16ff141f1019238bd7d5c3a06 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Mon, 18 Dec 2023 12:24:03 -0600 Subject: [PATCH 18/26] update --- changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/changelog b/changelog index 2120eed..e7053d3 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,20 @@ version=4.0.2 4.0.2 Update pi chirp to "next" version of chirp Update x86 chrip to "next" version of chirp + update pi/pat.bapp for wayland + fix depends for piqttermtcp + update EES.bapp to php8.2 (issue 48) + update TQSL.bapp to libwxgtk3.2-dev (issue 48) + update XASTIR.bapp to python-dev-is-python3 (issue 48) + update CQRLOG.bapp depends (issue 48) + fix BPQ.bapp. remove legacy code. (issue 47) + add python binding to HAMLIB.bapp Pi (issue 45) + fixed set-conky. Thanks Bill, AA6BD! (issue 52) + add python binding to HAMLIB.bapp x86 (issue 45) + remove direwolf-dev from community since V1.7 is stable now + fix conky menu for x86 (issue 42) + ressolve issue 40 32/64bit OS check + Update WSJTX on Pi (issue 39) 4.0.1 Add build-essential to all builds add git install before running bapps add curl to all builds https://github.com/km4ack/73Linux/issues/28 From f8c9f638f1fc3fc9f3038981a5341e7a2a05b2e5 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Dec 2023 08:19:47 -0600 Subject: [PATCH 19/26] add depends --- app/stable/pi/PITERM.bapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/stable/pi/PITERM.bapp b/app/stable/pi/PITERM.bapp index 433960d..414e2b2 100644 --- a/app/stable/pi/PITERM.bapp +++ b/app/stable/pi/PITERM.bapp @@ -14,7 +14,7 @@ INSTALL(){ else sudo dpkg --add-architecture armhf sudo apt update - sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf libqt5multimedia5:armhf + sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf libqt5multimedia5:armhf libfftw3-bin:armhf fi wget --tries 2 --connect-timeout=60 https://www.cantab.net/users/john.wiseman/Downloads/Beta/piQtTermTCP sudo chmod +x piQtTermTCP From 7849cbae1863a63cf260c9fac7242df1cdccfe44 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Dec 2023 08:20:01 -0600 Subject: [PATCH 20/26] add depends --- app/stable/pi/QTSOUND.bapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/stable/pi/QTSOUND.bapp b/app/stable/pi/QTSOUND.bapp index 42d4940..3f6490d 100644 --- a/app/stable/pi/QTSOUND.bapp +++ b/app/stable/pi/QTSOUND.bapp @@ -14,7 +14,7 @@ INSTALL(){ else sudo dpkg --add-architecture armhf sudo apt update - sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf + sudo apt install -y libqt5widgets5:armhf libqt5serialport5:armhf libasound2:armhf libasound2-plugins:armhf libfftw3-bin:armhf fi cd ${HOME}/Downloads || return wget --tries 2 --connect-timeout=60 https://www.cantab.net/users/john.wiseman/Downloads/Beta/piQtSoundModem From d87bea290d853b1882eb11d82f5a0bdac352b3e3 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Dec 2023 08:20:12 -0600 Subject: [PATCH 21/26] update --- changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog b/changelog index e7053d3..4436a81 100644 --- a/changelog +++ b/changelog @@ -16,6 +16,8 @@ version=4.0.2 fix conky menu for x86 (issue 42) ressolve issue 40 32/64bit OS check Update WSJTX on Pi (issue 39) + add libfftw3-bin:armhf depends for piqtterm + add libfftw3-bin:armhf depends for piqtsoundmodem 4.0.1 Add build-essential to all builds add git install before running bapps add curl to all builds https://github.com/km4ack/73Linux/issues/28 From 5c935ec9e0e35d69089b83a650b525386950e102 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Dec 2023 14:51:42 -0600 Subject: [PATCH 22/26] update --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 4436a81..8c82b0e 100644 --- a/changelog +++ b/changelog @@ -18,6 +18,7 @@ version=4.0.2 Update WSJTX on Pi (issue 39) add libfftw3-bin:armhf depends for piqtterm add libfftw3-bin:armhf depends for piqtsoundmodem + add sqlite to TQSL.bapp (issue 56) Thanks KO4HXC 4.0.1 Add build-essential to all builds add git install before running bapps add curl to all builds https://github.com/km4ack/73Linux/issues/28 From a3fa893d5d1c23b2486427ab1161fd35bdb1ce78 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 23 Dec 2023 14:52:01 -0600 Subject: [PATCH 23/26] fix #56 --- app/stable/pi/TQSL.bapp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/stable/pi/TQSL.bapp b/app/stable/pi/TQSL.bapp index 64351ed..ba864c8 100644 --- a/app/stable/pi/TQSL.bapp +++ b/app/stable/pi/TQSL.bapp @@ -27,7 +27,8 @@ INSTALL(){ PACKAGE=tqsl CLEANSOURCE - sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.2-dev + sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.2-dev sqlite3 libsqlite3-dev + sudo ldconfig cd ${BUILDDIR} || return CUR=$(curl -s http://www.arrl.org/tqsl-download | grep "for Linux" | sed 's/.*TQSL //' | awk '{print $1}') wget --tries 2 --connect-timeout=60 http://www.arrl.org/tqsl/tqsl-${CUR}.tar.gz From 7a4b1104a60046384c80a5fb92edbb7f44db51ed Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 5 Jan 2024 19:27:37 -0600 Subject: [PATCH 24/26] add menu shortcut --- app/stable/x86_64/CHIRP.bapp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/stable/x86_64/CHIRP.bapp b/app/stable/x86_64/CHIRP.bapp index 792aa42..db787ab 100755 --- a/app/stable/x86_64/CHIRP.bapp +++ b/app/stable/x86_64/CHIRP.bapp @@ -6,14 +6,30 @@ Ver= localVer= W3='https://chirp.danplanet.com/projects/chirp/wiki/Home' +MENU(){ + cat >chirp.desktop </dev/null 2>&1 && pwd)" - sudo -A apt install python-wxtools -y + sudo -A apt install python-wxtools python3-pip -y cd ${BAPSRC} date=$(curl -s https://trac.chirp.danplanet.com/chirp_next/ | grep href=\"next | head -1 | sed 's/.*href="//' | sed 's/\/">.*//' | sed 's/next-//') wheel=https://trac.chirp.danplanet.com/chirp_next/next-${date}/chirp-${date}-py3-none-any.whl wget ${wheel} pip install ${wheel} --force-reinstall + MENU } From bc290811ac37a038467e03cff7556c4e8aa9728c Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 2 Apr 2024 06:26:26 -0500 Subject: [PATCH 25/26] fix #61 --- app/stable/x86_64/WSJTX.bapp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/stable/x86_64/WSJTX.bapp b/app/stable/x86_64/WSJTX.bapp index 9581599..f2309cf 100755 --- a/app/stable/x86_64/WSJTX.bapp +++ b/app/stable/x86_64/WSJTX.bapp @@ -49,9 +49,9 @@ REMOVE(){ VERSION(){ NEWVER=$(curl -s https://wsjt.sourceforge.io/wsjtx.html | grep amd64.deb | grep https | sed 's/.*href="//' | sed 's/.deb.*/.deb/' \ - | awk -F "/" '{print $NF}' | sed 's/_amd.*//;s/wsjtx_//') + | awk -F "/" '{print $NF}' | sed 's/_amd.*//;s/wsjtx_//' | tail -1) - CURRENT=$(ls $HOME/.bap-source-files/| grep wsjtx | sed 's/wsjtx_//' | sed 's/_amd64.deb//') + CURRENT=$(ls $HOME/.bap-source-files/| grep wsjtx | sed 's/wsjtx_//' | sed 's/_amd64.deb//' | tail -1) if [ -z "$CURRENT" ]; then CURRENT=0 fi From 1cf2a90d72022f028277d4632efe7a29babd21a7 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 2 Apr 2024 06:27:40 -0500 Subject: [PATCH 26/26] update --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 8c82b0e..dd5fb53 100644 --- a/changelog +++ b/changelog @@ -19,6 +19,7 @@ version=4.0.2 add libfftw3-bin:armhf depends for piqtterm add libfftw3-bin:armhf depends for piqtsoundmodem add sqlite to TQSL.bapp (issue 56) Thanks KO4HXC + resolve wsjtx update error (issue 61) 4.0.1 Add build-essential to all builds add git install before running bapps add curl to all builds https://github.com/km4ack/73Linux/issues/28