Update to v4.2.0

3 files changed, 7 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71c444394297..9cf4afc86cfa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = atari800
 	pkgdesc = An emulator of the Atari 800/800XL/130XE/5200 with various extensions
-	pkgver = 4.1.0
+	pkgver = 4.2.0
 	pkgrel = 1
 	url = https://atari800.github.io
 	arch = i686
@@ -8,10 +8,8 @@ pkgbase = atari800
 	license = GPL2
 	depends = sdl
 	optdepends = libpng: PNG screenshot support
-	source = https://github.com/atari800/atari800/archive/ATARI800_4_1_0.tar.gz
-	source = onscreenkeyboard.patch
-	sha256sums = 4b77c876db0c2eb2de2a82301e0cd8855d588db5ceec9594c32a9294c5d9de7c
-	sha256sums = ac52bcea73a20b2bbf8c060eafca96d4697a7dc96961e1ab28836b8a09808ff1
+	source = https://github.com/atari800/atari800/archive/ATARI800_4_2_0.tar.gz
+	sha256sums = 0bad99575293742e9e062e9fe9d104fe57228b1a32fec7a033b889edc819d7a4
 
 pkgname = atari800
 
diff --git a/PKGBUILD b/PKGBUILD
index fd908a9f4905..dfd5bca053aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,7 @@
-# Maintainer: beest <gnubeest@zoho.com>
-# Contributor: c0mmando <c0mmand0_88 at yahoo dot com dot ar>
-# Contributor: Farhan Yousasf <farhany at gmail dot com>
-# Contributor: Vinzenz Vietzke <vinz at archlinux dot us>
+# Maintainer: Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=atari800
-pkgver=4.1.0
+pkgver=4.2.0
 _pkgver=${pkgver//./_}
 pkgrel=1
 pkgdesc="An emulator of the Atari 800/800XL/130XE/5200 with various extensions"
@@ -13,17 +10,12 @@ url="https://atari800.github.io"
 license=('GPL2')
 depends=('sdl')
 optdepends=('libpng: PNG screenshot support')
-source=("https://github.com/atari800/${pkgname}/archive/ATARI800_${_pkgver}.tar.gz"
-	"onscreenkeyboard.patch")
-sha256sums=('4b77c876db0c2eb2de2a82301e0cd8855d588db5ceec9594c32a9294c5d9de7c'
-	'ac52bcea73a20b2bbf8c060eafca96d4697a7dc96961e1ab28836b8a09808ff1')
+source=("https://github.com/atari800/${pkgname}/archive/ATARI800_${_pkgver}.tar.gz")
+sha256sums=('0bad99575293742e9e062e9fe9d104fe57228b1a32fec7a033b889edc819d7a4')
 
 build() {
     cd "${pkgname}-ATARI800_${_pkgver}"
 
-    # https://github.com/atari800/atari800/issues/58
-    patch -p0 < ${srcdir}/onscreenkeyboard.patch
-
     ./autogen.sh
 
     # configure default - neccessary
diff --git a/onscreenkeyboard.patch b/onscreenkeyboard.patch
deleted file mode 100644
index 1cd79c934330..000000000000
--- a/onscreenkeyboard.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sdl/input.c.org	2019-04-13 17:22:52.000000000 +0200
-+++ src/sdl/input.c	2019-06-17 11:14:05.321262892 +0200
-@@ -1654,7 +1654,7 @@
- 	static int repdelay_timeout = REPEAT_DELAY;
- 	struct js_state *state = &sdl_js_state[0];
- 
--	if (! joystick0) return(AKEY_NONE);  /* no controller present */
-+	if (! joysticks_found) return(AKEY_NONE);  /* no controller present */
- 
- 	update_SDL_joysticks();
-