Updated

3 files changed, 86 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b928bc7c66e..2dad934f4043 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,33 @@
 pkgbase = tucnak
 	pkgdesc = Ham Radio - VHF/HF contest logbook
-	pkgver = 4.18
+	pkgver = 4.26
 	pkgrel = 1
 	url = http://tucnak.nagano.cz/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = pkg-config
-	depends = libzia=4.18
+	makedepends = autoconf
+	depends = libzia=4.26
 	depends = fftw
 	depends = libftdi-compat
 	depends = portaudio
 	depends = hamlib
 	depends = gpm
 	depends = rtl-sdr
+	depends = sdl2
 	conflicts = tucnak3
-	source = http://tucnak.nagano.cz/tucnak-4.18.tar.gz
+	source = http://tucnak.nagano.cz/tucnak-4.26.tar.gz
 	source = diff.misc.c
 	source = diff.subwin.c
-	md5sums = da88566439eb752141b3bfda870d605b
+	source = diff.configure.ac
+	md5sums = 10c378546c287813f274188837d49b8a
 	md5sums = c69ecca9cfe4a5094f39b72503d1c270
 	md5sums = c30358bfb7316ce34924f9aed10883da
-	sha256sums = bdecdcb44132186867b1af750bb30f41a254758ad011b72b81bd281474fcf327
+	md5sums = 7c60c0681254303cc12f82c394a62891
+	sha256sums = 6b9693fdf9ffa3a5138b85fbc51d9f1efb8f691062edac778f01fc7791a471ad
 	sha256sums = 91dcdb41fcf3c427587d5ab909db87de01f1d0bc4ea76909b2846488a262990a
 	sha256sums = fe9455bd8d1dc528d4d5d8637eefcfcbe784a2698d6b7ac131f5efa6fc9f3404
+	sha256sums = 39e0fa525a9ebbf557779cc945fd7ca9874636f164878a118f7ea5b3c853d76e
 
 pkgname = tucnak
-
diff --git a/PKGBUILD b/PKGBUILD
index 6dcea8c0f70e..0f04c6faa888 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,35 @@
 # Maintainer: not_anonymous <nmlibertarian@gmail.com>
 
 pkgname=tucnak
-pkgver=4.18
+pkgver=4.26
 pkgrel=1
 pkgdesc="Ham Radio - VHF/HF contest logbook"
 arch=('i686' 'x86_64')
 url="http://tucnak.nagano.cz/"
 license=('GPL')
-depends=("libzia=${pkgver}" 'fftw' 'libftdi-compat' 'portaudio' 'hamlib' 'gpm' 'rtl-sdr')
-makedepends=('pkg-config')
+depends=("libzia=4.26" 'fftw' 'libftdi-compat' 'portaudio' 'hamlib' \
+	'gpm' 'rtl-sdr' 'sdl2')
+makedepends=('pkg-config' 'autoconf')
 conflicts=('tucnak3')
 source=("http://tucnak.nagano.cz/$pkgname-$pkgver.tar.gz"
 	diff.misc.c
-	diff.subwin.c)
+	diff.subwin.c
+	diff.configure.ac)
 
 prepare() {
 	cd $srcdir/$pkgname-$pkgver
 
 	patch -p0 < ../diff.misc.c
 	patch -p0 < ../diff.subwin.c
+	patch -p0 < ../diff.configure.ac
 }
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
+
+	autoreconf --install --warnings=none
 	./configure --prefix=/usr --with-gpm
+	
 	make || return 1
 }
 
@@ -31,9 +37,11 @@ package() {
 	cd $srcdir/$pkgname-$pkgver
 	make DESTDIR=$pkgdir install
 }
-md5sums=('da88566439eb752141b3bfda870d605b'
+md5sums=('10c378546c287813f274188837d49b8a'
          'c69ecca9cfe4a5094f39b72503d1c270'
-         'c30358bfb7316ce34924f9aed10883da')
-sha256sums=('bdecdcb44132186867b1af750bb30f41a254758ad011b72b81bd281474fcf327'
+         'c30358bfb7316ce34924f9aed10883da'
+         '7c60c0681254303cc12f82c394a62891')
+sha256sums=('6b9693fdf9ffa3a5138b85fbc51d9f1efb8f691062edac778f01fc7791a471ad'
             '91dcdb41fcf3c427587d5ab909db87de01f1d0bc4ea76909b2846488a262990a'
-            'fe9455bd8d1dc528d4d5d8637eefcfcbe784a2698d6b7ac131f5efa6fc9f3404')
+            'fe9455bd8d1dc528d4d5d8637eefcfcbe784a2698d6b7ac131f5efa6fc9f3404'
+            '39e0fa525a9ebbf557779cc945fd7ca9874636f164878a118f7ea5b3c853d76e')
diff --git a/diff.configure.ac b/diff.configure.ac
new file mode 100644
index 000000000000..e7cca84df02a
--- /dev/null
+++ b/diff.configure.ac
@@ -0,0 +1,60 @@
+--- configure.ac.org	2021-02-25 13:17:39.000000000 -0700
++++ configure.ac	2021-06-07 07:02:11.481650059 -0600
+@@ -186,32 +186,32 @@
+ LIBZIA_CFLAGS=$zia_CFLAGS
+ LIBZIA_LIBS=$zia_LIBS
+ 
+-if test -d "../libzia"; then
+-    echo "existuje ../libzia"
+-    tucnak_libzia_ver="$(sh ../libzia/bin/zia-config --version) in $(readlink -f ../libzia/bin/zia-config)"
+-    tucnak_libzia_settings="../libzia/settings"
+-    LIBZIA_CFLAGS="$(bash ../libzia/bin/zia-config --cflags2) -I$(readlink -f ../libzia/include) -I$(readlink -f ../libzia/include/unix)"
+-    LIBZIA_LIBS="-L$(readlink -f ../libzia/src/.libs) -Wl,-Bstatic -lzia -Wl,-Bdynamic $(bash ../libzia/bin/zia-config --libs2)"
+-    AC_MSG_RESULT([yes; static in ../libzia/src])
+-else
+-    echo "neexistuje ../libzia"
++#if test -d "../libzia"; then
++#    echo "existuje ../libzia"
++#    tucnak_libzia_ver="$(sh ../libzia/bin/zia-config --version) in $(readlink -f ../libzia/bin/zia-config)"
++#    tucnak_libzia_settings="../libzia/settings"
++#    LIBZIA_CFLAGS="$(bash ../libzia/bin/zia-config --cflags2) -I$(readlink -f ../libzia/include) -I$(readlink -f ../libzia/include/unix)"
++#    LIBZIA_LIBS="-L$(readlink -f ../libzia/src/.libs) -Wl,-Bstatic -lzia -Wl,-Bdynamic $(bash ../libzia/bin/zia-config --libs2)"
++#    AC_MSG_RESULT([yes; static in ../libzia/src])
++#else
++#    echo "neexistuje ../libzia"
++#
++#    if test x"$libzia_via_pkg" = x"1"; then
++#        tucnak_libzia_ver="$($PKG_CONFIG --modversion 'libzia') via pkg-config in $($PKG_CONFIG --variable=prefix 'libzia')"
++#        tucnak_libzia_settings="$(zia-config --prefix)/share/libzia/$target/settings"
++#        LIBZIA_CFLAGS=$($PKG_CONFIG --cflags 'libzia') 
++#        LIBZIA_LIBS=$($PKG_CONFIG --libs 'libzia') 
++#        AC_MSG_RESULT([yes  dynamic in $($PKG_CONFIG --variable=prefix 'libzia')])
++#    else
++#        AC_MSG_ERROR([no  libzia not found via pkg-config])
++#    fi    
+ 
+-    if test x"$libzia_via_pkg" = x"1"; then
+-        tucnak_libzia_ver="$($PKG_CONFIG --modversion 'libzia') via pkg-config in $($PKG_CONFIG --variable=prefix 'libzia')"
+-        tucnak_libzia_settings="$(zia-config --prefix)/share/libzia/$target/settings"
+-        LIBZIA_CFLAGS=$($PKG_CONFIG --cflags 'libzia') 
+-        LIBZIA_LIBS=$($PKG_CONFIG --libs 'libzia') 
+-        AC_MSG_RESULT([yes  dynamic in $($PKG_CONFIG --variable=prefix 'libzia')])
+-    else
+-        AC_MSG_ERROR([no  libzia not found via pkg-config])
+-    fi    
+-
+-#    tucnak_libzia_ver="$(zia-config --version) $(which zia-config)"
+-#    tucnak_libzia_settings="$(zia-config --prefix)/share/libzia/settings"
+-#    LIBZIA_CFLAGS="$(zia-config --cflags)"
+-#    LIBZIA_LIBS=$(zia-config --libs)
+-#    AC_MSG_RESULT([yes; dynamic in $(zia-config --prefix)])
+-fi
++    tucnak_libzia_ver="$(zia-config --version) $(which zia-config)"
++    tucnak_libzia_settings="$(zia-config --prefix)/share/libzia/settings"
++    LIBZIA_CFLAGS="$(zia-config --cflags)"
++    LIBZIA_LIBS=$(zia-config --libs)
++    AC_MSG_RESULT([yes; dynamic in $(zia-config --prefix)])
++#fi
+ 
+ echo "LIBZIA_CFLAGS='$LIBZIA_CFLAGS'"
+ echo "LIBZIA_LIBS='$LIBZIA_LIBS'"