diff options
author | 2013-12-14 22:04:29 +0000 | |
---|---|---|
committer | 2013-12-14 22:04:29 +0000 | |
commit | 6993c4ab31c91924e8221cdfdfb48d9c89886ca5 (patch) | |
tree | bfc4aa95fa11a606868b552eeac9097f8b7fbf51 /kde-base/kig | |
parent | version bump (diff) | |
download | historical-6993c4ab31c91924e8221cdfdfb48d9c89886ca5.tar.gz historical-6993c4ab31c91924e8221cdfdfb48d9c89886ca5.tar.bz2 historical-6993c4ab31c91924e8221cdfdfb48d9c89886ca5.zip |
Remove unused patches.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'kde-base/kig')
-rw-r--r-- | kde-base/kig/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kig/Manifest | 32 | ||||
-rw-r--r-- | kde-base/kig/files/kig-4.10.0-boostpython.patch | 432 | ||||
-rw-r--r-- | kde-base/kig/files/kig-4.10.4-boostpython.patch | 443 |
4 files changed, 20 insertions, 893 deletions
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog index 5c518d807df1..06bd721f2f5d 100644 --- a/kde-base/kig/ChangeLog +++ b/kde-base/kig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kig # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.296 2013/12/12 03:37:05 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.297 2013/12/14 22:04:26 johu Exp $ + + 14 Dec 2013; Johannes Huber <johu@gentoo.org> + -files/kig-4.10.0-boostpython.patch, -files/kig-4.10.4-boostpython.patch: + Remove unused patches. 12 Dec 2013; Agostino Sarubbo <ago@gentoo.org> -kig-4.10.5.ebuild: Remove old diff --git a/kde-base/kig/Manifest b/kde-base/kig/Manifest index 847f8c63ba05..9b9167a0d225 100644 --- a/kde-base/kig/Manifest +++ b/kde-base/kig/Manifest @@ -1,29 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX kig-4.10.0-boostpython.patch 15010 SHA256 281b99a2c774c84e94505c325eea0736bc7aedc6aba923cdb91860f456401815 SHA512 9b9b818da1de68068fdd523f0ce2893e5ae34b11365a580f959a0e24f3e26ff402229b02c64988f9172d604d03cc2ae9310996e21c0917b2aa7fd8406b7b8c2c WHIRLPOOL a861957ea5aca9f1cfa011323c90a6b6b69c78890d7281e5c0747cd8d0dd97c36222c6b04ae9b6d39237e8c2155bc680e87b333ba9aa54b20cd007bcfe1f8cad -AUX kig-4.10.4-boostpython.patch 15555 SHA256 71d284a0d827c852f0353803a63bcb92c947100a937f29a0d37add65a0866d5d SHA512 e8c8cee753f4bd6e7fe26fe8e032a6a1e46f0bb82726eaa907f743912dffdf0377b5afa09cff59ff0c1bd4a7fd31d5876183a12ed3ef7d34f01080fd437b06df WHIRLPOOL 3856d9b99a6a30935cda923f6f9a5ae9d212a75a760e9b74b2e4897f2a8acacd6e5845ccc79fa37b87af71cd48c1584df5af7e684db2738444cd601a1b2c25b0 AUX kig-4.11.0-boostpython.patch 978 SHA256 82c4b0a4c0ae634db6ce7f0bc060e3d428ab7e2b8c2298217e2a0b2c93c0a64a SHA512 59c70a0fea21c5943ae4df09b495cea4928334a94ddd0385f65f1246c600d65300749ca2e4f4ee960a223051fe0a4d55092eb0b3809d7cdc92d568a082412edf WHIRLPOOL e6fee3d27e754a144914b70ac8989b2e0d565682aed694a4f93b6e3b2db66485ac971e93df78eb78513e8c1b0ccd30573bfef089e425837d47c0b0543d5af144 DIST kig-4.11.2.tar.xz 1523048 SHA256 e9d389d23c556f2d3414bcaad8e9f3ad2d4a25fd636d7f20c0c10c2b4479a951 SHA512 f83591f83f6cd20ce60197e3397e29073e40cc221c7a55a4f538843078a9a555a72e4f2741d4e7bf0045f0eb8c8e60821539a46bdbc8d3c2ce5e725ae1055438 WHIRLPOOL 7d899f4863a71a415ce5ed35b3d4348cfacacd23502ac008280be045e8dd31593ff372d8252fc1199e65bad203c05f38cb767baa2d76866341f1406fe72e1ba5 DIST kig-4.11.4.tar.xz 1523396 SHA256 97b6c19ebd9678450e752ad0dca0f5f7d1aa7a474ee58ff5c559551cb2e8c8f9 SHA512 c48cff5c4e840f0d7dd2ff83e01b4ba8a31719eaacbd4d7fa0b0448eed8e7170f87e0aefb8ed4e57bff4e40d8467813eec51d9902570423ddafc80fecd4c6ea5 WHIRLPOOL 9ee57a79d6d15f1b97feb1e53ad56b1adb22786541ebf581d89c0a99a86fa212108d619955a7e11d5b6446489b3c8a462cc9c05ee66e51844b4edfaf77a22fac EBUILD kig-4.11.2.ebuild 981 SHA256 4321753c39e889d89da6256aa28f468e6d59d207c9897d5ae17f38a8e6b7c70c SHA512 09c4ac695a76d540d3e78371ffe68d0a6abdcc556444a398c07164619832491f563d88be66ea6b06fd2b7763b2e94eabba717665aaeb72d2a3b5db435eb3f0dc WHIRLPOOL e19b8e6caa1817fac14373b51029607b9c374b6694dc82d2eca93fe82e90f530b4cd68495125b3c35178e301feaca24c42c831ce60a70ccbd71760ef93b1748b EBUILD kig-4.11.4.ebuild 987 SHA256 4a02fdc89c53e71455d28812433852068027252a1161ebd242d1e5710ef7043f SHA512 681f8bdaeaa10835a02d8778c48e7afd0f68d412e537c062ed39e02a043ba6174b7ebd975f091f614e58c85f0449ae22bae20aa1c96f62e7307b2aea012c0492 WHIRLPOOL ba34d41675bfa311f269ea2762cada2f32d2d2abdb19f174a39ed6ac7f81b9f7e3086437c7c8ad0ceefa64971b0fba424307c83a67a6d55ef2528946a60b5326 -MISC ChangeLog 33792 SHA256 b4206f5ae0ed48be08cf1f7ef9556139c42ec1d3de978d272612c013233628f6 SHA512 d375803e22968fd6f06b4415d70fd39a98136a0e9e2b693443439d396417b9b70d57dd409fd230fa331d9d6f02c9dce9c497cf58989938977ef8f0c35faa9794 WHIRLPOOL c3bb4977891005fd3a7a367ec898f455fcbd8de031b091c769e8f80b674744fbeb709d946ced85f8eb48c13683be9c8541ac67c568db835631449b2c83fe8583 +MISC ChangeLog 33943 SHA256 516fe7dfbc49d8b483824601cf91b82eae71b69059f41e4679f5aada17bdb671 SHA512 bfc24871d953714be66da4a2be0f98aca0e29639936bcd4f5d97c161b637f39a69ba52b02ead7f6eebb9212a037ae18148eb34c8f7d879f807ebf4d8dc82a1bd WHIRLPOOL 558771e32ec248ddc3d7a75ed5ad7a69e20185c8337710883f116d9012db10007f40abd95b28cc38ed109b4724e5867b858ece58f07bea1024d98a19726408c7 MISC metadata.xml 225 SHA256 d8e71ad960756b687369d4278755ce54044aed78ab70d603568ffb080a60f3ca SHA512 48bde5093d05011e08bc726705574668440d2ac110071a0700e0f7ba4d25da76e23537fe9b5edc3299f80ccbafea27457a04a12032859856ec3f73a91e3918b6 WHIRLPOOL 4e052f92cb34a46f89fbaae077fca03ea2cc4de9eb26f11ea4d00189850f1fe50b4ae9e64b739d73b0eb3d1bb12e34efb63aa88d2672bdee4a76624d79853fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJSqS6xAAoJELp701BxlEWf8NIP/3JwRxzk7xXyWgUJdcpBempP -HBTGIVu5Bt4slrrEYSHQIu6fp9ybM1vpP6DyHrBROHYI2motIKm9lHS3iI+CscmO -Xn1+rn76Fk8OI3PbKInReaqZgTWXk8IwcNvOpgrjpdouO7XLR62FmpG+sDOC7pCt -6HQQ5MeScvvHJ6CvGEtgN9E/WKi+3bnA2InK34HHkg5xOUpwYG5SV52PAvkWQcKU -TubiXVKG6+UoJJV37bYNk69oYKsu90OEEIa3fSCDWD/IKLZfLBvfc9sVGNjvh216 -fu0effFIXZ7HMxM3Hj/98JJDJbFI1xnMGN+i+N6D/qvD4njfeSjCHnw7XNOVIBNw -cGm9Ba2Lh0FYzz2r8AAnHwPP0LSbUaAMuiHXyvlv9BjVt1k0MtsdhX2wakhGyRTH -COqK5pPVHkEpwkZh6rSOqFbroC2Rq7fg0UJugixjg0O3Y6fN+QV0d1+NfjViokEY -df0VuFR4mIc6K+aJs6lJqQT/6ZcIYgMxrrKHcPlNDOD3Xw26DWG+AWvUbHqKXsAH -DOgjceK1JsZwouRTrYaAN8U+5X+zHAj2bK7fqgfuS8zkBZxrP8eRKkMaDyaGBV0V -UgRCJH4m/ZG3L4ffHmMH5A9/w4+g6HVW52XqbANtASWseZH2wYxxUoK+xqpY7lay -BAOqtOYt0UyzvaHO3RPz -=jEPw +iQIcBAEBCAAGBQJSrNXrAAoJEGVpnaTzz9K9JLAP/RK07/0b4vyi8w6EgBxVVts6 +eXoCbNTy4Pt/cuAaIdb51UFt/+Kt/gRrTHGwI/ZoTpLEm58cFDRuCn7e2ng9bOCc +o3zxsFCPX0K4lOvU1qnEwuFihxodPb0a27KLg2wTWPjzncx46SI/yADVmlCi2q9Z +znKwa08JPmNoO36yCgJzPCvjhCOTrRHhjmjsDCM+heCGGGTX2JtfT7fqPL5E7YK8 +/8G/0VVvaa5yfrhEM1xm+srsa1JxqQvLP/Wu/pQ6k0ZSha+ujiEvcGBu3jJsp2OR +ghIXme9cgpN4vnBKwjqZi4V/ZTnnKgCjXTGgX2dKvDyWk3fnI5aujxnmSpkZpTKA +LCzf9ltIIL4YkLelgOe/C255x45Nr19aIW4LgDPIdcDlcqyO3dhc7WC981Sx+/YL ++xX2x6pq+DJyj+HTvfDq8WAicKmGZN+zmmwM+3RRfM0SKXXgZVuwjCEmKpSF8Hw/ +pP4qJLptNluhyYfJ+roFhfD180drMV4FwD0lXbc+Owj+z9OYrzEd6t0MiCie5t64 +JRiz2UR2gketz+zAP/ZfgpPY5uP+1ysneAZWr71LATwK5+98Pe0QccCI3dClQjJj +h6LpcUuxa9NFzr1CZ0fNkjJ+qfk+laD4VyQyUmuQ8yF/ZsE1wwnNtpP/fCbQYU/W +bojnYYd98i2OD+Z+d7U1 +=NVda -----END PGP SIGNATURE----- diff --git a/kde-base/kig/files/kig-4.10.0-boostpython.patch b/kde-base/kig/files/kig-4.10.0-boostpython.patch deleted file mode 100644 index 478795ea38f9..000000000000 --- a/kde-base/kig/files/kig-4.10.0-boostpython.patch +++ /dev/null @@ -1,432 +0,0 @@ -diff --git CMakeLists.txt CMakeLists.txt -index aa4cc11..647a270 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -1,9 +1,6 @@ - project(kig) - --# --# taken from kdeedu/CMakeList.txt --# from here... --set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake ) -+option(WITH_SCRIPTING "Enable python scripting support" ON) - - # search packages used by KDE - find_package(KDE4 4.3.80 REQUIRED) -@@ -30,7 +27,15 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D - - # ...to here - --find_package(BoostPython) -+if(WITH_SCRIPTING) -+ set(PythonLibs_FIND_VERSION "2.2") -+ find_package(PythonLibs) -+ find_package(Boost COMPONENTS python) -+endif(WITH_SCRIPTING) -+ -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ set(KIG_ENABLE_PYTHON_SCRIPTING 1) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - kde4_no_enable_final(kig) - -@@ -45,16 +50,16 @@ add_subdirectory( macros ) - #add_subdirectory( kfile ) - add_subdirectory( data ) - add_subdirectory( pykig ) --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - add_subdirectory( scripting ) --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - macro_display_feature_log() - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BOOST_PYTHON_FOUND) -- include_directories(${BOOST_PYTHON_INCLUDES}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - # kigpart - -@@ -176,7 +181,7 @@ kde4_add_ui_files(kigpart_PART_SRCS - misc/kigcoordinateprecisiondialog.ui - ) - --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - set(kigpart_PART_SRCS ${kigpart_PART_SRCS} - scripting/newscriptwizard.cc - scripting/python_scripter.cc -@@ -186,15 +191,15 @@ if(BOOST_PYTHON_FOUND) - ) - - set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - - kde4_add_plugin(kigpart ${kigpart_PART_SRCS}) - - target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ) --if(BOOST_PYTHON_FOUND) -- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git KigConfigureChecks.cmake KigConfigureChecks.cmake -index fed38b3..a53ea73 100644 ---- KigConfigureChecks.cmake -+++ KigConfigureChecks.cmake -@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - --macro_optional_find_package(BoostPython) -- - # at the end, output the configuration - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake -@@ -18,7 +16,7 @@ configure_file( - ) - - macro_log_feature( -- BOOST_PYTHON_FOUND -+ Boost_PYTHON_FOUND - "Boost.Python" - "Kig can optionally use Boost.Python for Python scripting" - "http://www.boost.org/" -diff --git cmake/COPYING-CMAKE-SCRIPTS cmake/COPYING-CMAKE-SCRIPTS -deleted file mode 100644 -index 4b41776..0000000 ---- cmake/COPYING-CMAKE-SCRIPTS -+++ /dev/null -@@ -1,22 +0,0 @@ --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions --are met: -- --1. Redistributions of source code must retain the copyright -- notice, this list of conditions and the following disclaimer. --2. Redistributions in binary form must reproduce the copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. --3. The name of the author may not be used to endorse or promote products -- derived from this software without specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR --IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES --OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. --IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, --INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT --NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF --THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -diff --git cmake/FindBoostPython.cmake cmake/FindBoostPython.cmake -deleted file mode 100644 -index 6d5f05e..0000000 ---- cmake/FindBoostPython.cmake -+++ /dev/null -@@ -1,153 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --find_package(PkgConfig) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- # try pkg-config next -- set(_found FALSE) -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- pkg_check_modules(_python QUIET ${_pyver}) -- if (_python_FOUND) -- find_package(Boost 1.33 COMPONENTS python) -- if (Boost_PYTHON_FOUND) -- set(_found TRUE) -- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}") -- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}") -- endif(Boost_PYTHON_FOUND) -- endif(_python_FOUND) -- endif(NOT _found) -- endforeach(_pyver ${PYTHON_VERSIONS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) -diff --git cmake/modules/FindBoostPython.cmake cmake/modules/FindBoostPython.cmake -deleted file mode 100644 -index 72aae54..0000000 ---- cmake/modules/FindBoostPython.cmake -+++ /dev/null -@@ -1,134 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- set(_found FALSE) -- -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) diff --git a/kde-base/kig/files/kig-4.10.4-boostpython.patch b/kde-base/kig/files/kig-4.10.4-boostpython.patch deleted file mode 100644 index ec938a716668..000000000000 --- a/kde-base/kig/files/kig-4.10.4-boostpython.patch +++ /dev/null @@ -1,443 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e27b470..2db327f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,6 @@ - project(kig) - --# --# taken from kdeedu/CMakeList.txt --# from here... --set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake ) -+option(WITH_SCRIPTING "Enable python scripting support" ON) - - # search packages used by KDE - find_package(KDE4 4.3.80 REQUIRED) -@@ -29,7 +26,16 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATI - include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) - - # ...to here --find_package(BoostPython) -+ -+if(WITH_SCRIPTING) -+ set(PythonLibs_FIND_VERSION "2.2") -+ find_package(PythonLibs) -+ find_package(Boost COMPONENTS python) -+endif(WITH_SCRIPTING) -+ -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ set(KIG_ENABLE_PYTHON_SCRIPTING 1) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - kde4_no_enable_final(kig) - -@@ -44,16 +50,16 @@ add_subdirectory( macros ) - #add_subdirectory( kfile ) - add_subdirectory( data ) - add_subdirectory( pykig ) --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - add_subdirectory( scripting ) --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - macro_display_feature_log() - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BOOST_PYTHON_FOUND) -- include_directories(${BOOST_PYTHON_INCLUDES}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - # kigpart - -@@ -182,7 +188,7 @@ kde4_add_ui_files(kigpart_PART_SRCS - misc/kigcoordinateprecisiondialog.ui - ) - --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - set(kigpart_PART_SRCS ${kigpart_PART_SRCS} - modes/popup/scriptactionsprovider.cc - scripting/newscriptwizard.cc -@@ -193,15 +199,15 @@ if(BOOST_PYTHON_FOUND) - ) - - set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - - kde4_add_plugin(kigpart ${kigpart_PART_SRCS}) - - target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ) --if(BOOST_PYTHON_FOUND) -- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake -index fed38b3..a53ea73 100644 ---- a/KigConfigureChecks.cmake -+++ b/KigConfigureChecks.cmake -@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - --macro_optional_find_package(BoostPython) -- - # at the end, output the configuration - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake -@@ -18,7 +16,7 @@ configure_file( - ) - - macro_log_feature( -- BOOST_PYTHON_FOUND -+ Boost_PYTHON_FOUND - "Boost.Python" - "Kig can optionally use Boost.Python for Python scripting" - "http://www.boost.org/" -diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS -deleted file mode 100644 -index 4b41776..0000000 ---- a/cmake/COPYING-CMAKE-SCRIPTS -+++ /dev/null -@@ -1,22 +0,0 @@ --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions --are met: -- --1. Redistributions of source code must retain the copyright -- notice, this list of conditions and the following disclaimer. --2. Redistributions in binary form must reproduce the copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. --3. The name of the author may not be used to endorse or promote products -- derived from this software without specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR --IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES --OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. --IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, --INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT --NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF --THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake -deleted file mode 100644 -index 50339fd..0000000 ---- a/cmake/FindBoostPython.cmake -+++ /dev/null -@@ -1,163 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --find_package(PkgConfig) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --if(WIN32) -- set(PythonLibs_FIND_VERSION 2.7.0) -- find_package(PythonLibs) -- find_package(Boost COMPONENTS python QUIET) -- if(PYTHONLIBS_FOUND AND Boost_FOUND) -- set(BOOST_PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}) -- set(BOOST_PYTHON_LIBS ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES}) -- endif(PYTHONLIBS_FOUND AND Boost_FOUND) --else(WIN32) --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- # try pkg-config next -- set(_found FALSE) -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- pkg_check_modules(_python QUIET ${_pyver}) -- if (_python_FOUND) -- find_package(Boost 1.33 COMPONENTS python) -- if (Boost_PYTHON_FOUND) -- set(_found TRUE) -- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}") -- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}") -- endif(Boost_PYTHON_FOUND) -- endif(_python_FOUND) -- endif(NOT _found) -- endforeach(_pyver ${PYTHON_VERSIONS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) --endif(WIN32) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) -diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake -deleted file mode 100644 -index 72aae54..0000000 ---- a/cmake/modules/FindBoostPython.cmake -+++ /dev/null -@@ -1,134 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- set(_found FALSE) -- -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) |