Upstream: 2.23

3 files changed, 8 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f007ea49aa8..e1ca7b4d05d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = antimicro
 	pkgdesc = Graphical program used to map keyboard keys and mouse controls to gamepad buttons
-	pkgver = 2.22
-	pkgrel = 2
+	pkgver = 2.23
+	pkgrel = 1
 	url = https://github.com/AntiMicro/antimicro
 	arch = i686
 	arch = x86_64
@@ -16,10 +16,8 @@ pkgbase = antimicro
 	depends = sdl2
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = antimicro-2.22.tar.gz::https://github.com/AntiMicro/antimicro/archive/2.22.tar.gz
-	source = sdl_check_ev.patch
-	sha1sums = b30cd898218d3325ff7f18fd2efee2a88a79a5ea
-	sha1sums = 068047dad992f99e70aedceb0a4587ac6735412d
+	source = antimicro-2.23.tar.gz::https://github.com/AntiMicro/antimicro/archive/2.23.tar.gz
+	sha1sums = 8656ce94a1eac2a0934e62db42e386bc481708bb
 
 pkgname = antimicro
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f006e66c587..592de191be90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,18 @@
 # Developer: Travis Nickles <nickles.travis@gmail.com>
 
 pkgname=antimicro
-pkgver=2.22
-pkgrel=2
+pkgver=2.23
+pkgrel=1
 pkgdesc="Graphical program used to map keyboard keys and mouse controls to gamepad buttons"
 arch=('i686' 'x86_64')
 url="https://github.com/AntiMicro/antimicro"
 license=('GPL3')
 depends=('libxkbcommon-x11' 'libxtst' 'qt5-base' 'sdl2' 'shared-mime-info' 'desktop-file-utils')
 makedepends=('cmake' 'gettext' 'itstool' 'qt5-tools')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AntiMicro/${pkgname}/archive/${pkgver}.tar.gz" "sdl_check_ev.patch")
-sha1sums=('b30cd898218d3325ff7f18fd2efee2a88a79a5ea'
-          '068047dad992f99e70aedceb0a4587ac6735412d')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AntiMicro/${pkgname}/archive/${pkgver}.tar.gz")
+sha1sums=('8656ce94a1eac2a0934e62db42e386bc481708bb')
 
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../sdl_check_ev.patch
-}
-
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/sdl_check_ev.patch b/sdl_check_ev.patch
deleted file mode 100644
index d3223c43153f..000000000000
--- a/sdl_check_ev.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/sdleventreader.cpp b/src/sdleventreader.cpp
-index 6729155..e8e60ae 100644
---- a/src/sdleventreader.cpp
-+++ b/src/sdleventreader.cpp
-@@ -205,7 +205,17 @@ int SDLEventReader::CheckForEvents()
-             exit = true;
-             break;
-         }
--        case 1:
-+        case 0:
-+        {
-+            if (!pollRateTimer.isActive())
-+            {
-+                pollRateTimer.start();
-+            }
-+            //exit = true;
-+            //SDL_Delay(10);
-+            break;
-+        }
-+        default:
-         {
-             /*Logger::LogInfo(
-                         QString("Gamepad Poll %1").arg(
-@@ -217,16 +227,6 @@ int SDLEventReader::CheckForEvents()
-             exit = true;
-             break;
-         }
--        case 0:
--        {
--            if (!pollRateTimer.isActive())
--            {
--                pollRateTimer.start();
--            }
--            //exit = true;
--            //SDL_Delay(10);
--            break;
--        }
-     }
- 
-     return result;