[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#946082: fixed in pyside2 5.13.2-2.2



Hello,

full patch attached to this email!

G.
diff -Nru pyside2-5.13.2/debian/changelog pyside2-5.13.2/debian/changelog
--- pyside2-5.13.2/debian/changelog	2019-11-22 10:28:55.000000000 +0100
+++ pyside2-5.13.2/debian/changelog	2019-12-29 22:44:55.000000000 +0100
@@ -1,3 +1,19 @@
+pyside2 (5.13.2-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Update cmake paths for new locations
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 29 Dec 2019 22:44:55 +0100
+
+pyside2 (5.13.2-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add an explicit shiboken dependency to fix FTBFS for reverse-dependencies
+    cmake based, who expect it being installed (Closes: #946082)
+    - thanks Tommaso Colombo for the patch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 24 Dec 2019 09:22:39 +0100
+
 pyside2 (5.13.2-2) unstable; urgency=medium
 
   * Do not build-depends on libqt5datavisualization5-dev on mipsel and
diff -Nru pyside2-5.13.2/debian/control pyside2-5.13.2/debian/control
--- pyside2-5.13.2/debian/control	2019-11-22 10:28:55.000000000 +0100
+++ pyside2-5.13.2/debian/control	2019-12-28 11:55:28.000000000 +0100
@@ -144,7 +144,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libshiboken2-py3-5.13 (= ${binary:Version}), python3-dev
+ libshiboken2-py3-5.13 (= ${binary:Version}), shiboken2 (= ${binary:Version}), python3-dev
 Description: CPython bindings generator for C++ libraries (development files)
  Shiboken2 is a bindings generator for C++ libraries that outputs CPython
  source code. It collects information from library headers, and then
diff -Nru pyside2-5.13.2/debian/set-paths pyside2-5.13.2/debian/set-paths
--- pyside2-5.13.2/debian/set-paths	2019-11-22 10:28:55.000000000 +0100
+++ pyside2-5.13.2/debian/set-paths	2019-12-29 22:44:55.000000000 +0100
@@ -7,6 +7,10 @@
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
         sed -i "s|build.*relwithdebinfo|usr|" \
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
+        sed -i "s|\${PACKAGE_PREFIX_DIR}|/usr|" \
+	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
+        sed -i "s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|" \
+	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
 done
 
 package="libpyside2-dev"
@@ -15,8 +19,16 @@
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
         sed -i "s|build.*relwithdebinfo|usr|" \
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
+        sed -i "s|\${PACKAGE_PREFIX_DIR}|/usr|" \
+	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
+        sed -i "s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|" \
+	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
 done
 
 # Set correctly the python path for pyside2 (Python3)
-sed -i "s|^SET(PYSIDE_PYTHONPATH.*|SET(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages\")|" \
-    debian/libpyside2-dev/usr/lib/$DEB_HOST_MULTIARCH/cmake/PySide2-$MAIN_VERSION_UPSTREAM/PySide2Config.cpython-3*m-$DEB_HOST_MULTIARCH.cmake
+sed -i "s|^set_and_check(PYSIDE_PYTHONPATH.*|set_and_check(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages/PySide2\")|" \
+    debian/libpyside2-dev/usr/lib/$DEB_HOST_MULTIARCH/cmake/PySide2-$MAIN_VERSION_UPSTREAM/PySide2Config.cpython-3*-$DEB_HOST_MULTIARCH.cmake
+
+# Set correctly the python path for shiboken2 (Python3)
+sed -i "s|^set_and_check(SHIBOKEN_PYTHON_MODULE_DIR.*|set_and_check(SHIBOKEN_PYTHON_MODULE_DIR \"/usr/lib/python3/dist-packages/shiboken2\")|" \
+    debian/libshiboken2-dev/usr/lib/$DEB_HOST_MULTIARCH/cmake/Shiboken2-$MAIN_VERSION_UPSTREAM/Shiboken2Config.cpython-3*-$DEB_HOST_MULTIARCH.cmake

Reply to: