1 |
commit: 821e9b47c82d743716296daf2f9cb29a8567992b |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 5 20:47:29 2013 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 5 20:47:29 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=821e9b47 |
7 |
|
8 |
[kde-base/kig] Sync patch with tree. |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha177 |
11 |
|
12 |
--- |
13 |
...stpython.patch => kig-4.10.4-boostpython.patch} | 53 +++++++++++++--------- |
14 |
kde-base/kig/kig-4.10.49.9999.ebuild | 2 +- |
15 |
2 files changed, 33 insertions(+), 22 deletions(-) |
16 |
|
17 |
diff --git a/kde-base/kig/files/kig-4.10.0-boostpython.patch b/kde-base/kig/files/kig-4.10.4-boostpython.patch |
18 |
similarity index 90% |
19 |
rename from kde-base/kig/files/kig-4.10.0-boostpython.patch |
20 |
rename to kde-base/kig/files/kig-4.10.4-boostpython.patch |
21 |
index 478795e..ec938a7 100644 |
22 |
--- a/kde-base/kig/files/kig-4.10.0-boostpython.patch |
23 |
+++ b/kde-base/kig/files/kig-4.10.4-boostpython.patch |
24 |
@@ -1,7 +1,7 @@ |
25 |
-diff --git CMakeLists.txt CMakeLists.txt |
26 |
-index aa4cc11..647a270 100644 |
27 |
---- CMakeLists.txt |
28 |
-+++ CMakeLists.txt |
29 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
30 |
+index e27b470..2db327f 100644 |
31 |
+--- a/CMakeLists.txt |
32 |
++++ b/CMakeLists.txt |
33 |
@@ -1,9 +1,6 @@ |
34 |
project(kig) |
35 |
|
36 |
@@ -13,11 +13,12 @@ index aa4cc11..647a270 100644 |
37 |
|
38 |
# search packages used by KDE |
39 |
find_package(KDE4 4.3.80 REQUIRED) |
40 |
-@@ -30,7 +27,15 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D |
41 |
+@@ -29,7 +26,16 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATI |
42 |
+ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) |
43 |
|
44 |
# ...to here |
45 |
- |
46 |
-find_package(BoostPython) |
47 |
++ |
48 |
+if(WITH_SCRIPTING) |
49 |
+ set(PythonLibs_FIND_VERSION "2.2") |
50 |
+ find_package(PythonLibs) |
51 |
@@ -30,7 +31,7 @@ index aa4cc11..647a270 100644 |
52 |
|
53 |
kde4_no_enable_final(kig) |
54 |
|
55 |
-@@ -45,16 +50,16 @@ add_subdirectory( macros ) |
56 |
+@@ -44,16 +50,16 @@ add_subdirectory( macros ) |
57 |
#add_subdirectory( kfile ) |
58 |
add_subdirectory( data ) |
59 |
add_subdirectory( pykig ) |
60 |
@@ -52,16 +53,16 @@ index aa4cc11..647a270 100644 |
61 |
|
62 |
# kigpart |
63 |
|
64 |
-@@ -176,7 +181,7 @@ kde4_add_ui_files(kigpart_PART_SRCS |
65 |
+@@ -182,7 +188,7 @@ kde4_add_ui_files(kigpart_PART_SRCS |
66 |
misc/kigcoordinateprecisiondialog.ui |
67 |
) |
68 |
|
69 |
-if(BOOST_PYTHON_FOUND) |
70 |
+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) |
71 |
set(kigpart_PART_SRCS ${kigpart_PART_SRCS} |
72 |
+ modes/popup/scriptactionsprovider.cc |
73 |
scripting/newscriptwizard.cc |
74 |
- scripting/python_scripter.cc |
75 |
-@@ -186,15 +191,15 @@ if(BOOST_PYTHON_FOUND) |
76 |
+@@ -193,15 +199,15 @@ if(BOOST_PYTHON_FOUND) |
77 |
) |
78 |
|
79 |
set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") |
80 |
@@ -81,10 +82,10 @@ index aa4cc11..647a270 100644 |
81 |
|
82 |
install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) |
83 |
|
84 |
-diff --git KigConfigureChecks.cmake KigConfigureChecks.cmake |
85 |
+diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake |
86 |
index fed38b3..a53ea73 100644 |
87 |
---- KigConfigureChecks.cmake |
88 |
-+++ KigConfigureChecks.cmake |
89 |
+--- a/KigConfigureChecks.cmake |
90 |
++++ b/KigConfigureChecks.cmake |
91 |
@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC) |
92 |
set(CMAKE_REQUIRED_INCLUDES) |
93 |
set(CMAKE_REQUIRED_LIBRARIES) |
94 |
@@ -103,10 +104,10 @@ index fed38b3..a53ea73 100644 |
95 |
"Boost.Python" |
96 |
"Kig can optionally use Boost.Python for Python scripting" |
97 |
"http://www.boost.org/" |
98 |
-diff --git cmake/COPYING-CMAKE-SCRIPTS cmake/COPYING-CMAKE-SCRIPTS |
99 |
+diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS |
100 |
deleted file mode 100644 |
101 |
index 4b41776..0000000 |
102 |
---- cmake/COPYING-CMAKE-SCRIPTS |
103 |
+--- a/cmake/COPYING-CMAKE-SCRIPTS |
104 |
+++ /dev/null |
105 |
@@ -1,22 +0,0 @@ |
106 |
-Redistribution and use in source and binary forms, with or without |
107 |
@@ -131,12 +132,12 @@ index 4b41776..0000000 |
108 |
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
109 |
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
110 |
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
111 |
-diff --git cmake/FindBoostPython.cmake cmake/FindBoostPython.cmake |
112 |
+diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake |
113 |
deleted file mode 100644 |
114 |
-index 6d5f05e..0000000 |
115 |
---- cmake/FindBoostPython.cmake |
116 |
+index 50339fd..0000000 |
117 |
+--- a/cmake/FindBoostPython.cmake |
118 |
+++ /dev/null |
119 |
-@@ -1,153 +0,0 @@ |
120 |
+@@ -1,163 +0,0 @@ |
121 |
-# - Try to find the a valid boost+python combination |
122 |
-# Once done this will define |
123 |
-# |
124 |
@@ -171,6 +172,15 @@ index 6d5f05e..0000000 |
125 |
-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") |
126 |
-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") |
127 |
- |
128 |
+-if(WIN32) |
129 |
+- set(PythonLibs_FIND_VERSION 2.7.0) |
130 |
+- find_package(PythonLibs) |
131 |
+- find_package(Boost COMPONENTS python QUIET) |
132 |
+- if(PYTHONLIBS_FOUND AND Boost_FOUND) |
133 |
+- set(BOOST_PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}) |
134 |
+- set(BOOST_PYTHON_LIBS ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES}) |
135 |
+- endif(PYTHONLIBS_FOUND AND Boost_FOUND) |
136 |
+-else(WIN32) |
137 |
-# 1st: check for boost/shared_ptr.hpp |
138 |
-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) |
139 |
- |
140 |
@@ -272,6 +282,7 @@ index 6d5f05e..0000000 |
141 |
- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) |
142 |
- |
143 |
-endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) |
144 |
+-endif(WIN32) |
145 |
- |
146 |
-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) |
147 |
- set(BOOST_PYTHON_FOUND TRUE) |
148 |
@@ -290,10 +301,10 @@ index 6d5f05e..0000000 |
149 |
-endif(BOOST_PYTHON_FOUND) |
150 |
- |
151 |
-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) |
152 |
-diff --git cmake/modules/FindBoostPython.cmake cmake/modules/FindBoostPython.cmake |
153 |
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake |
154 |
deleted file mode 100644 |
155 |
index 72aae54..0000000 |
156 |
---- cmake/modules/FindBoostPython.cmake |
157 |
+--- a/cmake/modules/FindBoostPython.cmake |
158 |
+++ /dev/null |
159 |
@@ -1,134 +0,0 @@ |
160 |
-# - Try to find the a valid boost+python combination |
161 |
|
162 |
diff --git a/kde-base/kig/kig-4.10.49.9999.ebuild b/kde-base/kig/kig-4.10.49.9999.ebuild |
163 |
index dd23e7d..d6b98e1 100644 |
164 |
--- a/kde-base/kig/kig-4.10.49.9999.ebuild |
165 |
+++ b/kde-base/kig/kig-4.10.49.9999.ebuild |
166 |
@@ -16,7 +16,7 @@ DEPEND=" |
167 |
" |
168 |
RDEPEND="${DEPEND}" |
169 |
|
170 |
-PATCHES=( "${FILESDIR}/${PN}-4.10.0-boostpython.patch" ) |
171 |
+PATCHES=( "${FILESDIR}/${PN}-4.10.4-boostpython.patch" ) |
172 |
|
173 |
src_configure() { |
174 |
mycmakeargs=( |