Updated to version 1.2.0

4 files changed, 8 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82c0a5aa76fd..8246fdb93dd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = julius-game
 	pkgdesc = Open source re-implementation of Caesar III (Original copy required)
-	pkgver = 1.1.0
-	pkgrel = 3
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://github.com/bvschaik/julius
 	install = julius-game.install
 	arch = i686
@@ -12,14 +12,10 @@ pkgbase = julius-game
 	depends = sdl2_mixer
 	source = julius-game.desktop
 	source = julius-game.install
-	source = fix_build_with_sdl2_2.0.10.patch
-	source = add_filename_macro.patch
-	source = https://github.com/bvschaik/julius/archive/v1.1.0.zip
+	source = https://github.com/bvschaik/julius/archive/v1.2.0.zip
 	sha256sums = d44482503d890ab62e64f607c67b5c9686de68e17411920d3c02d54d468ac2a2
 	sha256sums = 903b97f1a07bf4fa8495166c00e45fd1c2ec5fba4d25169cf5f810e51781ac40
-	sha256sums = 5b3efd9802b9b630fd9fbaf84da2f6708ef22e841600b0078e04bacc37de32e0
-	sha256sums = 86d1468c89d8c6624224207fb3b864d54ce82889302766934859d2eb6c8c99b8
-	sha256sums = dfb66d15713592c02f3564e8359f55117b2b4365181f62d877cd26c50f092ed3
+	sha256sums = b0ad74c0824d0caae6e3b3af6e978ce4a7e236b23d71a291bd1a31d49a2a7369
 
 pkgname = julius-game
 
diff --git a/PKGBUILD b/PKGBUILD
index e80fbae2a671..18bb42e13419 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=julius
 pkgname=$_pkgname-game
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Open source re-implementation of Caesar III (Original copy required)"
 arch=('i686' 'x86_64')
 url="https://github.com/bvschaik/julius"
@@ -11,19 +11,10 @@ license=('AGPL')
 makedepends=('cmake')
 depends=('sdl2' 'sdl2_mixer')
 install="$pkgname.install"
-source=($pkgname.desktop $pkgname.install fix_build_with_sdl2_2.0.10.patch add_filename_macro.patch $url/archive/v$pkgver.zip)
+source=($pkgname.desktop $pkgname.install $url/archive/v$pkgver.zip)
 sha256sums=('d44482503d890ab62e64f607c67b5c9686de68e17411920d3c02d54d468ac2a2'
             '903b97f1a07bf4fa8495166c00e45fd1c2ec5fba4d25169cf5f810e51781ac40'
-            '5b3efd9802b9b630fd9fbaf84da2f6708ef22e841600b0078e04bacc37de32e0'
-            '86d1468c89d8c6624224207fb3b864d54ce82889302766934859d2eb6c8c99b8'
-            'dfb66d15713592c02f3564e8359f55117b2b4365181f62d877cd26c50f092ed3')
-
-prepare() {
-    cd "$srcdir/$_pkgname-$pkgver"
-    patch -p1 < ../fix_build_with_sdl2_2.0.10.patch
-    patch -p0 < ../add_filename_macro.patch
-    sed -i 's#__FILE__#__FILENAME__#g' ext/libsmacker/* # replace full path in symbol table with base name
-}
+            'b0ad74c0824d0caae6e3b3af6e978ce4a7e236b23d71a291bd1a31d49a2a7369')
 
 build() {
     cd "$srcdir/$_pkgname-$pkgver"
diff --git a/add_filename_macro.patch b/add_filename_macro.patch
deleted file mode 100644
index 037bd565adc3..000000000000
--- a/add_filename_macro.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2019-10-06 12:18:03.648902685 +0200
-+++ CMakeLists.txt	2019-10-06 12:18:25.002441273 +0200
-@@ -1,6 +1,11 @@
- cmake_minimum_required(VERSION 3.0.2)
- include(CMakeDependentOption)
- 
-+cmake_policy(PUSH)
-+cmake_policy(SET CMP0005 OLD)
-+add_definitions(-D__FILENAME__=\\"$\(<F\)\\")
-+cmake_policy(POP)
-+
- if(VITA_BUILD AND SWITCH_BUILD)
-     message(FATAL_ERROR "Cannot build with -DVITA_BUILD=ON and -DSWITCH_BUILD=ON at the same time")
- endif()
diff --git a/fix_build_with_sdl2_2.0.10.patch b/fix_build_with_sdl2_2.0.10.patch
deleted file mode 100644
index 1f859e74d1ec..000000000000
--- a/fix_build_with_sdl2_2.0.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/platform/julius.c b/src/platform/julius.c
-index 99d8a66a..03669d3d 100644
---- a/src/platform/julius.c
-+++ b/src/platform/julius.c
-@@ -368,7 +368,10 @@ static int init_sdl(void)
-         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not initialize SDL: %s", SDL_GetError());
-         return 0;
-     }
--#if SDL_VERSION_ATLEAST(2, 0, 4)
-+#if SDL_VERSION_ATLEAST(2, 0, 10)
-+    SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
-+    SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
-+#elif SDL_VERSION_ATLEAST(2, 0, 4)
-     SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "1");
- #endif
-     SDL_Log("SDL initialized");