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