diff --git a/python-matplotlib-qhull.patch b/python-matplotlib-qhull.patch new file mode 100644 index 0000000..1e266c3 --- /dev/null +++ b/python-matplotlib-qhull.patch @@ -0,0 +1,24 @@ +diff -up matplotlib-1.5.2rc2/setupext.py.qh matplotlib-1.5.2rc2/setupext.py +--- matplotlib-1.5.2rc2/setupext.py.qh 2016-06-04 00:09:22.605827942 +0200 ++++ matplotlib-1.5.2rc2/setupext.py 2016-06-04 00:09:22.611827972 +0200 +@@ -1018,7 +1018,7 @@ class Qhull(SetupPackage): + # present on this system, so check if the header files can be + # found. + include_dirs = [ +- os.path.join(x, 'qhull') for x in get_include_dirs()] ++ os.path.join(x, 'libqhull') for x in get_include_dirs()] + if has_include_file(include_dirs, 'qhull_a.h'): + return 'Using system Qhull (version unknown, no pkg-config info)' + else: +diff -up matplotlib-1.5.2rc2/src/qhull_wrap.c.qh matplotlib-1.5.2rc2/src/qhull_wrap.c +--- matplotlib-1.5.2rc2/src/qhull_wrap.c.qh 2016-05-27 04:19:34.000000000 +0200 ++++ matplotlib-1.5.2rc2/src/qhull_wrap.c 2016-06-04 00:09:22.608827957 +0200 +@@ -7,7 +7,7 @@ + */ + #include "Python.h" + #include "numpy/noprefix.h" +-#include "qhull/qhull_a.h" ++#include + #include + + diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 1bc376e..48d9d09 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -64,6 +64,7 @@ Patch6: python-matplotlib-use-system-six.patch Patch7: python-matplotlib-disable-failing-tests.patch # https://github.com/matplotlib/matplotlib/issues/6538 Patch8: python-matplotlib-disable-failing-tests-armv7hl.patch +Patch9: python-matplotlib-qhull.patch BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -387,8 +388,7 @@ done %if 0%{?fedora} > 24 # Installation paths changed -sed -i -e 's,\"qhull/qhull_a.h\",,' src/qhull_wrap.c -sed -i -e "s|os.path.join(x, 'qhull')|os.path.join(x, 'libqhull')|" setupext.py +%patch9 -p1 -b .qh %endif chmod -x lib/matplotlib/mpl-data/images/*.svg