[Python-modules-commits] r24402 - in packages/shiboken/trunk/debian/patches (2 files)

[odyx at users.alioth.debian.org]

    Date: Thursday, May 16, 2013 @ 15:08:42
  Author: odyx
Revision: 24402

Add python3.3-and-multiarch.patch to add python3.3 to list of python versions and deal with multiarch include paths

Added:
  packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch
Modified:
  packages/shiboken/trunk/debian/patches/series

Added: packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch	                        (rev 0)
+++ packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch	2013-05-16 15:08:42 UTC (rev 24402)
@@ -0,0 +1,37 @@
+Bug: https://bugreports.qt-project.org/browse/PYSIDE-146
+Forwarded: yes
+--- a/cmake/Modules/FindPython3Libs.cmake
++++ b/cmake/Modules/FindPython3Libs.cmake
+@@ -27,9 +27,9 @@ INCLUDE(CMakeFindFrameworks)
+ # Search for the python framework on Apple.
+ # CMAKE_FIND_FRAMEWORKS(Python)
+ 
+-FOREACH(_CURRENT_VERSION 3.2 3.1 3.0)
++FOREACH(_CURRENT_VERSION 3.3 3.2 3.1 3.0)
+   IF(_CURRENT_VERSION GREATER 3.1)
+-      SET(_32FLAGS "m" "u" "mu" "")
++      SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
+   ELSE()
+       SET(_32FLAGS "")
+   ENDIF()
+@@ -114,11 +114,19 @@ MARK_AS_ADVANCED(
+   PYTHON3_INCLUDE_DIR
+ )
+ 
++execute_process(
++    COMMAND ${PYTHON3_EXECUTABLE} -c "from distutils import sysconfig; \\
++        print(sysconfig.get_python_inc(plat_specific=True));"
++        OUTPUT_VARIABLE PYTHON3_PLAT_INCDIR
++        OUTPUT_STRIP_TRAILING_WHITESPACE)
++
++message("PYTHON PLAT INC: ${PYTHON3_PLAT_INCDIR}")
++
+ # We use PYTHON3_INCLUDE_DIR, PYTHON3_LIBRARY and PYTHON3_DEBUG_LIBRARY for the
+ # cache entries because they are meant to specify the location of a single
+ # library. We now set the variables listed by the documentation for this
+ # module.
+-SET(PYTHON3_INCLUDE_DIRS "${PYTHON3_INCLUDE_DIR}")
++SET(PYTHON3_INCLUDE_DIRS "${PYTHON3_INCLUDE_DIR}" "${PYTHON3_PLAT_INCDIR}")
+ SET(PYTHON3_LIBRARIES "${PYTHON3_LIBRARY}")
+ SET(PYTHON3_DEBUG_LIBRARIES "${PYTHON3_DEBUG_LIBRARY}")
+ 

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2013-05-16 12:44:01 UTC (rev 24401)
+++ packages/shiboken/trunk/debian/patches/series	2013-05-16 15:08:42 UTC (rev 24402)
@@ -1,2 +1,3 @@
 cmake_selectDefaultPython.patch
 pythonversionindep.patch
+python3.3-and-multiarch.patch