testing/opencc: upgrade to 1.1.1

testing/opencc/APKBUILD

@@ -2,35 +2,35 @@
 # Maintainer: Ivan Tham <pickfire@riseup.net>
 pkgname=opencc
 _pkgname=OpenCC
-pkgver=1.0.5
-pkgrel=1
+pkgver=1.1.1
+pkgrel=0
 pkgdesc="Open Chinese Convert"
 url="http://opencc.byvoid.com/"
 arch="all"
 license="Apache-2.0"
 makedepends="cmake doxygen python3"
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-ver.$pkgver.tar.gz::https://github.com/BYVoid/$_pkgname/archive/ver.$pkgver.tar.gz
-	python3.patch
-	"
+source="$pkgname-ver.$pkgver.tar.gz::https://github.com/BYVoid/$_pkgname/archive/ver.$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-ver.$pkgver"
 
 build() {
-	mkdir build && cd build
-	cmake .. -DCMAKE_BUILD_TYPE=None \
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_DOCUMENTATION=on \
-		-DBUILD_TESTING=off
-	make
+		-DBUILD_TESTING=off \
+		. $CMAKE_CROSSOPTS
+	make -C build
 }
 
 package() {
-	cd build
-	make DESTDIR="$pkgdir" install
+	make -C build DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"-doc/usr/share/doc
 	mv "$pkgdir"/usr/share/$pkgname/doc "$pkgdir"-doc/usr/share/doc/$pkgname
 }
 
-sha512sums="3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1  opencc-ver.1.0.5.tar.gz
-337176f438e0938b898deeb46ba9494c7510fc3a769852ad81cc9b0018d23240a2a1190b6d0f7bad686c967a2ce323cc4d8fe5c71678d678f53a58ba671c45ce  python3.patch"
+sha512sums="48ccf61f63cf0a1c0fc484a52ae1d406a28949a52be7d7d1595e6aaf87f40ac47ea4697308441a9381f0cd6f404ee5a28b85a2fa2f288c4b3933be36f4a41363  opencc-ver.1.1.1.tar.gz"

testing/opencc/python3.patch

-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1516775..3989bad 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -1,6 +1,6 @@
- set(OPENCC_DICT_BIN opencc_dict)
--set(DICT_MERGE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py)
--set(DICT_REVERSE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py)
-+set(DICT_MERGE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py)
-+set(DICT_REVERSE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py)
- set(DICT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dictionary)
- set(DICT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR})
- 
-