Adopted, and bumped version

5 files changed, 44 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a5c24dad306..0628268e0570 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = xroar
-	pkgdesc = A Dragon and Tandy CoCo emulator.
-	pkgver = 0.35
+	pkgdesc = A Dragon and Tandy CoCo emulator
+	pkgver = 0.35.3
 	pkgrel = 1
-	url = http://www.6809.org.uk/dragon/xroar.shtml
+	url = https://www.6809.org.uk/xroar
 	install = xroar.install
 	arch = x86_64
-	license = GPL
+	license = GPL2
+	makedepends = gendesk
 	depends = gtk2
 	depends = sdl2
 	depends = libgl
 	depends = libsndfile
 	depends = gtkglext
-	source = http://www.6809.org.uk/xroar/dl/xroar-0.35.tar.gz
-	source = xroar.desktop
+	source = https://www.6809.org.uk/xroar/dl/xroar-0.35.3.tar.gz
 	source = xroar.png
-	sha256sums = 9fd751cbcf52689e53623c4a58add5a27be22356bc3e61bdb9ca4a474513432d
-	sha256sums = 50eb3ca94bbc9972283998818b8dab2bcdb1dcc369f39aa97439b5b8ba0aa8dc
-	sha256sums = 1468756d038a050640764ee9a86e98ff04e1072f1a9b8da9be87039a02367eb1
+	sha256sums = 55bd7e829022b75f10d44ad61e0b2597a0c8eaeba22044984ca25b14a4111ab5
+	sha256sums = 0c6e5def77c6ca809cd69ae518512a89bff335147b44eb9ffc898d7302a17a59
 
 pkgname = xroar
 
diff --git a/PKGBUILD b/PKGBUILD
index fa91141e42bf..2f25dfd5de5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,41 @@
-# Maintainer:  Eric DeStefano <eric at ericdestefano dot com> 
+# Maintainer:  Andrew O'Neill <andrew at meanjollies dot com>
+# Contributor: Eric DeStefano <eric at ericdestefano dot com> 
 # Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: Boris Timofeev <mashin87@gmail.com>
+
 pkgname=xroar
-pkgver=0.35
+pkgver=0.35.3
 pkgrel=1
-pkgdesc="A Dragon and Tandy CoCo emulator."
+pkgdesc='A Dragon and Tandy CoCo emulator'
 arch=('x86_64')
-license=('GPL')
-url="http://www.6809.org.uk/dragon/xroar.shtml"
+license=('GPL2')
+url='https://www.6809.org.uk/xroar'
 depends=('gtk2' 'sdl2' 'libgl' 'libsndfile' 'gtkglext')
-makedepends=()
-install=xroar.install
-source=(http://www.6809.org.uk/xroar/dl/$pkgname-$pkgver.tar.gz
-        xroar.desktop
-        xroar.png)
-sha256sums=('9fd751cbcf52689e53623c4a58add5a27be22356bc3e61bdb9ca4a474513432d'
-            '50eb3ca94bbc9972283998818b8dab2bcdb1dcc369f39aa97439b5b8ba0aa8dc'
-            '1468756d038a050640764ee9a86e98ff04e1072f1a9b8da9be87039a02367eb1')
+makedepends=('gendesk')
+install=${pkgname}.install
+source=("${url}/dl/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}.png")
+sha256sums=('55bd7e829022b75f10d44ad61e0b2597a0c8eaeba22044984ca25b14a4111ab5'
+            '0c6e5def77c6ca809cd69ae518512a89bff335147b44eb9ffc898d7302a17a59')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+
+  gendesk --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --exec "/usr/bin/${pkgname}" -n
+}
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-jack
+  cd "${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m 755 ./src/xroar $pkgdir/usr/bin/xroar
-  install -D -m 644 ../xroar.png $pkgdir/usr/share/pixmaps/xroar.png
-  install -D -m 644 ../xroar.desktop $pkgdir/usr/share/applications/xroar.desktop
-  mkdir -p $pkgdir/usr/share/xroar/roms
-  gzip ./doc/xroar.info
-  install -D -m 644 ./doc/xroar.info.gz $pkgdir/usr/share/info/xroar.info.gz
+  cd "${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "../${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -dm644 "${pkgdir}/usr/share/${pkgname}/roms"
 }
diff --git a/xroar.desktop b/xroar.desktop
deleted file mode 100644
index 087e8cd6757b..000000000000
--- a/xroar.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=XRoar
-Comment=A Dragon and Tandy CoCo emulator.
-Icon=xroar
-Exec=xroar
-Terminal=false
-StartupNotify=false
-Categories=Emulator;Game;
diff --git a/xroar.install b/xroar.install
index 29d82309a62a..ca8e0151580f 100644
--- a/xroar.install
+++ b/xroar.install
@@ -1,13 +1,13 @@
 post_install()
 { 
-  echo ""
-  echo "***************************************************************"
-  echo " XRoar needs ROM dumps from the original computers to work"
-  echo " correctly. Install ROMs to /usr/share/xroar/roms/ for system"
-  echo " wide use, or ~/.xroar/roms/ for single user only."
-  echo " See http://www.6809.org.uk/dragon/xroar-manual.shtml for more information."
-  echo "***************************************************************"
-  echo ""
+  echo
+  echo "******************************************************************************"
+  echo " XRoar needs ROM dumps from the original computers to work correctly."
+  echo " Install ROMs to /usr/share/xroar/roms/ for system wide use, or ~/.xroar/roms/"
+  echo " for single user only. See https://www.6809.org.uk/xroar/doc/xroar.shtml for"
+  echo " more information."
+  echo "******************************************************************************"
+  echo
 }
 
 op=$1
diff --git a/xroar.png b/xroar.png
index eb8d493012aa..ce2328b26565 100644
--- a/xroar.png
+++ b/xroar.png