[Python-modules-commits] r19566 - in packages/pyside/trunk/debian (4 files)

Fri Dec 9 11:01:05 UTC 2011

Date: Friday, December 9, 2011 @ 11:01:04
  Author: odyx
Revision: 19566

Refresh patches for 1.0.9

- drop the upstream fix for the hardening flags FTBFS;
- refresh the others;
- slightly amend debian/rules to cope with the refreshing.

Signed-off-by: Didier Raboud <odyx at debian.org>

Modified:
  packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch
  packages/pyside/trunk/debian/patches/series
  packages/pyside/trunk/debian/rules
Deleted:
  packages/pyside/trunk/debian/patches/u77a011a_Fix_FTBFS_with_hardening_flags.patch

Modified: packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch
===================================================================

--- packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-12-09 11:00:52 UTC (rev 19565)
+++ packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-12-09 11:01:04 UTC (rev 19566)
@@ -6,10 +6,9 @@
 +++ b/libpyside/PySideConfig.cmake.in
 @@ -1,5 +1,5 @@
  if (NOT PYTHON_BASENAME)
--    message(STATUS "Using default python: @PYTHON_BASENAME@")
--    SET(PYTHON_BASENAME @PYTHON_BASENAME@)
+-    message(STATUS "Using default python: @SHIBOKEN_PYTHON_SUFFIX@")
+-    SET(PYTHON_BASENAME @SHIBOKEN_PYTHON_SUFFIX@)
 +    message(STATUS "Using default python: @DEFAULT_PYTHON_BASENAME@")
 +    SET(PYTHON_BASENAME @DEFAULT_PYTHON_BASENAME@)
  endif()
--include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake)
-+include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig-${PYTHON_BASENAME}.cmake)
+ include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2011-12-09 11:00:52 UTC (rev 19565)
+++ packages/pyside/trunk/debian/patches/series	2011-12-09 11:01:04 UTC (rev 19566)
@@ -1,3 +1,2 @@
 lessBuildVerbosity.patch
 cmake_selectDefaultPython.patch
-u77a011a_Fix_FTBFS_with_hardening_flags.patch

Deleted: packages/pyside/trunk/debian/patches/u77a011a_Fix_FTBFS_with_hardening_flags.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u77a011a_Fix_FTBFS_with_hardening_flags.patch	2011-12-09 11:00:52 UTC (rev 19565)
+++ packages/pyside/trunk/debian/patches/u77a011a_Fix_FTBFS_with_hardening_flags.patch	2011-12-09 11:01:04 UTC (rev 19566)
@@ -1,95 +0,0 @@
-commit 77a011ace9986092134aeabf6e12914ea5b85084
-Author: Hugo Parente Lima <hugo.pl at gmail.com>
-Date:   Mon Oct 31 15:12:00 2011 -0200
-
-    Fix bug 1012 - "FTBFS with hardening flags enabled"
-    
-    Reviewer: Lauro Moura <lauro.neto at openbossa.org>
-              Marcelo Lira <marcelo.lira at openbossa.org>
-
-diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
-index f24d403..811f41a 100644
---- a/PySide/QtCore/typesystem_core.xml
-+++ b/PySide/QtCore/typesystem_core.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0"?>
- <!--
-     This file is part of PySide project.
--    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-+    Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
-     Contact: PySide team <contact at pyside.org>
- 
-     This library is free software; you can redistribute it and/or
-@@ -26,13 +26,10 @@
-     <function signature="qAtan(qreal)" since="4.6" />
-     <function signature="qAtan2(qreal,qreal)" since="4.6" />
-     <function signature="qChecksum(const char*,uint)" />
--    <function signature="qCritical(const char*)" />
--    <function signature="qDebug(const char*)" />
-     <function signature="qExp(qreal)" since="4.6" />
-     <function signature="qFabs(qreal)" since="4.6" />
-     <function signature="qFastCos(qreal)" since="4.6"/>
-     <function signature="qFastSin(qreal)" since="4.6" />
--    <function signature="qFatal(const char*)" />
-     <function signature="qFuzzyCompare(double,double)" />
-     <function signature="qFuzzyIsNull(double)" since="4.6" />
-     <function signature="qIsFinite(double)" />
-@@ -43,10 +40,40 @@
-     <function signature="qTan(qreal)" since="4.6" />
-     <function signature="qtTrId(const char *, int)" since="4.6" />
-     <function signature="qVersion()" />
--    <function signature="qWarning(const char*)" />
-     <function signature="qrand()" />
-     <function signature="qsrand(uint)" />
- 
-+    <template name="use_stream_for_format_security">
-+        // Uses the stream version for security reasons
-+        // see gcc man page at -Wformat-security
-+        %FUNCTION_NAME() << %1;
-+    </template>
-+
-+    <add-function signature="qDebug(const char*)">
-+        <inject-code>
-+            <insert-template name="use_stream_for_format_security" />
-+        </inject-code>
-+    </add-function>
-+    <add-function signature="qCritical(const char*)">
-+        <inject-code>
-+            <insert-template name="use_stream_for_format_security" />
-+        </inject-code>
-+    </add-function>
-+    <add-function signature="qFatal(const char*)">
-+        <inject-code>
-+            // qFatal doesn't have a stream version, so we do a
-+            // qWarning call followed by a qFatal() call using a
-+            // literal.
-+            qWarning() << %1;
-+            qFatal("[A qFatal() call was made from Python code]");
-+        </inject-code>
-+    </add-function>
-+    <add-function signature="qWarning(const char*)">
-+        <inject-code>
-+            <insert-template name="use_stream_for_format_security" />
-+        </inject-code>
-+    </add-function>
-+
-     <!-- TODO: We do not support void* or const void* as arg -->
-     <rejection class="QMetaObject" function-name="activate"/>
-     <rejection class="QMetaObject" function-name="metacall"/>
-@@ -2106,7 +2133,7 @@
-         <modify-argument index="2">
-             <remove-argument />
-         </modify-argument>
--        <inject-code>            
-+        <inject-code>
-             %CPPSELF.%FUNCTION_NAME(Shiboken::String::toCString(%PYARG_1), Shiboken::String::len(%PYARG_1));
-         </inject-code>
-     </modify-function>
-@@ -3421,6 +3448,6 @@ s1.addTransition(button.clicked, s1h)</code>
-   <!-- TODO: this need be removed -->
-   <suppress-warning text="skipping function '*', unmatched return type '*'"/>
-   <suppress-warning text="skipping function '*', unmatched parameter type '*'"/>
--  
-+
- 
- </typesystem>

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-12-09 11:00:52 UTC (rev 19565)
+++ packages/pyside/trunk/debian/rules	2011-12-09 11:01:04 UTC (rev 19566)
@@ -45,7 +45,7 @@
 	$(CMAKE_COMMON_OPTIONS) \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DPYTHON_SUFFIX=-python$* \
-	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
+	-DDEFAULT_PYTHON_BASENAME=-python${DEFAULT_PY}
 
 override_dh_auto_configure_dbg_3-%:
 	mkdir -p build-$*-dbg
@@ -60,7 +60,7 @@
 	$(CMAKE_COMMON_OPTIONS) \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DPYTHON_SUFFIX=.cpython-$(subst .,,$*)mu \
-	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
+	-DDEFAULT_PYTHON_BASENAME=-python${DEFAULT_PY}
 
 #### BUILD ####
 


