2.6.0 update, thanks to arisinfenix for the patch

3 files changed, 27 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8eb4ac785a92..f1f2c896daab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blockattack
 	pkgdesc = Open source Tetris Attack clone
-	pkgver = 2.5.0
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = https://blockattack.net
 	arch = i686
@@ -16,10 +16,10 @@ pkgbase = blockattack
 	depends = sdl2_ttf
 	depends = physfs
 	depends = hicolor-icon-theme
-	source = blockattack-2.5.0.tar.gz::https://github.com/blockattack/blockattack-game/archive/v2.5.0.tar.gz
+	source = blockattack-2.6.0.tar.gz::https://github.com/blockattack/blockattack-game/archive/v2.6.0.tar.gz
 	source = utf8cpp.patch
-	sha256sums = 8fbb8b5e853c6a73f8fadc034030b0886bb928484ef4aac4e2c3806346e45ad8
-	sha256sums = d5dad9e69a7b195473613792dca7f47b54088a4c0072acbacd381eec25f0c399
+	sha256sums = 0967966e04e11c45dc0fe24b3caa583e591b4c7b39511d69805320ea22a21990
+	sha256sums = a3e6591e597d715d50037e9f15b9a4e5ce80cebe1e54e1eaaa95ca6c8d1858ec
 
 pkgname = blockattack
 
diff --git a/PKGBUILD b/PKGBUILD
index 7512bb915803..a7469f94d35f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Frederic Bezies <fredbezies at gmail dot com>
-# Contributor: Michael Straube <michael.straube@posteo.de>
+# Contributor: Michael Straube <michael.straubej@gmail.com>
 # Contributor: pj1031999 <pj1031999@gmail.com>
 # Contributor: Michal Docekal <docekal@gmail.com>
 # Contributor: Laurie Clark-Michalek <bluepeppers (at) archlinux (dot) us>
 
 pkgname=blockattack
-pkgver=2.5.0
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="Open source Tetris Attack clone"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ depends=('boost-libs' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'physfs' 'hicolor-ico
 makedepends=('cmake' 'boost' 'utf8cpp' 'zip')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/blockattack/blockattack-game/archive/v$pkgver.tar.gz"
         "utf8cpp.patch")
-sha256sums=('8fbb8b5e853c6a73f8fadc034030b0886bb928484ef4aac4e2c3806346e45ad8'
-            'd5dad9e69a7b195473613792dca7f47b54088a4c0072acbacd381eec25f0c399')
+sha256sums=('0967966e04e11c45dc0fe24b3caa583e591b4c7b39511d69805320ea22a21990'
+            'a3e6591e597d715d50037e9f15b9a4e5ce80cebe1e54e1eaaa95ca6c8d1858ec')
 
 prepare() {
   cd $pkgname-game-$pkgver
diff --git a/utf8cpp.patch b/utf8cpp.patch
index 320cb777a3ac..514a7b7e45a0 100644
--- a/utf8cpp.patch
+++ b/utf8cpp.patch
@@ -1,6 +1,19 @@
-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
+Binärdateien blockattack-game-2.6.0-orig/Game/blockattack.data und blockattack-game-2.6.0/Game/blockattack.data sind verschieden.
+diff -ru blockattack-game-2.6.0-orig/source/code/DialogBox.cpp blockattack-game-2.6.0/source/code/DialogBox.cpp
+--- blockattack-game-2.6.0-orig/source/code/DialogBox.cpp	2020-09-28 07:47:32.756216112 +0200
++++ blockattack-game-2.6.0/source/code/DialogBox.cpp	2020-09-28 07:51:09.984218603 +0200
+@@ -25,7 +25,7 @@
+ #include "global.hpp"
+ #include "common.h"
+ #include "ReadKeyboard.h"
+-#include "utf8.h"
++#include <utf8cpp/utf8.h>
+ #include "MenuSystem.h"
+ 
+ static void setButtonFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {
+diff -ru blockattack-game-2.6.0-orig/source/code/ReadKeyboard.cpp blockattack-game-2.6.0/source/code/ReadKeyboard.cpp
+--- blockattack-game-2.6.0-orig/source/code/ReadKeyboard.cpp	2020-09-28 07:47:32.756216112 +0200
++++ blockattack-game-2.6.0/source/code/ReadKeyboard.cpp	2020-09-28 07:50:38.949743007 +0200
 @@ -22,7 +22,7 @@
  */
  
@@ -10,9 +23,9 @@ diff -ru blockattack-game-2.5.0-orig/source/code/ReadKeyboard.cpp blockattack-ga
  #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
+diff -ru blockattack-game-2.6.0-orig/source/code/sago/SagoTextBox.cpp blockattack-game-2.6.0/source/code/sago/SagoTextBox.cpp
+--- blockattack-game-2.6.0-orig/source/code/sago/SagoTextBox.cpp	2020-09-28 07:47:32.766211112 +0200
++++ blockattack-game-2.6.0/source/code/sago/SagoTextBox.cpp	2020-09-28 07:50:38.949743007 +0200
 @@ -26,7 +26,7 @@
  #include "SagoTextField.hpp"
  #include <vector>