Bug#1076901: opencv: diff for NMU version 4.6.0+dfsg-13.2

[pini at debian.org]

X-NMUDIFF-Version: 2.23.4+deb12u1

Control: tags 1076901 + patch
Control: tags 1076901 + pending


Dear maintainer,

I've prepared an NMU for opencv (versioned as 4.6.0+dfsg-13.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru opencv-4.6.0+dfsg/debian/changelog 
opencv-4.6.0+dfsg/debian/changelog
--- opencv-4.6.0+dfsg/debian/changelog  2024-02-29 04:07:04.000000000 
+0100
+++ opencv-4.6.0+dfsg/debian/changelog  2024-08-14 19:35:18.000000000 
+0200
@@ -1,3 +1,11 @@
+opencv (4.6.0+dfsg-13.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch python3.12.patch to fix FTBFS with Python 3.12
+    (closes: #1076901)
+
+ -- Gilles Filippini <pini at debian.org>  Wed, 14 Aug 2024 19:35:18 +0200
+
  opencv (4.6.0+dfsg-13.1) unstable; urgency=medium

    * Non-maintainer upload.
diff -Nru opencv-4.6.0+dfsg/debian/patches/python3.12.patch 
opencv-4.6.0+dfsg/debian/patches/python3.12.patch
--- opencv-4.6.0+dfsg/debian/patches/python3.12.patch   1970-01-01 
01:00:00.000000000 +0100
+++ opencv-4.6.0+dfsg/debian/patches/python3.12.patch   2024-08-14 
19:33:10.000000000 +0200
@@ -0,0 +1,21 @@
+commit 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd
+Author: Sérgio M. Basto <sergio at serjux.com>
+Date:   Sun Oct 1 16:12:25 2023 +0100
+
+    `numpy.distutils` is removed in numpy 1.26 on Python 3.12.
+
+    so we don't use numpy.distutils to get includes dirs of 
python-numpy
+
+Index: opencv-4.6.0+dfsg/cmake/OpenCVDetectPython.cmake
+===================================================================
+--- opencv-4.6.0+dfsg.orig/cmake/OpenCVDetectPython.cmake
++++ opencv-4.6.0+dfsg/cmake/OpenCVDetectPython.cmake
+@@ -216,7 +216,7 @@ if(NOT ${found})
+           message(STATUS "  PYTHON3_NUMPY_INCLUDE_DIRS")
+         else()
+           # Attempt to discover the NumPy include directory. If this 
succeeds, then build python API with NumPy
+-          execute_process(COMMAND "${_executable}" -c "import os; 
os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; 
print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
++          execute_process(COMMAND "${_executable}" -c "import numpy; 
print(numpy.get_include())"
+                           RESULT_VARIABLE _numpy_process
+                           OUTPUT_VARIABLE _numpy_include_dirs
+                           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff -Nru opencv-4.6.0+dfsg/debian/patches/series 
opencv-4.6.0+dfsg/debian/patches/series
--- opencv-4.6.0+dfsg/debian/patches/series     2023-07-16 
23:04:15.000000000 +0200
+++ opencv-4.6.0+dfsg/debian/patches/series     2024-08-14 
19:33:00.000000000 +0200
@@ -9,3 +9,4 @@
  0009-fix-wechat_qrcode-Init-nBytes-after-the-count-value-.patch
  0010-fix-wechat_qrcode-fixed-memory-leaks.patch
  cmake-no-download.patch
+python3.12.patch

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20240814/0a0970ad/attachment.sig>