[neon/backports-jammy/zxing-cpp-jammy/Neon/unstable] debian/patches: fingers crossed

Carlos De Maine null at kde.org
Tue Jan 17 03:58:16 GMT 2023


Git commit b4a0ac443555202fec08e9df237307ff7924cb15 by Carlos De Maine.
Committed on 17/01/2023 at 03:58.
Pushed by carlosdem into branch 'Neon/unstable'.

fingers crossed

M  +6    -9    debian/patches/0002-fix-python-wrapper-build.patch

https://invent.kde.org/neon/backports-jammy/zxing-cpp-jammy/commit/b4a0ac443555202fec08e9df237307ff7924cb15

diff --git a/debian/patches/0002-fix-python-wrapper-build.patch b/debian/patches/0002-fix-python-wrapper-build.patch
index e7f3f75..ec8a4e8 100644
--- a/debian/patches/0002-fix-python-wrapper-build.patch
+++ b/debian/patches/0002-fix-python-wrapper-build.patch
@@ -6,13 +6,12 @@ Subject: fix python wrapper build
  wrappers/python/CMakeLists.txt | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
-index eadfc04..2fe924b 100644
---- a/wrappers/python/CMakeLists.txt
-+++ b/wrappers/python/CMakeLists.txt
-@@ -59,10 +59,20 @@ else()
+diff -u a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
+--- a/wrappers/python/CMakeLists.txt    2023-01-17 13:31:15.224642279 +1000
++++ b/wrappers/python/CMakeLists.txt    2023-01-17 13:32:25.472679641 +1000
+@@ -59,8 +59,12 @@
  endif()
- 
+
  # build the python module
 +find_package(PkgConfig REQUIRED)
 +pkg_check_modules(python3 REQUIRED python3)
@@ -20,8 +19,6 @@ index eadfc04..2fe924b 100644
  target_link_libraries(zxingcpp PRIVATE ZXing::ZXing)
 +target_include_directories(zxingcpp PUBLIC ${python3_INCLUDE_DIRS})
 +target_compile_options(zxingcpp PUBLIC ${python3_CFLAGS_OTHER})
- 
+
  if (BUILD_READERS AND BUILD_WRITERS)
      add_test(NAME PythonTest COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test.py -v)
-     set_property(TEST PythonTest PROPERTY ENVIRONMENT PYTHONPATH=$<TARGET_FILE_DIR:zxingcpp>)
- endif()


More information about the Neon-commits mailing list