Hello community, here is the log from the commit of package python-pivy for openSUSE:Factory checked in at 2019-02-06 14:07:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pivy (Old) and /work/SRC/openSUSE:Factory/.python-pivy.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pivy" Wed Feb 6 14:07:50 2019 rev:6 rq:671954 version:0.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pivy/python-pivy.changes 2018-10-11 11:57:29.921867392 +0200 +++ /work/SRC/openSUSE:Factory/.python-pivy.new.28833/python-pivy.changes 2019-02-06 14:07:51.814644364 +0100 @@ -1,0 +2,6 @@ +Mon Feb 4 12:56:26 UTC 2019 - Wolfgang Bauer <[email protected]> + +- Add Fix-issue-39-PyUnicode_AsUTF8-returns-const-char.patch to fix + build in Factory + +------------------------------------------------------------------- New: ---- Fix-issue-39-PyUnicode_AsUTF8-returns-const-char.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pivy.spec ++++++ --- /var/tmp/diff_new_pack.dqzXZo/_old 2019-02-06 14:07:52.434644250 +0100 +++ /var/tmp/diff_new_pack.dqzXZo/_new 2019-02-06 14:07:52.434644250 +0100 @@ -26,6 +26,8 @@ Group: Development/Libraries/Python Url: https://github.com/FreeCAD/pivy Source0: https://github.com/FreeCAD/pivy/archive/%{version}.tar.gz#/Pivy-%{version}.tar.gz +# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/pivy/issues/39 +Patch0: Fix-issue-39-PyUnicode_AsUTF8-returns-const-char.patch BuildRequires: %{python_module devel} BuildRequires: Coin-devel BuildRequires: SoQt-devel @@ -53,6 +55,7 @@ %prep %setup -q -n pivy-%{version} +%patch0 -p1 %build # use setup_old.py until we have a Coin with cmake support ++++++ Fix-issue-39-PyUnicode_AsUTF8-returns-const-char.patch ++++++ >From d828a332d86a2af4ffbb6a52aaa80700ff48bb16 Mon Sep 17 00:00:00 2001 From: Peter Lama <[email protected]> Date: Fri, 24 Aug 2018 17:25:47 -0700 Subject: [PATCH] Fix issue #39: PyUnicode_AsUTF8 returns const char* Even with python 2, it doesn't seem like char* is needed --- Inventor/nodes/SoMarkerSet.i | 4 ++-- Inventor/sensors/SoSensor.i | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Inventor/nodes/SoMarkerSet.i b/Inventor/nodes/SoMarkerSet.i index fddbf98..d4187b0 100644 --- a/Inventor/nodes/SoMarkerSet.i +++ b/Inventor/nodes/SoMarkerSet.i @@ -5,7 +5,7 @@ short WIDTH, HEIGHT; size.getValue(WIDTH, HEIGHT); short BYTEWIDTH = (WIDTH + 7) / 2; - char* coin_marker; + const char* coin_marker; #ifdef PY_2 if (PyString_Check(string)) { @@ -49,4 +49,4 @@ delete[] bitmapbytes; bitmapbytes = NULL; } -} \ No newline at end of file +} diff --git a/Inventor/sensors/SoSensor.i b/Inventor/sensors/SoSensor.i index 72ac01e..ffae79b 100644 --- a/Inventor/sensors/SoSensor.i +++ b/Inventor/sensors/SoSensor.i @@ -4,7 +4,7 @@ SoSensorPythonCB(void * data, SoSensor * sensor) { PyGILState_STATE gil = PyGILState_Ensure(); swig_type_info * swig_type = 0; - char * sensor_cast_name = NULL; + const char * sensor_cast_name = NULL; PyObject * func, * arglist; PyObject * result, * pysensor;
