diff --git a/community/ktoblzcheck/0001-Use-cmake_path-over-get_filename_component.patch b/community/ktoblzcheck/0001-Use-cmake_path-over-get_filename_component.patch new file mode 100644 index 00000000000..1ee11560ccf --- /dev/null +++ b/community/ktoblzcheck/0001-Use-cmake_path-over-get_filename_component.patch @@ -0,0 +1,42 @@ +From 893086366f8ab2e0dc4af5452cc3a7dbd92281a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= +Date: Wed, 3 Jan 2024 04:41:57 +0100 +Subject: [PATCH] Use cmake_path over get_filename_component + +get_filename_component has been superseded by cmake_path in CMake 3.20. +--- + CMakeLists.txt | 4 ++-- + cmake/Macros.cmake | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e084b2..aa5f1dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,11 +185,11 @@ if(ENABLE_BANKDATA_DOWNLOAD) + else() + # to be removed + file(GLOB BANKDATA_FILEPATH "${BANKDATA_SRCPATH}/bankdata_*.txt") +- get_filename_component(BANKDATA_FILE ${BANKDATA_FILEPATH} NAME) ++ cmake_path(GET BANKDATA_FILEPATH FILENAME BANKDATA_FILE) + message(STATUS "Using present bank data file ${BANKDATA_FILEPATH}") + + file(GLOB BANKDATA_RAW_FILEPATH "${BANKDATA_SRCPATH}/blz_*.txt") +- get_filename_component(BANKDATA_RAW_FILE ${BANKDATA_RAW_FILEPATH} NAME) ++ cmake_path(GET BANKDATA_RAW_FILEPATH FILENAME BANKDATA_RAW_FILE) + message(STATUS "Using present raw bank data file ${BANKDATA_RAW_FILEPATH}") + endif() + set(BANKDATA_TEST_FILEPATH "${BANKDATA_SRCPATH}/bankdata_test.txt") +diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake +index 6fb0f55..74aa388 100644 +--- a/cmake/Macros.cmake ++++ b/cmake/Macros.cmake +@@ -17,7 +17,7 @@ macro(setup_filenames) + message(STATUS "Using data file ${DATA_FILEPATH} for key ${__KEY}") + else() + file(GLOB DATA_FILEPATH "${CMAKE_CURRENT_SOURCE_DIR}/${__PREFIX}_*.txt") +- get_filename_component(DATA_FILE ${DATA_FILEPATH} NAME) ++ cmake_path(GET DATA_FILEPATH FILENAME DATA_FILE) + message(STATUS "Using present data file '${DATA_FILEPATH}' for key ${__KEY}") + endif() + set(DATA_FILEPATH_${__KEY} ${DATA_FILEPATH} CACHE STRING "raw data file path" FORCE) diff --git a/community/ktoblzcheck/APKBUILD b/community/ktoblzcheck/APKBUILD index c9fb65930a5..419d9a76d95 100644 --- a/community/ktoblzcheck/APKBUILD +++ b/community/ktoblzcheck/APKBUILD @@ -1,15 +1,18 @@ # Contributor: Sören Tempel # Maintainer: Sören Tempel pkgname=ktoblzcheck -pkgver=1.53 -pkgrel=4 +pkgver=1.55 +pkgrel=0 pkgdesc="A library to check account numbers and bank codes of german banks" url="https://ktoblzcheck.sourceforge.net/" arch="all" license="LGPL-2.1-or-later" -makedepends="cmake python3 python3-dev" +makedepends="cmake python3 python3-dev py3-openpyxl sqlite-dev curl-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz" +options="net" +source="https://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz + 0001-Use-cmake_path-over-get_filename_component.patch + fix-tests.patch" build() { cmake -B build \ @@ -17,16 +20,19 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DENABLE_BANKDATA_DOWNLOAD=OFF - make -C build + cmake --build build } check() { - cd build - ctest + ctest --test-dir build --output-on-failure } package() { - DESTDIR="$pkgdir" make -C build install + DESTDIR="$pkgdir" cmake --install build } -sha512sums="7264d436e4fd5a52fbc7a0ffb372f8cf902c3cd631a4822f735813f8f36b90644f4f23ad71d52525dd6e2a98f1d896d8863f4bf926fdbf3491008e43f9841776 ktoblzcheck-1.53.tar.gz" +sha512sums=" +1d8d54172ac02ae8562cbefeacce12229777e5fbd11bbbd71ba952c9a31a2f68ac56a30891fd75db2ee880d1c92a14271a4b07314726013b827b9d4ac7281b87 ktoblzcheck-1.55.tar.gz +c416e07c236fc2210ea6aea4cf8c1d638e06009a6b1c97d7de71e6775aab582575bc05418ff5df9d6f6c30225be26b09fef6997c80d7269cf0a1691b3b5032f6 0001-Use-cmake_path-over-get_filename_component.patch +b3ea1c3e45da10682ff62f8547246c042c750eb1103e48d56c2965f8e3ff842444eedd73bbd0dc32817c5eb5c674a4faae5e24e6ae6794d753b51476c28ff255 fix-tests.patch +" diff --git a/community/ktoblzcheck/fix-tests.patch b/community/ktoblzcheck/fix-tests.patch new file mode 100644 index 00000000000..532382c6493 --- /dev/null +++ b/community/ktoblzcheck/fix-tests.patch @@ -0,0 +1,13 @@ +diff -upr ktoblzcheck-1.55.orig/src/python/test_ktoblzcheck.py ktoblzcheck-1.55/src/python/test_ktoblzcheck.py +--- ktoblzcheck-1.55.orig/src/python/test_ktoblzcheck.py 2024-01-03 21:14:37.299488606 +0100 ++++ ktoblzcheck-1.55/src/python/test_ktoblzcheck.py 2024-01-03 21:14:47.899508730 +0100 +@@ -16,7 +16,7 @@ class TestAccountNumberCheck(unittest.Te + self.assertIsInstance(res, ktoblzcheck.Record) + if isinstance(res, ktoblzcheck.Record): + self.assertEqual(res.bankId.decode('ascii'), '20010020') +- self.assertEqual(res.bankName.decode('ascii'), 'Postbank Ndl der Deutsche Bank') ++ self.assertEqual(res.bankName.decode('ascii'), 'Postbank Ndl der DB Privat- und Firmenkundenbank') + self.assertEqual(res.location.rstrip().decode('ascii'), 'Hamburg') + + def test_findBank_fail(self): +Only in ktoblzcheck-1.55/src/python: test_ktoblzcheck.py.orig