diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-02-11 02:37:34 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-02-11 02:37:34 +0000 |
| commit | 12dc69fe9f4400fd3e3811ffe4f1ff093bc8653b (patch) | |
| tree | ddc3f53242485a50b7666a0eed06b3e78e3e481b /sci-geosciences/qgis/files | |
| parent | Fix the previous commit. #455258 (diff) | |
| download | gentoo-2-12dc69fe9f4400fd3e3811ffe4f1ff093bc8653b.tar.gz gentoo-2-12dc69fe9f4400fd3e3811ffe4f1ff093bc8653b.tar.bz2 gentoo-2-12dc69fe9f4400fd3e3811ffe4f1ff093bc8653b.zip | |
version bump wrt #421093, remove broken wrt #449348
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'sci-geosciences/qgis/files')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch new file mode 100644 index 000000000000..ec3e1c2dccf6 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch @@ -0,0 +1,54 @@ +--- cmake/PythonMacros.cmake ++++ cmake/PythonMacros.cmake +@@ -22,40 +22,4 @@ + # Install the source file. + INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) + +- # Byte compile and install the .pyc file. +- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) +- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) +- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) +- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) +- +- if(WIN32) +- 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) +- +- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) +- +- SET(_message "-DMESSAGE=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( +- 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( +- TARGET compile_python_files +- 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}) + ENDMACRO(PYTHON_INSTALL) +--- python/CMakeLists.txt ++++ python/CMakeLists.txt +@@ -102,8 +102,6 @@ + + SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis) + +-ADD_CUSTOM_TARGET(compile_python_files ALL) +- + ADD_CUSTOM_COMMAND(TARGET compile_python_files + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY} |