Update to 2.7.0

3 files changed, 7 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1f2c896daab..8b5d1efe8c73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blockattack
 	pkgdesc = Open source Tetris Attack clone
-	pkgver = 2.6.0
+	pkgver = 2.7.0
 	pkgrel = 1
 	url = https://blockattack.net
 	arch = i686
@@ -8,7 +8,6 @@ pkgbase = blockattack
 	license = GPL
 	makedepends = cmake
 	makedepends = boost
-	makedepends = utf8cpp
 	makedepends = zip
 	depends = boost-libs
 	depends = sdl2_mixer
@@ -16,10 +15,7 @@ pkgbase = blockattack
 	depends = sdl2_ttf
 	depends = physfs
 	depends = hicolor-icon-theme
-	source = blockattack-2.6.0.tar.gz::https://github.com/blockattack/blockattack-game/archive/v2.6.0.tar.gz
-	source = utf8cpp.patch
-	sha256sums = 0967966e04e11c45dc0fe24b3caa583e591b4c7b39511d69805320ea22a21990
-	sha256sums = a3e6591e597d715d50037e9f15b9a4e5ce80cebe1e54e1eaaa95ca6c8d1858ec
+	source = blockattack-2.7.0.tar.gz::https://github.com/blockattack/blockattack-game/archive/v2.7.0.tar.gz
+	sha256sums = e132790d72d54eb40112dfb43d39191b2bf88a9572e34b25a5d2d70419f2f592
 
 pkgname = blockattack
-
diff --git a/PKGBUILD b/PKGBUILD
index a7469f94d35f..13b20062e8f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,20 @@
 # Contributor: Laurie Clark-Michalek <bluepeppers (at) archlinux (dot) us>
 
 pkgname=blockattack
-pkgver=2.6.0
+pkgver=2.7.0
 pkgrel=1
 pkgdesc="Open source Tetris Attack clone"
 arch=('i686' 'x86_64')
 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"
-        "utf8cpp.patch")
-sha256sums=('0967966e04e11c45dc0fe24b3caa583e591b4c7b39511d69805320ea22a21990'
-            'a3e6591e597d715d50037e9f15b9a4e5ce80cebe1e54e1eaaa95ca6c8d1858ec')
+makedepends=('cmake' 'boost' 'zip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/blockattack/blockattack-game/archive/v$pkgver.tar.gz")
+sha256sums=('e132790d72d54eb40112dfb43d39191b2bf88a9572e34b25a5d2d70419f2f592')
 
 prepare() {
   cd $pkgname-game-$pkgver
   ./packdata.sh
-  patch -p1 -i ../utf8cpp.patch
   mkdir -p ../build
 }
 
diff --git a/utf8cpp.patch b/utf8cpp.patch
deleted file mode 100644
index 514a7b7e45a0..000000000000
--- a/utf8cpp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 @@
- */
- 
- #include "ReadKeyboard.h"
--#include "utf8.h"
-+#include <utf8cpp/utf8.h>
- #include <iostream>
- 
- ReadKeyboard::ReadKeyboard(void) {
-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>
- #include <iostream>
--#include "utf8.h"
-+#include <utf8cpp/utf8.h>
- #include <algorithm>
- 
- namespace sago {