summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD34
-rw-r--r--diff.Makefile.am35
-rw-r--r--xpsk31.12
4 files changed, 35 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7677c9e324e4..0da4855d520a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xpsk31
pkgdesc = Ham Radio PSK31 engine using X/GTK+
- pkgver = 3.2
- pkgrel = 2
+ pkgver = 3.6.2
+ pkgrel = 1
url = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html
arch = i686
arch = x86_64
@@ -10,27 +10,22 @@ pkgbase = xpsk31
makedepends = automake
makedepends = intltool
makedepends = pkg-config
- depends = gtk2
- depends = alsa-lib
+ depends = gtk3
depends = hamradio-menus
- source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.2.tar.bz2
+ source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.6.2.tar.bz2
source = diff.Makefile.am
source = xpsk31.desktop
source = xpsk31.1
source = xdemorse.png
- source = xpsk31.man.1.gz
- md5sums = 952385221c0a577e099ee3d3897db24b
- md5sums = ed09102ed5862054b0f8579f78ab475f
+ md5sums = fe24677f3261b5d3b63fea7dd5b35c44
+ md5sums = 988264985f99e2869c590897c4219357
md5sums = c784ec5d71a3897c515add6aa370cccd
- md5sums = 856292e1d2c0f01745218c24e1bf690a
+ md5sums = 0dd0a9e1cc2d745ef93333f97b2e138d
md5sums = edcd3f301ec8ea95453d40534beb6ede
- md5sums = 633652b8446b6970576444e0b8c4e3d9
- sha256sums = b0118503dc87964cfac120de540b8c3b3d2a7cb20b4344a9cb6dd9f4a5dd519d
- sha256sums = 2377350a73d13e78a567ab4dd035dac445cc59056d123d75d370755dfddc2e7f
+ sha256sums = a713c45b48fbb0f3c162a9b2125dda5dac36f9c57b7f7a289253188dd06ddbf4
+ sha256sums = 5259e4e44cf4adffdb7a6d506958aa523523e3317554d180c6346348a59801a4
sha256sums = d1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5
- sha256sums = 1286f9c1a67f7e96440d5a218bad5e7b745642f17b72750e37089779bf75eec9
+ sha256sums = 1095a3122d3d448b8c2c48d8810ca37dbd8b9ec06b6fc51bc75ceb39c8eef071
sha256sums = 857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d
- sha256sums = 64b381591216ea16c35d94eea52d2de846ce7a628f92c2e0f26a72f27442a033
pkgname = xpsk31
-
diff --git a/PKGBUILD b/PKGBUILD
index 6cc26b3b1555..8f5bd825f075 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
# Original Contributor: Bob Finch <w9ya@arrl.net>
pkgname=xpsk31
-pkgver=3.2
-pkgrel=2
+pkgver=3.6.2
+pkgrel=1
pkgdesc="Ham Radio PSK31 engine using X/GTK+"
arch=('i686' 'x86_64')
url="http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html"
license=(GPL)
-depends=('gtk2' 'alsa-lib' 'hamradio-menus')
+depends=('gtk3' 'hamradio-menus')
makedepends=('autoconf' 'automake' 'intltool' 'pkg-config')
# 'imagemagick: used IF you want to convert icons/images')
source=(http://www.qsl.net/5b4az/pkg/psk31/$pkgname/$pkgname-$pkgver.tar.bz2
@@ -17,7 +17,7 @@ source=(http://www.qsl.net/5b4az/pkg/psk31/$pkgname/$pkgname-$pkgver.tar.bz2
$pkgname.desktop
$pkgname.1
xdemorse.png
- $pkgname.man.1.gz
+# $pkgname.man.1.gz
)
prepare() {
@@ -50,8 +50,8 @@ check() {
package() {
cd $srcdir/$pkgname-$pkgver
- mkdir -p $pkgdir/usr/share/doc/$pkgname/examples/
- mkdir -p $pkgdir/usr/share/{applications,pixmaps}
+# mkdir -p $pkgdir/usr/share/doc/$pkgname/examples/
+# mkdir -p $pkgdir/usr/share/{applications,pixmaps,man/man1}
make DESTDIR=$pkgdir install
mkdir -p $pkgdir/usr/bin
@@ -60,17 +60,17 @@ package() {
install -Dm644 ../$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
install -Dm644 ../xdemorse.png $pkgdir/usr/share/pixmaps/$pkgname.png
- install -Dm644 ../$pkgname.man.1.gz $pkgdir/usr/share/man/man1/$pkgname.1.gz
+ install -Dm644 $pkgname/xpsk31rc $pkgdir/usr/share/doc/$pkgname/examples/xpsk31rc.example
+
+ rm $pkgdir/usr/share/doc/$pkgname/$pkgname.1.gz
}
-md5sums=('952385221c0a577e099ee3d3897db24b'
- 'ed09102ed5862054b0f8579f78ab475f'
+md5sums=('fe24677f3261b5d3b63fea7dd5b35c44'
+ '988264985f99e2869c590897c4219357'
'c784ec5d71a3897c515add6aa370cccd'
- '856292e1d2c0f01745218c24e1bf690a'
- 'edcd3f301ec8ea95453d40534beb6ede'
- '633652b8446b6970576444e0b8c4e3d9')
-sha256sums=('b0118503dc87964cfac120de540b8c3b3d2a7cb20b4344a9cb6dd9f4a5dd519d'
- '2377350a73d13e78a567ab4dd035dac445cc59056d123d75d370755dfddc2e7f'
+ '0dd0a9e1cc2d745ef93333f97b2e138d'
+ 'edcd3f301ec8ea95453d40534beb6ede')
+sha256sums=('a713c45b48fbb0f3c162a9b2125dda5dac36f9c57b7f7a289253188dd06ddbf4'
+ '5259e4e44cf4adffdb7a6d506958aa523523e3317554d180c6346348a59801a4'
'd1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5'
- '1286f9c1a67f7e96440d5a218bad5e7b745642f17b72750e37089779bf75eec9'
- '857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d'
- '64b381591216ea16c35d94eea52d2de846ce7a628f92c2e0f26a72f27442a033')
+ '1095a3122d3d448b8c2c48d8810ca37dbd8b9ec06b6fc51bc75ceb39c8eef071'
+ '857eb46c32c12333a7110fb3ea99d2246084724856638f2e04324fc2a576626d')
diff --git a/diff.Makefile.am b/diff.Makefile.am
index dc04fde28e35..d3670633ceca 100644
--- a/diff.Makefile.am
+++ b/diff.Makefile.am
@@ -1,28 +1,7 @@
---- Makefile.am 2013-12-02 00:01:29.000000000 -0700
-+++ Makefile.am 2015-02-18 20:18:22.333001926 -0700
-@@ -34,6 +34,19 @@
-- if test -d $(HOME)/$(PACKAGE); then \
-- echo Working directory exists: $(HOME)/$(PACKAGE) - not copying; \
-- else \
-- echo Copying $(PACKAGE) working directory to $(HOME)/$(PACKAGE); \
-- cp -r $(srcdir)/$(PACKAGE) $(HOME); \
-- fi
-+ if test -d files/; then \
-+ echo "cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/"; \
-+ cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/; \
-+ echo "cp files/$(PACKAGE).xpm $(DESTDIR)/usr/share/pixmaps/"; \
-+ cp files/$(PACKAGE).xpm $(DESTDIR)/usr/share/pixmaps/; \
-+ fi
-+
-+ if test -d xpsk31/; then \
-+ if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \
-+ echo "mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/"; \
-+ mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
-+ echo "mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/"; \
-+ mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/; \
-+ fi; \
-+ echo "cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/"; \
-+ cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \
-+ echo "cp xpsk31/$(PACKAGE)rc $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/"; \
-+ cp xpsk31/$(PACKAGE)rc $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/$(PACKAGE)rc.example; \
-+ fi
+--- Makefile.am 2021-04-14 02:51:35.000000000 -0600
++++ Makefile.am 2023-03-20 13:27:33.072902743 -0600
+@@ -60,2 +60,2 @@
+- $(MKDIR_P) $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/;\
+- cp -r $(PACKAGE)/* $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/; \
++ $(MKDIR_P) $(DESTDIR)$(docdir)/examples/;\
++ cp -r $(PACKAGE)/* $(DESTDIR)$(docdir)/examples/; \
diff --git a/xpsk31.1 b/xpsk31.1
index ca10dbb3e1e2..2b19d24a3834 100644
--- a/xpsk31.1
+++ b/xpsk31.1
@@ -1,6 +1,6 @@
#!/bin/bash
if [ ! -f ~/xpsk31/xpsk31rc ] ; then
mkdir -p ~/xpsk31
- cp /usr/share/doc/xpsk31/examples/xpsk31rc.example ~/xpsk31/xpsk31rc
fi
+cp -ua /usr/share/doc/xpsk31/examples/* ~/xpsk31/.
/usr/bin/xpsk31.1 $1