Control: tags 906168 + patch
Control: tags 906168 + pending
Dear maintainer,
I've prepared an NMU for pyside2 (versioned as 5.11.0-3.1) and uploaded
it to DELAYED/11. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru pyside2-5.11.0/debian/changelog pyside2-5.11.0/debian/changelog
--- pyside2-5.11.0/debian/changelog 2018-07-31 22:33:04.000000000 +0300
+++ pyside2-5.11.0/debian/changelog 2018-08-25 11:50:28.000000000 +0300
@@ -1,3 +1,13 @@
+pyside2 (5.11.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use the default LLVM/Clang. (Closes: #906168)
+ * Add upstream fix for FTBFS on armel/armhf.
+ * Fix debian/libpyside2-5.11.install for triplets that are
+ not *-linux-gnu.
+
+ -- Adrian Bunk <b...@debian.org> Sat, 25 Aug 2018 11:50:28 +0300
+
pyside2 (5.11.0-3) unstable; urgency=medium
* More fixes for builds building only arch any or only arch all.
diff -Nru pyside2-5.11.0/debian/control pyside2-5.11.0/debian/control
--- pyside2-5.11.0/debian/control 2018-07-31 22:33:04.000000000 +0300
+++ pyside2-5.11.0/debian/control 2018-08-25 11:50:28.000000000 +0300
@@ -9,7 +9,7 @@
debhelper (>= 11),
dh-exec,
dh-python,
- libclang-4.0-dev,
+ libclang-dev,
libqt5charts5-dev,
libqt5opengl5-dev,
libqt5sensors5-dev,
@@ -22,7 +22,7 @@
libqt5xmlpatterns5-dev,
libxml2-dev,
libxslt1-dev,
- llvm-4.0-dev,
+ llvm-dev,
pyqt5-dev (>=5.6),
python-all-dev,
python-setuptools,
diff -Nru pyside2-5.11.0/debian/libpyside2-5.11.install pyside2-5.11.0/debian/libpyside2-5.11.install
--- pyside2-5.11.0/debian/libpyside2-5.11.install 2018-07-31 22:33:04.000000000 +0300
+++ pyside2-5.11.0/debian/libpyside2-5.11.install 2018-08-25 11:50:28.000000000 +0300
@@ -1,5 +1,5 @@
#!/usr/bin/dh-exec
-pyside2_install/py*-relwithdebinfo/lib/libpyside2-python2.7.*-linux-gnu.so.* usr/lib/${DEB_HOST_MULTIARCH}/
+pyside2_install/py*-relwithdebinfo/lib/libpyside2-python2.7.${DEB_HOST_MULTIARCH}.so.* usr/lib/${DEB_HOST_MULTIARCH}/
pyside2_install/py2*-relwithdebinfo/lib/python2.7/site-packages/PySide2/_git_pyside_version.py usr/lib/python2.7/dist-packages/PySide2
pyside2_install/py2*-relwithdebinfo/lib/python2.7/site-packages/PySide2/__init__.py usr/lib/python2.7/dist-packages/PySide2
pyside2_install/py2*-relwithdebinfo/lib/python2.7/site-packages/PySide2/_config.py usr/lib/python2.7/dist-packages/PySide2
diff -Nru pyside2-5.11.0/debian/patches/0001-PySide2-QtGui-Fix-build-of-Debian-armel-armh-OpenGL-.patch pyside2-5.11.0/debian/patches/0001-PySide2-QtGui-Fix-build-of-Debian-armel-armh-OpenGL-.patch
--- pyside2-5.11.0/debian/patches/0001-PySide2-QtGui-Fix-build-of-Debian-armel-armh-OpenGL-.patch 1970-01-01 02:00:00.000000000 +0200
+++ pyside2-5.11.0/debian/patches/0001-PySide2-QtGui-Fix-build-of-Debian-armel-armh-OpenGL-.patch 2018-08-25 11:50:28.000000000 +0300
@@ -0,0 +1,65 @@
+From 83b42ca06c834ad07985397764ebe2d7a58234ce Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <friedemann.kle...@qt.io>
+Date: Wed, 1 Aug 2018 09:09:08 +0200
+Subject: PySide2/QtGui: Fix build of Debian/armel,armh (OpenGL ES 2)
+
+Add optional class checks to QtGui and use them for
+QOpenGLTimeMonitor and QOpenGLTimerQuery.
+
+Task-number: PYSIDE-764
+Change-Id: Ib33ec1d64c40f53aa31059e4ca9422707636375d
+Reviewed-by: Christian Tismer <tis...@stackless.com>
+---
+ sources/pyside2/PySide2/QtGui/CMakeLists.txt | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+index bee58bde..1fe743c0 100644
+--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
++++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+@@ -2,6 +2,12 @@ project(QtGui)
+
+ qt5_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h")
+
++set(QtGui_OPTIONAL_SRC)
++set(QtGui_DROPPED_ENTRIES)
++
++check_qt_class(QtGui QOpenGLTimeMonitor QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
++check_qt_class(QtGui QOpenGLTimerQuery QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
++
+ set(QtGui_SRC
+ ${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp
+ ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp
+@@ -96,8 +102,6 @@ ${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp
+ ${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp
+ ${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp
+ ${QtGui_GEN_DIR}/qopengltextureblitter_wrapper.cpp
+-${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp
+-${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp
+ ${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp
+ ${QtGui_GEN_DIR}/qopenglvertexarrayobject_wrapper.cpp
+ ${QtGui_GEN_DIR}/qopenglvertexarrayobject_binder_wrapper.cpp
+@@ -203,7 +207,7 @@ ${QtGui_GEN_DIR}/qwhatsthisclickedevent_wrapper.cpp
+ ${QtGui_GEN_DIR}/qwheelevent_wrapper.cpp
+ ${QtGui_GEN_DIR}/qwindow_wrapper.cpp
+ ${QtGui_GEN_DIR}/qwindowstatechangeevent_wrapper.cpp
+-
++${QtGui_OPTIONAL_SRC}
+ # module is always needed
+ ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp
+ )
+@@ -237,7 +241,10 @@ create_pyside_module(QtGui
+ QtGui_SOURCE_DIR
+ QtGui_SRC
+ QPYTEXTOBJECT_MOC
+- ${QtGui_BINARY_DIR}/typesystem_gui.xml)
++ ${QtGui_BINARY_DIR}/typesystem_gui.xml
++ ""
++ ""
++ QtGui_DROPPED_ENTRIES)
+
+ install(FILES ${pyside2_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide2/QtGui/)
+
+--
+2.11.0
+
diff -Nru pyside2-5.11.0/debian/patches/series pyside2-5.11.0/debian/patches/series
--- pyside2-5.11.0/debian/patches/series 2018-07-31 22:33:04.000000000 +0300
+++ pyside2-5.11.0/debian/patches/series 2018-08-25 11:50:28.000000000 +0300
@@ -3,3 +3,4 @@
drop-git-requirement.patch
update-patchelf.patch
remove-privacy-breach-in-doc.patch
+0001-PySide2-QtGui-Fix-build-of-Debian-armel-armh-OpenGL-.patch
