Update

3 files changed, 8 insertions, 112 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0fc00562958d..62b8b24289a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = trackballs
 	pkgdesc = Simple game similar to the classical game Marble Madness on the Amiga in the 80's
-	pkgver = 1.3.2
-	pkgrel = 2
+	pkgver = 1.3.3
+	pkgrel = 1
 	url = https://trackballs.github.io/
 	install = trackballs.install
 	arch = i686
@@ -14,9 +14,7 @@ pkgbase = trackballs
 	depends = hicolor-icon-theme
 	depends = gettext
 	replaces = trackballs-music
-	source = https://github.com/trackballs/trackballs/archive/v1.3.2.tar.gz
-	source = find_guile.patch::https://github.com/trackballs/trackballs/commit/21b8127a88c6078a543c28152e11668cc172ff45.diff
-	md5sums = 85b128afca8b55d8e7ae02c21fa0427e
-	md5sums = e7206c8314716557b4b40dcc12591088
+	source = https://github.com/trackballs/trackballs/archive/v1.3.3.tar.gz
+	md5sums = 404c325211f7ea13339a693c91aa6bf2
 
 pkgname = trackballs
diff --git a/PKGBUILD b/PKGBUILD
index aeb0de771636..49a92cfa0e4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: frsfnrrg
 
 pkgname=trackballs
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="Simple game similar to the classical game Marble Madness on the Amiga in the 80's"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,13 +13,7 @@ url="https://trackballs.github.io/"
 install=trackballs.install
 depends=('guile' 'sdl2_ttf' 'sdl2_image' 'sdl2_mixer' 'hicolor-icon-theme' 'gettext')
 replaces=(trackballs-music)
-source=(https://github.com/trackballs/trackballs/archive/v${pkgver}.tar.gz
-        find_guile.patch::https://github.com/trackballs/trackballs/commit/21b8127a88c6078a543c28152e11668cc172ff45.diff)
-
-prepare() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}/find_guile.patch"
-}
+source=(https://github.com/trackballs/trackballs/archive/v${pkgver}.tar.gz)
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -32,5 +26,4 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver/build
   make DESTDIR=${pkgdir} install
 }
-md5sums=('85b128afca8b55d8e7ae02c21fa0427e'
-         'e7206c8314716557b4b40dcc12591088')
+md5sums=('404c325211f7ea13339a693c91aa6bf2')
diff --git a/find_guile.patch b/find_guile.patch
deleted file mode 100644
index 08495310a2ed..000000000000
--- a/find_guile.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/cmake/FindGuile.cmake b/cmake/FindGuile.cmake
-index 844e817..46ef61b 100644
---- a/cmake/FindGuile.cmake
-+++ b/cmake/FindGuile.cmake
-@@ -1,36 +1,71 @@
--# Locate Guile. 
-+# Locate Guile.
- # Note: `guile-config` ultimately calls pkg-config anyway
- # Nothing gets marked `advanced` since there aren't that many variables
- 
--find_program(GUILE_SNARF NAMES guile-snarf guile-snarf3.0 guile-snarf2.2 guile-snarf2.0)
-+# Use PkgConfig when possible to find the version of guile which is available,
-+# and then use its results as hints toward the actual library/include paths
- 
--# PkgConfig is only there to provide hints
- find_package(PkgConfig)
--pkg_check_modules(PC_GUILE QUIET guile)
-+pkg_check_modules(PC_GUILE QUIET guile-3.0)
-+if (PC_GUILE_FOUND)
-+    find_program(GUILE_SNARF NAMES guile-snarf3.0 guile-snarf)
-+    find_path(GUILE_INCLUDE_DIR libguile.h
-+            HINTS ${PC_GUILE_INCLUDEDIR} ${PC_GUILE_INCLUDE_DIRS}
-+            PATH_SUFFIXES guile/3.0 guile)
-+    find_library(GUILE_LIBRARY NAMES guile-3.0 guile
-+                HINTS ${PC_GUILE_LIBDIR} ${PC_GUILE_LIBRARY_DIRS} )
-+endif(PC_GUILE_FOUND)
-+
- if (NOT PC_GUILE_FOUND)
--  pkg_check_modules(PC_GUILE QUIET guile-3.0)
--  if (NOT PC_GUILE_FOUND)
-     pkg_check_modules(PC_GUILE QUIET guile-2.2)
--    if (NOT PC_GUILE_FOUND)
--        pkg_check_modules(PC_GUILE QUIET guile-2.0)
--    endif(NOT PC_GUILE_FOUND)
--  endif(NOT PC_GUILE_FOUND)
-+    if (PC_GUILE_FOUND)
-+        find_program(GUILE_SNARF NAMES guile-snarf2.2 guile-snarf)
-+        find_path(GUILE_INCLUDE_DIR libguile.h
-+                HINTS ${PC_GUILE_INCLUDEDIR} ${PC_GUILE_INCLUDE_DIRS}
-+                PATH_SUFFIXES guile/2.2 guile)
-+        find_library(GUILE_LIBRARY NAMES guile-2.2 guile
-+                    HINTS ${PC_GUILE_LIBDIR} ${PC_GUILE_LIBRARY_DIRS} )
-+    endif(PC_GUILE_FOUND)
- endif(NOT PC_GUILE_FOUND)
- 
-+if (NOT PC_GUILE_FOUND)
-+    pkg_check_modules(PC_GUILE QUIET guile-2.0)
-+    if (PC_GUILE_FOUND)
-+        find_program(GUILE_SNARF NAMES guile-snarf2.0 guile-snarf)
-+        find_path(GUILE_INCLUDE_DIR libguile.h
-+                HINTS ${PC_GUILE_INCLUDEDIR} ${PC_GUILE_INCLUDE_DIRS}
-+                PATH_SUFFIXES guile/2.0 guile)
-+        find_library(GUILE_LIBRARY NAMES guile-2.0 guile
-+                    HINTS ${PC_GUILE_LIBDIR} ${PC_GUILE_LIBRARY_DIRS} )
-+    endif(PC_GUILE_FOUND)
-+endif(NOT PC_GUILE_FOUND)
- 
--set(GUILE_DEFINITIONS ${PC_GUILE_CFLAGS_OTHER})
-+if (NOT PC_GUILE_FOUND)
-+    pkg_check_modules(PC_GUILE QUIET guile)
-+    if (PC_GUILE_FOUND)
-+        find_program(GUILE_SNARF NAMES guile-snarf)
-+        find_path(GUILE_INCLUDE_DIR libguile.h
-+                HINTS ${PC_GUILE_INCLUDEDIR} ${PC_GUILE_INCLUDE_DIRS}
-+                PATH_SUFFIXES guile)
-+        find_library(GUILE_LIBRARY NAMES guile
-+                    HINTS ${PC_GUILE_LIBDIR} ${PC_GUILE_LIBRARY_DIRS} )
-+    endif(PC_GUILE_FOUND)
-+endif(NOT PC_GUILE_FOUND)
- 
--find_path(GUILE_INCLUDE_DIR libguile.h
--          HINTS ${PC_GUILE_INCLUDEDIR} ${PC_GUILE_INCLUDE_DIRS}
--          PATH_SUFFIXES guile guile/3.0 guile/2.2 guile/2.0)
-+if (NOT PC_GUILE_FOUND)
-+    find_program(GUILE_SNARF NAMES
-+            guile-snarf3.0 guile-snarf2.2 guile-snarf2.0 guile-snarf)
-+    find_path(GUILE_INCLUDE_DIR libguile.h
-+            PATH_SUFFIXES guile/3.0 guile/2.2 guile/2.0 guile)
-+    find_library(GUILE_LIBRARY NAMES guile-3.0 guile-2.2 guile-2.0 guile)
-+endif(NOT PC_GUILE_FOUND)
- 
--find_library(GUILE_LIBRARY NAMES guile guile-3.0 guile-2.2 guile-2.0
--             HINTS ${PC_GUILE_LIBDIR} ${PC_GUILE_LIBRARY_DIRS} )
-+set(GUILE_DEFINITIONS ${PC_GUILE_CFLAGS_OTHER})
- 
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(Guile REQUIRED_VARS
--                                  GUILE_LIBRARY GUILE_INCLUDE_DIR
--                                  VERSION_VAR PC_GUILE_VERSION)
-+find_package_handle_standard_args(Guile
-+        REQUIRED_VARS GUILE_LIBRARY GUILE_INCLUDE_DIR
-+        VERSION_VAR PC_GUILE_VERSION)
- 
- set(GUILE_LIBRARIES ${GUILE_LIBRARY} )
- set(GUILE_INCLUDE_DIRS ${GUILE_INCLUDE_DIR} )