From 86400c848c73a907fb5c27014e2582c8cf0f1582 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 11 Feb 2013 02:38:51 +0000 Subject: remove old patches (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) --- sci-geosciences/qgis/ChangeLog | 7 ++- sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch | 20 -------- .../qgis/files/qgis-no-python-pyc.patch | 56 ---------------------- 3 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch delete mode 100644 sci-geosciences/qgis/files/qgis-no-python-pyc.patch (limited to 'sci-geosciences') diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog index 044f0f1c1db7..ef238e049d46 100644 --- a/sci-geosciences/qgis/ChangeLog +++ b/sci-geosciences/qgis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/qgis # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.27 2013/02/11 02:37:34 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.28 2013/02/11 02:38:51 hasufell Exp $ + + 11 Feb 2013; Julian Ospald + -files/qgis-1.7.4-gcc4.7.patch, -files/qgis-no-python-pyc.patch: + remove old patches *qgis-1.8.0 (11 Feb 2013) @@ -117,4 +121,3 @@ 21 Nov 2009; Sébastien Fabbro +qgis-1.3.0.ebuild, +files/qgis-1.3.0-sip.patch, +metadata.xml: Initial import. Thanks everyone in bug #56262 - diff --git a/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch b/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch deleted file mode 100644 index 858a42c94340..000000000000 --- a/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch +++ /dev/null @@ -1,20 +0,0 @@ -+++ qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-04-21 13:58:04.107239275 +0300 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #ifdef WIN32 - #include - -+++ qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc 2012-04-21 13:16:42.213690282 +0300 -@@ -20,7 +20,7 @@ - // mhadji@gmail.com - - #include -- -+#include - #include - - #ifdef WIN32 diff --git a/sci-geosciences/qgis/files/qgis-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-no-python-pyc.patch deleted file mode 100644 index 7bb368b6c682..000000000000 --- a/sci-geosciences/qgis/files/qgis-no-python-pyc.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ur qgis-1.7.0.orig//cmake/PythonMacros.cmake qgis-1.7.0/cmake/PythonMacros.cmake ---- qgis-1.7.0.orig//cmake/PythonMacros.cmake 2011-06-05 12:59:48.000000000 +0100 -+++ qgis-1.7.0/cmake/PythonMacros.cmake 2011-09-01 20:36:09.285050896 +0100 -@@ -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) -diff -ur qgis-1.7.0.orig//python/CMakeLists.txt qgis-1.7.0/python/CMakeLists.txt ---- qgis-1.7.0.orig//python/CMakeLists.txt 2011-06-05 12:59:48.000000000 +0100 -+++ qgis-1.7.0/python/CMakeLists.txt 2011-09-01 20:35:57.429003659 +0100 -@@ -82,8 +82,6 @@ - - SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis) - --ADD_CUSTOM_TARGET(compile_python_files ALL) -- - PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR}) - PYTHON_INSTALL(utils.py ${QGIS_PYTHON_DIR}) - PYTHON_INSTALL(console.py ${QGIS_PYTHON_DIR}) -- cgit v1.2.3-65-gdbad