1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
Description: Fix includes for numpy 2
Author: Adrian Bunk <bunk@debian.org>
Bug-Debian: https://bugs.debian.org/1094696
Reviewed-By: Rafael Laboissière <rafael@debian.org>
Last-Updated: 2025-02-03
--- plplot-5.15.0+dfsg2.orig/bindings/python/Pltk_init.i
+++ plplot-5.15.0+dfsg2/bindings/python/Pltk_init.i
@@ -24,7 +24,7 @@
%{
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <Python.h>
-#include <arrayobject.h>
+#include <numpy/arrayobject.h>
#include "plplot.h"
#include "plplotP.h"
--- plplot-5.15.0+dfsg2.orig/bindings/python/plplotc.i
+++ plplot-5.15.0+dfsg2/bindings/python/plplotc.i
@@ -46,7 +46,7 @@
%{
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include <arrayobject.h>
+#include <numpy/arrayobject.h>
#include "plplot.h"
#include "plplotP.h"
--- plplot-5.15.0+dfsg2.orig/cmake/modules/python.cmake
+++ plplot-5.15.0+dfsg2/cmake/modules/python.cmake
@@ -118,8 +118,8 @@ if(ENABLE_python)
# Double-check that all is well with that choice.
find_path(
NUMPY_INCLUDE_PATH
- arrayobject.h
- ${NUMPY_INCLUDE_PATH_PARENT}/numpy
+ numpy/arrayobject.h
+ ${NUMPY_INCLUDE_PATH_PARENT}
)
endif(NUMPY_ERR)
|