1 |
commit: fe7054b054901bd616964f6c67e6401476a2bf3d |
2 |
Author: David E. Narváez <david.narvaez <AT> computer <DOT> org> |
3 |
AuthorDate: Tue Mar 5 13:01:28 2013 +0000 |
4 |
Commit: David E. Narváez <david.narvaez <AT> computer <DOT> org> |
5 |
CommitDate: Tue Mar 5 13:01:28 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fe7054b0 |
7 |
|
8 |
[kde-base/kig] Fixed Boost Python detection, bug #458402 |
9 |
|
10 |
--- |
11 |
kde-base/kig/files/kig-4.10.0-boostpython.patch | 54 ++++++++--------------- |
12 |
1 files changed, 18 insertions(+), 36 deletions(-) |
13 |
|
14 |
diff --git a/kde-base/kig/files/kig-4.10.0-boostpython.patch b/kde-base/kig/files/kig-4.10.0-boostpython.patch |
15 |
index fafe0ca..478795e 100644 |
16 |
--- a/kde-base/kig/files/kig-4.10.0-boostpython.patch |
17 |
+++ b/kde-base/kig/files/kig-4.10.0-boostpython.patch |
18 |
@@ -1,23 +1,7 @@ |
19 |
-From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001 |
20 |
-From: Johannes Huber <johu@g.o> |
21 |
-Date: Thu, 30 Aug 2012 14:02:44 +0200 |
22 |
-Subject: [PATCH] Use standard cmake module to find boost python. |
23 |
- |
24 |
---- |
25 |
- CMakeLists.txt | 34 ++++---- |
26 |
- KigConfigureChecks.cmake | 4 +- |
27 |
- cmake/COPYING-CMAKE-SCRIPTS | 22 ------ |
28 |
- cmake/FindBoostPython.cmake | 153 ------------------------------------ |
29 |
- cmake/modules/FindBoostPython.cmake | 134 ------------------------------- |
30 |
- 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-) |
31 |
- delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS |
32 |
- delete mode 100644 cmake/FindBoostPython.cmake |
33 |
- delete mode 100644 cmake/modules/FindBoostPython.cmake |
34 |
- |
35 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
36 |
-index ba3e377..092fde3 100644 |
37 |
---- a/CMakeLists.txt |
38 |
-+++ b/CMakeLists.txt |
39 |
+diff --git CMakeLists.txt CMakeLists.txt |
40 |
+index aa4cc11..647a270 100644 |
41 |
+--- CMakeLists.txt |
42 |
++++ CMakeLists.txt |
43 |
@@ -1,9 +1,6 @@ |
44 |
project(kig) |
45 |
|
46 |
@@ -29,12 +13,13 @@ index ba3e377..092fde3 100644 |
47 |
|
48 |
# search packages used by KDE |
49 |
find_package(KDE4 4.3.80 REQUIRED) |
50 |
-@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D |
51 |
+@@ -30,7 +27,15 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D |
52 |
|
53 |
# ...to here |
54 |
|
55 |
-find_package(BoostPython) |
56 |
+if(WITH_SCRIPTING) |
57 |
++ set(PythonLibs_FIND_VERSION "2.2") |
58 |
+ find_package(PythonLibs) |
59 |
+ find_package(Boost COMPONENTS python) |
60 |
+endif(WITH_SCRIPTING) |
61 |
@@ -45,7 +30,7 @@ index ba3e377..092fde3 100644 |
62 |
|
63 |
kde4_no_enable_final(kig) |
64 |
|
65 |
-@@ -45,14 +49,14 @@ add_subdirectory( macros ) |
66 |
+@@ -45,16 +50,16 @@ add_subdirectory( macros ) |
67 |
#add_subdirectory( kfile ) |
68 |
add_subdirectory( data ) |
69 |
add_subdirectory( pykig ) |
70 |
@@ -67,7 +52,7 @@ index ba3e377..092fde3 100644 |
71 |
|
72 |
# kigpart |
73 |
|
74 |
-@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS |
75 |
+@@ -176,7 +181,7 @@ kde4_add_ui_files(kigpart_PART_SRCS |
76 |
misc/kigcoordinateprecisiondialog.ui |
77 |
) |
78 |
|
79 |
@@ -76,7 +61,7 @@ index ba3e377..092fde3 100644 |
80 |
set(kigpart_PART_SRCS ${kigpart_PART_SRCS} |
81 |
scripting/newscriptwizard.cc |
82 |
scripting/python_scripter.cc |
83 |
-@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND) |
84 |
+@@ -186,15 +191,15 @@ if(BOOST_PYTHON_FOUND) |
85 |
) |
86 |
|
87 |
set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") |
88 |
@@ -96,10 +81,10 @@ index ba3e377..092fde3 100644 |
89 |
|
90 |
install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) |
91 |
|
92 |
-diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake |
93 |
+diff --git KigConfigureChecks.cmake KigConfigureChecks.cmake |
94 |
index fed38b3..a53ea73 100644 |
95 |
---- a/KigConfigureChecks.cmake |
96 |
-+++ b/KigConfigureChecks.cmake |
97 |
+--- KigConfigureChecks.cmake |
98 |
++++ KigConfigureChecks.cmake |
99 |
@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC) |
100 |
set(CMAKE_REQUIRED_INCLUDES) |
101 |
set(CMAKE_REQUIRED_LIBRARIES) |
102 |
@@ -118,10 +103,10 @@ index fed38b3..a53ea73 100644 |
103 |
"Boost.Python" |
104 |
"Kig can optionally use Boost.Python for Python scripting" |
105 |
"http://www.boost.org/" |
106 |
-diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS |
107 |
+diff --git cmake/COPYING-CMAKE-SCRIPTS cmake/COPYING-CMAKE-SCRIPTS |
108 |
deleted file mode 100644 |
109 |
index 4b41776..0000000 |
110 |
---- a/cmake/COPYING-CMAKE-SCRIPTS |
111 |
+--- cmake/COPYING-CMAKE-SCRIPTS |
112 |
+++ /dev/null |
113 |
@@ -1,22 +0,0 @@ |
114 |
-Redistribution and use in source and binary forms, with or without |
115 |
@@ -146,10 +131,10 @@ index 4b41776..0000000 |
116 |
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
117 |
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
118 |
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
119 |
-diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake |
120 |
+diff --git cmake/FindBoostPython.cmake cmake/FindBoostPython.cmake |
121 |
deleted file mode 100644 |
122 |
index 6d5f05e..0000000 |
123 |
---- a/cmake/FindBoostPython.cmake |
124 |
+--- cmake/FindBoostPython.cmake |
125 |
+++ /dev/null |
126 |
@@ -1,153 +0,0 @@ |
127 |
-# - Try to find the a valid boost+python combination |
128 |
@@ -305,10 +290,10 @@ index 6d5f05e..0000000 |
129 |
-endif(BOOST_PYTHON_FOUND) |
130 |
- |
131 |
-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) |
132 |
-diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake |
133 |
+diff --git cmake/modules/FindBoostPython.cmake cmake/modules/FindBoostPython.cmake |
134 |
deleted file mode 100644 |
135 |
index 72aae54..0000000 |
136 |
---- a/cmake/modules/FindBoostPython.cmake |
137 |
+--- cmake/modules/FindBoostPython.cmake |
138 |
+++ /dev/null |
139 |
@@ -1,134 +0,0 @@ |
140 |
-# - Try to find the a valid boost+python combination |
141 |
@@ -445,6 +430,3 @@ index 72aae54..0000000 |
142 |
-endif(BOOST_PYTHON_FOUND) |
143 |
- |
144 |
-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) |
145 |
--- |
146 |
-1.7.12 |
147 |
- |