user [email protected] usertag 1060744 + bsp-2025-04-at-vienna thank you
Author: Alois Schlögl <[email protected]> Bug-Debian: https://bugs.debian.org/1060744 Applied-Upstream: https://github.com/neurodroid/stimfit/commit/28130ed88799913651bda52eac62428901293fb4 The attached patch fixes the bug.
Description: port from sip4 to sip6 ... ... as suggested in #1060744 Author: Alois Schlögl <[email protected]> Bug-Debian: https://bugs.debian.org/1060744 Applied-Upstream: https://github.com/neurodroid/stimfit/commit/28130ed88799913651bda52eac62428901293fb4 stimfit (0.16.7-1) unstable; urgency=medium . * Add build dependency on python3-setuptools (Closes: #1100323) * Drop menu entry in favour of desktop file Author: Christoph Schmidt-Hieber <[email protected]> Bug-Debian: https://bugs.debian.org/1100323 --- stimfit-0.16.7.orig/dist/debian/control +++ stimfit-0.16.7/dist/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Christoph Schmidt-Hieber <[email protected]> Uploaders: Yaroslav Halchenko <[email protected]> -Build-Depends: debhelper (>= 10), dh-python, libbiosig-dev (>= 2.1.0), python3-dev, python3-numpy, python3-setuptools, libhdf5-dev, swig, python3-wxgtk4.0 (>= 4.0.7), libwxgtk3.2-dev, libfftw3-dev, liblapack-dev, chrpath, help2man, zlib1g-dev, pkgconf +Build-Depends: debhelper (>= 10), dh-python, libbiosig-dev (>= 2.1.0), python3-dev, python3-numpy, python3-setuptools, sip-tools, libhdf5-dev, swig, python3-wxgtk4.0 (>= 4.0.7), libwxgtk3.2-dev, libfftw3-dev, liblapack-dev, chrpath, help2man, zlib1g-dev, pkgconf Standards-Version: 4.7.2 Homepage: http://www.stimfit.org --- stimfit-0.16.7.orig/src/stimfit/Makefile.am +++ stimfit-0.16.7/src/stimfit/Makefile.am @@ -1,5 +1,9 @@ pkglib_LTLIBRARIES = libstimfit.la +sip.h: FORCE + sip-module PyQt5.sip --sip-h +FORCE: + libstimfit_la_SOURCES = ./stf.cpp \ ./gui/app.cpp ./gui/unopt.cpp ./gui/doc.cpp ./gui/copygrid.cpp ./gui/graph.cpp \ ./gui/printout.cpp ./gui/parentframe.cpp ./gui/childframe.cpp ./gui/view.cpp ./gui/table.cpp ./gui/zoom.cpp \ --- stimfit-0.16.7.orig/src/stimfit/gui/app.h +++ stimfit-0.16.7/src/stimfit/gui/app.h @@ -205,7 +205,7 @@ enum { #endif #ifdef WITH_PYTHON #if PY_MAJOR_VERSION >= 3 - #include <wxPython/sip.h> + #include "sip.h" #include <wxPython/wxpy_api.h> #else #include <wx/wxPython/wxPython.h> --- stimfit-0.16.7.orig/src/stimfit/gui/unopt.cpp +++ stimfit-0.16.7/src/stimfit/gui/unopt.cpp @@ -30,7 +30,7 @@ #pragma GCC diagnostic ignored "-Wwrite-strings" #endif #if PY_MAJOR_VERSION >= 3 - #include <wxPython/sip.h> + #include "sip.h" #include <wxPython/wxpy_api.h> #define PyString_Check PyUnicode_Check #define PyString_AsString PyBytes_AsString --- stimfit-0.16.7.orig/src/stimfit/py/pystf.cxx +++ stimfit-0.16.7/src/stimfit/py/pystf.cxx @@ -42,7 +42,7 @@ #ifdef WITH_PYTHON #if PY_MAJOR_VERSION >= 3 - #include <wxPython/sip.h> + #include "sip.h" #include <wxPython/wxpy_api.h> #define PyInt_FromLong PyLong_FromLong #define PyString_AsString PyBytes_AsString
