[Python-modules-commits] r15697 - in packages/pyside/trunk/debian/patches (6 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Mon Feb 14 16:53:50 UTC 2011 

    Date: Monday, February 14, 2011 @ 16:53:46
  Author: odyx-guest
Revision: 15697

Update patches to 1.0.0~beta4

Added:
  packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch
Modified:
  packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
  packages/pyside/trunk/debian/patches/series
Deleted:
  packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch
  packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
  packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch

Deleted: packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch
===================================================================
--- packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch	2011-02-14 16:53:37 UTC (rev 15696)
+++ packages/pyside/trunk/debian/patches/allowMultiplePySideVersions.patch	2011-02-14 16:53:46 UTC (rev 15697)
@@ -1,41 +0,0 @@
-Description: Allow to specify the postfix when looking for pyside.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: not needed (distribution specific)
-Last-Update: 2010-12-02
---- a/libpyside/CMakeLists.txt
-+++ b/libpyside/CMakeLists.txt
-@@ -58,7 +58,8 @@
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside.pc.in"
-                "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" @ONLY)
- # create cmake-config files
--configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" @ONLY)
-+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig${LIBRARY_OUTPUT_SUFFIX}.cmake" @ONLY)
-+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig-indep.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" @ONLY)
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake" @ONLY)
- 
- install(FILES ${libpyside_HEADERS}
-@@ -70,6 +71,8 @@
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake"
-         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig${LIBRARY_OUTPUT_SUFFIX}.cmake"
-+        DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake"
-         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
- 
---- /dev/null
-+++ b/libpyside/PySideConfig-indep.cmake.in
-@@ -0,0 +1,12 @@
-+#  PYSIDE_INCLUDE_DIR   - Directories to include to use PySide
-+#  PYSIDE_LIBRARY       - Files to link against to use PySide
-+#  PYSIDE_PYTHONPATH    - Path to where the PySide Python module files could be found
-+#  PYSIDE_TYPESYSTEMS   - Type system files that should be used by other bindings extending PySide
-+
-+#  Parameters:
-+#  PYSIDE_POSTFIX       - Specific postfix
-+#                           (e.g. -py26   for the python 2.6 specific version;
-+#                                 -py26_d for the python 2.6 with -DPy_DEBUG specific version )
-+
-+SET(PYSIDE_POSTFIX @DEFAULT_PYSIDE_POSTFIX@ CACHE STRING "Python specific pyside postfix (e.g. @DEFAULT_PYSIDE_POSTFIX@ for the default python version)")
-+INCLUDE(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${PYSIDE_POSTFIX}.cmake)

Added: packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch
===================================================================
--- packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/cmake_selectDefaultPython.patch	2011-02-14 16:53:46 UTC (rev 15697)
@@ -0,0 +1,10 @@
+--- a/libpyside/PySideConfig.cmake.in
++++ 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: @DEFAULT_PYTHON_BASENAME@")
++    SET(PYTHON_BASENAME @DEFAULT_PYTHON_BASENAME@)
+ endif()
+ include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig-${PYTHON_BASENAME}.cmake)

Modified: packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2011-02-14 16:53:37 UTC (rev 15696)
+++ packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2011-02-14 16:53:46 UTC (rev 15697)
@@ -5,12 +5,12 @@
 Last-Update: 2010-08-04
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -155,7 +155,7 @@
+@@ -156,7 +156,7 @@
      endif()
  endif()
  
--set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
-+set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --silent)
+-set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
++set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --silent)
  
  add_subdirectory(libpyside)
  if(QT_QTUITOOLS_FOUND AND QT_QTDESIGNER_FOUND)

Deleted: packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch	2011-02-14 16:53:37 UTC (rev 15696)
+++ packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch	2011-02-14 16:53:46 UTC (rev 15697)
@@ -1,30 +0,0 @@
-Description: Includes the -py2* postfix to the libraries. This allows to build
- against all python versions.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: no (not wanted / needed)
-Last-Update: 2010-08-04
-
---- a/libpyside/CMakeLists.txt
-+++ b/libpyside/CMakeLists.txt
-@@ -11,6 +11,11 @@
-     pyside.cpp
- )
- 
-+SET(OLD_CMAKE_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-+SET(OLD_CMAKE_RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX})
-+SET(CMAKE_DEBUG_POSTFIX ${LIBPYSIDE_POSTFIX}${CMAKE_DEBUG_POSTFIX})
-+SET(CMAKE_RELEASE_POSTFIX ${LIBPYSIDE_POSTFIX}${CMAKE_RELEASE_POSTFIX})
-+
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                     ${SHIBOKEN_INCLUDE_DIR}
-                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-@@ -67,3 +72,8 @@
-         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake"
-         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
-+
-+SET(CMAKE_DEBUG_POSTFIX ${OLD_CMAKE_DEBUG_POSTFIX})
-+SET(CMAKE_RELEASE_POSTFIX ${OLD_CMAKE_RELEASE_POSTFIX})
-+UNSET(OLD_CMAKE_DEBUG_POSTFIX)
-+UNSET(OLD_CMAKE_RELEASE_POSTFIX)

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2011-02-14 16:53:37 UTC (rev 15696)
+++ packages/pyside/trunk/debian/patches/series	2011-02-14 16:53:46 UTC (rev 15697)
@@ -1,4 +1,2 @@
-libPythonVersionPostfix.patch
-usePySpecificShiboken.patch
 lessBuildVerbosity.patch
-allowMultiplePySideVersions.patch
+cmake_selectDefaultPython.patch

Deleted: packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
===================================================================
--- packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch	2011-02-14 16:53:37 UTC (rev 15696)
+++ packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch	2011-02-14 16:53:46 UTC (rev 15697)
@@ -1,16 +0,0 @@
-Description: Ensure that the python-specific shiboken generator plugin is used
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: not needed, distro-specific
-Last-Update: 2010-08-04
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -155,7 +155,7 @@
-     endif()
- endif()
- 
--set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
-+set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
- 
- add_subdirectory(libpyside)
- if(QT_QTUITOOLS_FOUND AND QT_QTDESIGNER_FOUND)

More information about the Python-modules-commits mailing list