Update to 2.5.0

3 files changed, 35 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb5943830b26..8eb4ac785a92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blockattack
 	pkgdesc = Open source Tetris Attack clone
-	pkgver = 2.4.0
+	pkgver = 2.5.0
 	pkgrel = 1
 	url = https://blockattack.net
 	arch = i686
@@ -16,8 +16,10 @@ pkgbase = blockattack
 	depends = sdl2_ttf
 	depends = physfs
 	depends = hicolor-icon-theme
-	source = blockattack-2.4.0.tar.gz::https://github.com/blockattack/blockattack-game/archive/v2.4.0.tar.gz
-	sha256sums = e3627854e5718f6bb51087a262ada9042ed0826e9dd97c255f764a5cec814f22
+	source = blockattack-2.5.0.tar.gz::https://github.com/blockattack/blockattack-game/archive/v2.5.0.tar.gz
+	source = utf8cpp.patch
+	sha256sums = 8fbb8b5e853c6a73f8fadc034030b0886bb928484ef4aac4e2c3806346e45ad8
+	sha256sums = d5dad9e69a7b195473613792dca7f47b54088a4c0072acbacd381eec25f0c399
 
 pkgname = blockattack
 
diff --git a/PKGBUILD b/PKGBUILD
index b17dbd12e61b..7512bb915803 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Laurie Clark-Michalek <bluepeppers (at) archlinux (dot) us>
 
 pkgname=blockattack
-pkgver=2.4.0
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="Open source Tetris Attack clone"
 arch=('i686' 'x86_64')
@@ -13,12 +13,15 @@ url="https://blockattack.net"
 license=('GPL')
 depends=('boost-libs' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'physfs' 'hicolor-icon-theme')
 makedepends=('cmake' 'boost' 'utf8cpp' 'zip')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/blockattack/blockattack-game/archive/v$pkgver.tar.gz")
-sha256sums=('e3627854e5718f6bb51087a262ada9042ed0826e9dd97c255f764a5cec814f22')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/blockattack/blockattack-game/archive/v$pkgver.tar.gz"
+        "utf8cpp.patch")
+sha256sums=('8fbb8b5e853c6a73f8fadc034030b0886bb928484ef4aac4e2c3806346e45ad8'
+            'd5dad9e69a7b195473613792dca7f47b54088a4c0072acbacd381eec25f0c399')
 
 prepare() {
   cd $pkgname-game-$pkgver
   ./packdata.sh
+  patch -p1 -i ../utf8cpp.patch
   mkdir -p ../build
 }
 
diff --git a/utf8cpp.patch b/utf8cpp.patch
new file mode 100644
index 000000000000..320cb777a3ac
--- /dev/null
+++ b/utf8cpp.patch
@@ -0,0 +1,24 @@
+diff -ru blockattack-game-2.5.0-orig/source/code/ReadKeyboard.cpp blockattack-game-2.5.0/source/code/ReadKeyboard.cpp
+--- blockattack-game-2.5.0-orig/source/code/ReadKeyboard.cpp	2019-05-25 16:06:13.000000000 +0200
++++ blockattack-game-2.5.0/source/code/ReadKeyboard.cpp	2019-06-23 10:47:51.021461071 +0200
+@@ -22,7 +22,7 @@
+ */
+ 
+ #include "ReadKeyboard.h"
+-#include "utf8.h"
++#include <utf8cpp/utf8.h>
+ #include <iostream>
+ 
+ ReadKeyboard::ReadKeyboard(void) {
+diff -ru blockattack-game-2.5.0-orig/source/code/sago/SagoTextBox.cpp blockattack-game-2.5.0/source/code/sago/SagoTextBox.cpp
+--- blockattack-game-2.5.0-orig/source/code/sago/SagoTextBox.cpp	2019-05-25 16:06:13.000000000 +0200
++++ blockattack-game-2.5.0/source/code/sago/SagoTextBox.cpp	2019-06-23 10:47:12.214334136 +0200
+@@ -26,7 +26,7 @@
+ #include "SagoTextField.hpp"
+ #include <vector>
+ #include <iostream>
+-#include "utf8.h"
++#include <utf8cpp/utf8.h>
+ #include <algorithm>
+ 
+ namespace sago {