From 3f7cb62ef558ea147661abe007a4293c0069fc62 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 9 Nov 2012 11:33:59 -0800
Subject: Fri Nov  9 11:33:58 PST 2012

---
 .../use-pythondontwritebytecode.patch              | 62 +++++++++++++++-------
 1 file changed, 44 insertions(+), 18 deletions(-)

(limited to 'libre/kdelibs-libre/use-pythondontwritebytecode.patch')

diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
index e221e939a..9734f44fb 100644
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -1,8 +1,8 @@
---- cmake/modules/PythonMacros.cmake
-+++ cmake/modules/PythonMacros.cmake
-@@ -23,40 +23,42 @@
+--- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~	2012-11-06 10:32:38.564034292 +0000
++++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake	2012-11-06 10:35:51.829341102 +0000
+@@ -23,53 +23,55 @@
    # Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
  
 -  # Byte compile and install the .pyc file.        
 -  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
@@ -15,11 +15,19 @@
 -  endif(WIN32)
 -
 -  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  # Python 3.2 changed the pyc file location
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-    # To get the right version for suffix
+-    STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
+-    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
+-  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
+-    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
 -
 -  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
 -
--  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-  SET(_message "Byte-compiling ${_bin_py}")
 -
 -  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 -  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
@@ -38,7 +46,13 @@
 -      DEPENDS ${_absfilename}
 -    )
 -  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+  # Byte compile and install the .pyc file.
+-
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+-  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
+-      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
+-  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
++  # Byte compile and install the .pyc file.       
 +  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
 +    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
 +    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
@@ -46,35 +60,47 @@
 +    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
 +
 +    if(WIN32)
-+      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
 +    endif(WIN32)
 +
 +    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    # Python 3.2 changed the pyc file location
++    IF(PYTHON_SHORT_VERSION GREATER 3.1)
++        # To get the right version for suffix
++        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
 +
 +    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
 +
-+    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++    SET(_message "Byte-compiling ${_bin_py}")
 +
 +    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 +    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+      ADD_CUSTOM_COMMAND(
++        ADD_CUSTOM_COMMAND(
 +        TARGET compile_python_files
 +        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
 +        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 +        DEPENDS ${_absfilename}
-+      )
++        )
 +    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+      ADD_CUSTOM_COMMAND(
++        ADD_CUSTOM_COMMAND(
 +        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
++        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
 +        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
 +        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 +        DEPENDS ${_absfilename}
-+      )
++        )
 +    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
-+    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++
++    IF(PYTHON_SHORT_VERSION GREATER 3.1)
++        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
++    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
++        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
++    ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
 +  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ 
  ENDMACRO(PYTHON_INSTALL)
-- 
cgit v1.2.3-54-g00ecf