4 files changed, 22 insertions, 76 deletions
diff --git a/community/ktoblzcheck/0001_drop_python2_detection.patch b/community/ktoblzcheck/0001_drop_python2_detection.patch
deleted file mode 100644
index 6048c46453..0000000000
--- a/community/ktoblzcheck/0001_drop_python2_detection.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Drop broken Python 2 detection
- The Python 2 detection is broken for the case that Python isn't even
- installed (e.g. because no Python support needs to be built) -- so broken that
- it causes the build to fail.  As we don't intend to ship Python 2.x libraries
- (see Debian Abug #936886), let's just rip out the entire detection logic.
-Author: Micha Lenk <micha@debian.org>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/936886
-Forwarded: no
-Last-Update: 2019-12-04
-
---- libktoblzcheck-1.50.orig/CMakeLists.txt
-+++ libktoblzcheck-1.50/CMakeLists.txt
-@@ -70,23 +70,6 @@ if(CMAKE_USE_PTHREADS_INIT)
-     set(HAVE_LIBPTHREAD 1)
- endif()
- 
--find_package(Python2 COMPONENTS Interpreter Development)
--# for cmake < 3.12
--if(NOT Python2_Interpreter_FOUND)
--    find_package(PythonInterp 2.7 REQUIRED)
--    set(Python2_Interpreter_FOUND TRUE)
--    set(Python2_EXECUTABLE ${PYTHON_EXECUTABLE})
--endif()
--if(Python2_Development_FOUND)
--    string(REGEX REPLACE "^([0-9]+.[0-9]+).*" "\\1" Python2_VERSION_MAJOR_MINOR ${Python2_VERSION})
--else()
--    find_package(PythonLibs 2.6 REQUIRED)
--    set(Python2_Development_FOUND TRUE)
--    set(Python2_VERSION ${PYTHONLIBS_VERSION_STRING})
--    string(REGEX REPLACE "^([0-9]+.[0-9]+).*" "\\1" Python2_VERSION_MAJOR_MINOR ${Python2_VERSION})
--    set(Python2_SITEARCH "${CMAKE_INSTALL_LIBDIR}/python${Python2_VERSION_MAJOR_MINOR}/site-packages")
--endif()
--
- ########### configure checks ###############
- include(CheckIncludeFile)
- check_include_file(dirent.h     HAVE_DIRENT_H)
diff --git a/community/ktoblzcheck/APKBUILD b/community/ktoblzcheck/APKBUILD
index a03d9f7790..4dd393598a 100644
--- a/community/ktoblzcheck/APKBUILD
+++ b/community/ktoblzcheck/APKBUILD
@@ -1,18 +1,16 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=ktoblzcheck
-pkgver=1.50
-pkgrel=1
+pkgver=1.52
+pkgrel=0
 pkgdesc="A library to check account numbers and bank codes of german banks"
 url="http://ktoblzcheck.sourceforge.net/"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="cmake"
+makedepends="cmake python3 python3-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
-	fix_missing_BANKDATA_PATH.patch
-	0001_drop_python2_detection.patch
-	"
+	disable-python-tests.patch"
 
 build() {
 	cmake \
@@ -31,6 +29,5 @@ package() {
 	DESTDIR="$pkgdir" make install
 }
 
-sha512sums="b34b771d1f4f1935c714ecded1c09066846385485ea4b7b21dd5219a01acec7e7204c1da723b42babda5d3f21f4471d1a1902bb7b5350d0f564ae3447c1d154d  ktoblzcheck-1.50.tar.gz
-83858c544d73baff5f11e2261dfb54cd564fd3adc338b28acd4d3dc1fa5f33cbf8d0660c958c743db4c5e0cf3a00f2c5fc315b92a5757afd9ace5ab2d28714b2  fix_missing_BANKDATA_PATH.patch
-9ab4dbfc7a45edd9ebaa89904c2ade363ec93ac1511d4de7ce192bb3233c1e2387f6878d6700d075758d1bb64cd5e40c3045e2663da35d9de09037fc84a0b0f8  0001_drop_python2_detection.patch"
+sha512sums="d84c16fb131405fff14f5b9ce244e0e0a6e0bef96111c00d45be4a9a9602c6a70e114143cf6451ac02e3b37a352830e1b5dc6652d887010f5b50cbbf89be7d96  ktoblzcheck-1.52.tar.gz
+41e9a3e4430257c3887b4951afaaec650379318fce7784be445331423e4485cc48b4ef0846a398803496ddc01ecce5fef3c589031e4d695b7e85cccd2b07dffe  disable-python-tests.patch"
diff --git a/community/ktoblzcheck/disable-python-tests.patch b/community/ktoblzcheck/disable-python-tests.patch
new file mode 100644
index 0000000000..8b193113a5
--- /dev/null
+++ b/community/ktoblzcheck/disable-python-tests.patch
@@ -0,0 +1,16 @@
+The test_ktoblzcheck.py python script does not seem to work with
+python3. Nonetheless, python is required to be installed as it
+is used to convert the bankdata elsewhere during the build process.
+
+diff -upr ktoblzcheck-1.52.orig/src/python/CMakeLists.txt ktoblzcheck-1.52/src/python/CMakeLists.txt
+--- ktoblzcheck-1.52.orig/src/python/CMakeLists.txt	2020-02-04 18:27:25.485349055 +0100
++++ ktoblzcheck-1.52/src/python/CMakeLists.txt	2020-02-04 18:28:11.732029981 +0100
+@@ -1,7 +1,7 @@
+ 
+ install(FILES ktoblzcheck.py DESTINATION ${Python_SITEARCH})
+ 
+-if(Python_Interpreter_FOUND)
++if(FALSE)
+ add_test(
+     NAME test-python
+     COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_ktoblzcheck.py
diff --git a/community/ktoblzcheck/fix_missing_BANKDATA_PATH.patch b/community/ktoblzcheck/fix_missing_BANKDATA_PATH.patch
deleted file mode 100644
index 1447dede17..0000000000
--- a/community/ktoblzcheck/fix_missing_BANKDATA_PATH.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Ensure BANKDATA_PATH is set
- Otherwise the ktoblzcheck binary wouldn't work without providing a bank data
- file. This was found by running the autopkgtest.
-Author: Micha Lenk <micha@debian.org>
-Origin: Debian
-Forwarded: no
-Last-Update: 2019-10-06
-
---- libktoblzcheck-1.50.orig/CMakeLists.txt
-+++ libktoblzcheck-1.50/CMakeLists.txt
-@@ -137,7 +137,7 @@ set(bindir "\${prefix}/${CMAKE_INSTALL_B
- set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
- set(datadir "\${prefix}/${CMAKE_INSTALL_DATADIR}")
--set(BANKDATA_PATH "\${pkgdatadir}")
-+set(BANKDATA_PATH "${CMAKE_INSTALL_FULL_DATADIR}/ktoblzcheck")
- if (Python2_Development_FOUND)
-     set(pythondir "\${prefix}/${Python2_SITEARCH}")
- endif()
---- libktoblzcheck-1.50.orig/config.h.cmake
-+++ libktoblzcheck-1.50/config.h.cmake
-@@ -56,4 +56,6 @@
- /* Define to 1 if you have the ANSI C header files. */
- #cmakedefine STDC_HEADERS "@STDC_HEADERS@"
- /* Version number of package */
--#cmakedefine VERSION "@VERSION@"
-\ No newline at end of file
-+#cmakedefine VERSION "@VERSION@"
-+/* Location of bank data file */
-+#cmakedefine BANKDATA_PATH "@BANKDATA_PATH@"