update to 6.1

3 files changed, 11 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c260ea6412fd..8e1f1af76578 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openclonk
 	pkgdesc = Multiplayer-action-tactic-skill game
-	pkgver = 6.0
-	pkgrel = 3
+	pkgver = 6.1
+	pkgrel = 1
 	url = http://openclonk.org
 	install = openclonk.install
 	arch = i686
@@ -11,7 +11,6 @@ pkgbase = openclonk
 	makedepends = boost
 	makedepends = imagemagick
 	makedepends = mesa
-	depends = freetype2
 	depends = gtk2
 	depends = glew
 	depends = sdl_mixer
@@ -19,12 +18,10 @@ pkgbase = openclonk
 	depends = hicolor-icon-theme
 	depends = libupnp
 	conflicts = clonk_rage
-	source = http://openclonk.org/builds/release/6.0/openclonk-6.0-src.tar.bz2
+	source = http://openclonk.org/builds/release/6.1/openclonk-6.1-src.tar.bz2
 	source = directories.patch
-	source = sdlfix.patch
-	md5sums = 3e0dd1c5f60df0d37dbbb12b7ef5c38b
+	md5sums = 4d2b93bc4e0e5e97ee35b890838316b8
 	md5sums = 55e35baf307d699a704e9d939d8402fb
-	md5sums = 50b727b8d372be91adce1d0460bf0081
 
 pkgname = openclonk
 
diff --git a/PKGBUILD b/PKGBUILD
index 804089e40c23..1c58f2646924 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,24 @@
 # Contributor: Wesley <rudirennsau at hotmail dot com>
 
 pkgname=openclonk
-pkgver=6.0
-pkgrel=3
-_orig=$pkgname-release-$pkgver-src
+pkgver=6.1
+pkgrel=1
+_orig=$pkgname-$pkgver-src
 pkgdesc='Multiplayer-action-tactic-skill game'
 arch=('i686' 'x86_64')
 url='http://openclonk.org'
 license=('custom')
-depends=('freetype2' 'gtk2' 'glew' 'sdl_mixer' 'libxpm'  'hicolor-icon-theme' 'libupnp')
+depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm'  'hicolor-icon-theme' 'libupnp')
 makedepends=('cmake' 'boost' 'imagemagick' 'mesa')
 conflicts=('clonk_rage')
 install=$pkgname.install
-source=("http://openclonk.org/builds/release/$pkgver/$pkgname-$pkgver-src.tar.bz2" 'directories.patch' 'sdlfix.patch')
-md5sums=('3e0dd1c5f60df0d37dbbb12b7ef5c38b'
-         '55e35baf307d699a704e9d939d8402fb'
-         '50b727b8d372be91adce1d0460bf0081')
+source=("http://openclonk.org/builds/release/$pkgver/$pkgname-$pkgver-src.tar.bz2" 'directories.patch')
+md5sums=('4d2b93bc4e0e5e97ee35b890838316b8'
+         '55e35baf307d699a704e9d939d8402fb')
 
 prepare() {
   cd "${srcdir}/${_orig}"
   patch -p1 -i ../directories.patch
-  patch -p1 -i ../sdlfix.patch
 }
 
 build() {
diff --git a/sdlfix.patch b/sdlfix.patch
deleted file mode 100644
index 600d09c2adc0..000000000000
--- a/sdlfix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fd6914f9cba6d7138b57c7fa6faa7437d9cbb639 Mon Sep 17 00:00:00 2001
-From: Kevin Zheng <kevinz5000@gmail.com>
-Date: Sun, 15 Mar 2015 13:18:13 -0500
-Subject: [PATCH] Fix linking with SDL
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c5d2f3..2621a5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -912,7 +912,6 @@ if(USE_SDL_MAINLOOP OR (Audio_TK STREQUAL "SDL_Mixer"))
- 	find_package(SDL)
- 	SET(HAVE_SDL ${SDL_FOUND})
- 	include_directories(${SDL_INCLUDE_DIR})
--	target_link_libraries(openclonk ${SDL_LIBRARY})
- endif()
- 
- ############################################################################
-@@ -1094,6 +1093,10 @@ target_link_libraries(openclonk
- 	libmisc
- )
- 
-+if (SDL_FOUND)
-+	target_link_libraries(openclonk ${SDL_LIBRARY})
-+endif()
-+
- if(Audio_FOUND)
- 	target_link_libraries(openclonk ${Audio_LIBRARIES})
- 	include_directories(${Audio_INCLUDE_DIRS})
--- 
-2.1.4
-