Run of fresh-snapshots for ros-python-qt-binding

Try this locally (using the package):

debcheckout ros-python-qt-binding
cd ros-python-qt-binding
new-upstream --snapshot

Summary

Merged new upstream version: 0.3.5+git20190729.1b3000d (was: 0.3.5).

Diff

diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
index 1dfa1cb..ce084dd 100644
--- a/cmake/sip_configure.py
+++ b/cmake/sip_configure.py
@@ -26,7 +26,7 @@ class Configuration(sipconfig.Configuration):
             'qt_lib_dir': qtconfig['QT_INSTALL_LIBS'],
             'qt_threaded': 1,
             'qt_version': QtCore.QT_VERSION,
-            'qt_winconfig': 'shared',
+            'qt_winconfig': 'shared exceptions',
         }
         if sys.platform == 'darwin':
             pyqtconfig['qt_framework'] = 1
@@ -63,7 +63,7 @@ try:
     sip_flags = config.pyqt_sip_flags
 except AttributeError:
     # sipconfig.Configuration does not have a pyqt_sip_dir or pyqt_sip_flags attribute
-    sip_dir = sipconfig._pkg_config['default_sip_dir'] + '/PyQt5'
+    sip_dir = os.path.join(sipconfig._pkg_config['default_sip_dir'], 'PyQt5')
     sip_flags = QtCore.PYQT_CONFIGURATION['sip_flags']
 
 try:
@@ -73,8 +73,14 @@ except OSError:
 
 # Run SIP to generate the code.  Note that we tell SIP where to find the qt
 # module's specification files using the -I flag.
+
+sip_bin = config.sip_bin
+# Without the .exe, this might actually be a directory in Windows
+if sys.platform == 'win32' and os.path.isdir(sip_bin):
+    sip_bin += '.exe'
+
 cmd = [
-    config.sip_bin,
+    sip_bin,
     '-c', build_dir,
     '-b', os.path.join(build_dir, build_file),
     '-I', sip_dir,
@@ -130,8 +136,23 @@ for ldflag in ldflags.split('\\ '):
 # redirect location of generated library
 makefile._target = '"%s"' % os.path.join(output_dir, makefile._target)
 
-# Force c++11 for qt5
-makefile.extra_cxxflags.append('-std=c++11')
+# Force c++14
+if sys.platform == 'win32':
+    makefile.extra_cxxflags.append('/std:c++14')
+    # The __cplusplus flag is not properly set on Windows for backwards
+    # compatibilty. This flag sets it correctly
+    makefile.CXXFLAGS.append('/Zc:__cplusplus')
+else:
+    makefile.extra_cxxflags.append('-std=c++14')
+
+# Finalise the Makefile, preparing it to be saved to disk
+makefile.finalise()
+
+# Replace Qt variables from libraries
+libs = makefile.LIBS.as_list()
+for i in range(len(libs)):
+    libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
+makefile.LIBS.set(libs)
 
 # Generate the Makefile itself
 makefile.generate()
diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake
index ce76008..420d309 100644
--- a/cmake/sip_helper.cmake
+++ b/cmake/sip_helper.cmake
@@ -200,10 +200,12 @@ function(build_sip_binding PROJECT_NAME SIP_FILE)
     set(SIP_BUILD_DIR ${sip_BINARY_DIR}/sip/${PROJECT_NAME})
 
     set(INCLUDE_DIRS ${${PROJECT_NAME}_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
-    set(LIBRARIES ${${PROJECT_NAME}_LIBRARIES})
     set(LIBRARY_DIRS ${${PROJECT_NAME}_LIBRARY_DIRS})
     set(LDFLAGS_OTHER ${${PROJECT_NAME}_LDFLAGS_OTHER})
 
+    # SIP configure doesn't handle build configuration keywords
+    catkin_filter_libraries_for_build_configuration(LIBRARIES ${${PROJECT_NAME}_LIBRARIES})
+
     add_custom_command(
         OUTPUT ${SIP_BUILD_DIR}/Makefile
         COMMAND ${PYTHON_EXECUTABLE} ${sip_SIP_CONFIGURE} ${SIP_BUILD_DIR} ${SIP_FILE} ${sip_LIBRARY_DIR} \"${INCLUDE_DIRS}\" \"${LIBRARIES}\" \"${LIBRARY_DIRS}\" \"${LDFLAGS_OTHER}\"
@@ -216,9 +218,15 @@ function(build_sip_binding PROJECT_NAME SIP_FILE)
         file(MAKE_DIRECTORY ${sip_LIBRARY_DIR})
     endif()
 
+    if(WIN32)
+      set(MAKE_EXECUTABLE NMake.exe)
+    else()
+      set(MAKE_EXECUTABLE make)
+    endif()
+
     add_custom_command(
         OUTPUT ${sip_LIBRARY_DIR}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
-        COMMAND make
+        COMMAND ${MAKE_EXECUTABLE}
         DEPENDS ${SIP_BUILD_DIR}/Makefile
         WORKING_DIRECTORY ${SIP_BUILD_DIR}
         COMMENT "Compiling generated code for ${PROJECT_NAME} Python bindings..."
diff --git a/debian/changelog b/debian/changelog
index 609b046..4674eb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ros-python-qt-binding (0.3.5+git20190729.1b3000d-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 07 Sep 2019 07:17:53 +0000
+
 ros-python-qt-binding (0.3.5-4) unstable; urgency=medium
 
   * Add patch for new QT variable (Closes: #934450)
diff --git a/debian/patches/0001-Replace-Qt-variable-in-generated-Makefile.-64.patch b/debian/patches/0001-Replace-Qt-variable-in-generated-Makefile.-64.patch
index bda7aaf..7f57de6 100644
--- a/debian/patches/0001-Replace-Qt-variable-in-generated-Makefile.-64.patch
+++ b/debian/patches/0001-Replace-Qt-variable-in-generated-Makefile.-64.patch
@@ -9,13 +9,13 @@ Subject: Replace Qt variable in generated Makefile. (#64)
  cmake/sip_configure.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
-index 1dfa1cb..bbe689c 100644
---- a/cmake/sip_configure.py
-+++ b/cmake/sip_configure.py
-@@ -133,5 +133,14 @@ makefile._target = '"%s"' % os.path.join(output_dir, makefile._target)
- # Force c++11 for qt5
- makefile.extra_cxxflags.append('-std=c++11')
+Index: ros-python-qt-binding/cmake/sip_configure.py
+===================================================================
+--- ros-python-qt-binding.orig/cmake/sip_configure.py
++++ ros-python-qt-binding/cmake/sip_configure.py
+@@ -154,5 +154,14 @@ for i in range(len(libs)):
+     libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
+ makefile.LIBS.set(libs)
  
 +# Finalise the Makefile, preparing it to be saved to disk
 +makefile.finalise()
diff --git a/package.xml b/package.xml
index 736aa5b..a8cbd34 100644
--- a/package.xml
+++ b/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="2">
   <name>python_qt_binding</name>
   <version>0.3.5</version>
   <description>
@@ -23,12 +23,12 @@
   <author>Dirk Thomas</author>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_export_depend>catkin</buildtool_export_depend>
 
   <build_depend>rosbuild</build_depend>
   <build_depend>qtbase5-dev</build_depend>
-  <build_depend>python-qt5-bindings</build_depend>
 
-  <run_depend>python-qt5-bindings</run_depend>
+  <depend>python-qt5-bindings</depend>
 
   <export>
     <rosbuild cmake_directory="${prefix}/cmake"/>
diff --git a/src/python_qt_binding/binding_helper.py b/src/python_qt_binding/binding_helper.py
index e84cf2f..e395ae3 100644
--- a/src/python_qt_binding/binding_helper.py
+++ b/src/python_qt_binding/binding_helper.py
@@ -82,7 +82,7 @@ def _select_qt_binding(binding_name=None, binding_order=None):
         'QtQuick',
         'QtQuickWidgets',
         'QtScript',
-        'QtScriptTools'
+        'QtScriptTools',
         'QtSensors',
         'QtSerialPort',
         'QtSql',

Full worker log Full build log