| 1 |
scarabeus 12/05/24 12:53:24 |
| 2 |
|
| 3 |
Added: qgis-no-python-pyc.patch |
| 4 |
Log: |
| 5 |
Add python pyc patch for bug#381481. Patch by Chris Mayo. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-geosciences/qgis/files/qgis-no-python-pyc.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/files/qgis-no-python-pyc.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/files/qgis-no-python-pyc.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qgis-no-python-pyc.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur qgis-1.7.0.orig//cmake/PythonMacros.cmake qgis-1.7.0/cmake/PythonMacros.cmake |
| 18 |
--- qgis-1.7.0.orig//cmake/PythonMacros.cmake 2011-06-05 12:59:48.000000000 +0100 |
| 19 |
+++ qgis-1.7.0/cmake/PythonMacros.cmake 2011-09-01 20:36:09.285050896 +0100 |
| 20 |
@@ -22,40 +22,4 @@ |
| 21 |
# Install the source file. |
| 22 |
INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) |
| 23 |
|
| 24 |
- # Byte compile and install the .pyc file. |
| 25 |
- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) |
| 26 |
- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) |
| 27 |
- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) |
| 28 |
- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) |
| 29 |
- |
| 30 |
- if(WIN32) |
| 31 |
- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") |
| 32 |
- endif(WIN32) |
| 33 |
- |
| 34 |
- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) |
| 35 |
- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) |
| 36 |
- |
| 37 |
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) |
| 38 |
- |
| 39 |
- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") |
| 40 |
- |
| 41 |
- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) |
| 42 |
- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. |
| 43 |
- ADD_CUSTOM_COMMAND( |
| 44 |
- TARGET compile_python_files |
| 45 |
- COMMAND ${CMAKE_COMMAND} -E echo ${message} |
| 46 |
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} |
| 47 |
- DEPENDS ${_absfilename} |
| 48 |
- ) |
| 49 |
- ELSE(_abs_bin_py STREQUAL ${_absfilename}) |
| 50 |
- ADD_CUSTOM_COMMAND( |
| 51 |
- TARGET compile_python_files |
| 52 |
- COMMAND ${CMAKE_COMMAND} -E echo ${message} |
| 53 |
- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} |
| 54 |
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} |
| 55 |
- DEPENDS ${_absfilename} |
| 56 |
- ) |
| 57 |
- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) |
| 58 |
- |
| 59 |
- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) |
| 60 |
ENDMACRO(PYTHON_INSTALL) |
| 61 |
diff -ur qgis-1.7.0.orig//python/CMakeLists.txt qgis-1.7.0/python/CMakeLists.txt |
| 62 |
--- qgis-1.7.0.orig//python/CMakeLists.txt 2011-06-05 12:59:48.000000000 +0100 |
| 63 |
+++ qgis-1.7.0/python/CMakeLists.txt 2011-09-01 20:35:57.429003659 +0100 |
| 64 |
@@ -82,8 +82,6 @@ |
| 65 |
|
| 66 |
SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis) |
| 67 |
|
| 68 |
-ADD_CUSTOM_TARGET(compile_python_files ALL) |
| 69 |
- |
| 70 |
PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR}) |
| 71 |
PYTHON_INSTALL(utils.py ${QGIS_PYTHON_DIR}) |
| 72 |
PYTHON_INSTALL(console.py ${QGIS_PYTHON_DIR}) |
Archives