| 1 |
commit: 180399cbc3e51bba7516721b52cd7795aeb338d0 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 31 14:12:30 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 31 14:12:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=180399cb |
| 7 |
|
| 8 |
[kde-base/kig] Update patch by Franz Fellner <alpine.art.de <AT> googlemail.com> wrt bug #431838. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kig/files/kig-4.9.0-boostpython.patch | 20 ++++++++++++-------- |
| 14 |
1 files changed, 12 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/kde-base/kig/files/kig-4.9.0-boostpython.patch b/kde-base/kig/files/kig-4.9.0-boostpython.patch |
| 17 |
index 6d9948a..c2035b1 100644 |
| 18 |
--- a/kde-base/kig/files/kig-4.9.0-boostpython.patch |
| 19 |
+++ b/kde-base/kig/files/kig-4.9.0-boostpython.patch |
| 20 |
@@ -1,21 +1,21 @@ |
| 21 |
-From 693ebdb3cb0db3abcec759a5f344c40322a5be0a Mon Sep 17 00:00:00 2001 |
| 22 |
+From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001 |
| 23 |
From: Johannes Huber <johu@g.o> |
| 24 |
Date: Thu, 30 Aug 2012 14:02:44 +0200 |
| 25 |
Subject: [PATCH] Use standard cmake module to find boost python. |
| 26 |
|
| 27 |
--- |
| 28 |
- CMakeLists.txt | 30 +++---- |
| 29 |
+ CMakeLists.txt | 34 ++++---- |
| 30 |
KigConfigureChecks.cmake | 4 +- |
| 31 |
cmake/COPYING-CMAKE-SCRIPTS | 22 ------ |
| 32 |
cmake/FindBoostPython.cmake | 153 ------------------------------------ |
| 33 |
cmake/modules/FindBoostPython.cmake | 134 ------------------------------- |
| 34 |
- 5 Dateien geändert, 16 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-) |
| 35 |
+ 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-) |
| 36 |
delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS |
| 37 |
delete mode 100644 cmake/FindBoostPython.cmake |
| 38 |
delete mode 100644 cmake/modules/FindBoostPython.cmake |
| 39 |
|
| 40 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 41 |
-index ba3e377..67926ab 100644 |
| 42 |
+index ba3e377..092fde3 100644 |
| 43 |
--- a/CMakeLists.txt |
| 44 |
+++ b/CMakeLists.txt |
| 45 |
@@ -1,9 +1,6 @@ |
| 46 |
@@ -29,7 +29,7 @@ index ba3e377..67926ab 100644 |
| 47 |
|
| 48 |
# search packages used by KDE |
| 49 |
find_package(KDE4 4.3.80 REQUIRED) |
| 50 |
-@@ -30,7 +27,10 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D |
| 51 |
+@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D |
| 52 |
|
| 53 |
# ...to here |
| 54 |
|
| 55 |
@@ -38,10 +38,14 @@ index ba3e377..67926ab 100644 |
| 56 |
+ find_package(PythonLibs) |
| 57 |
+ find_package(Boost COMPONENTS python) |
| 58 |
+endif(WITH_SCRIPTING) |
| 59 |
++ |
| 60 |
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) |
| 61 |
++ set(KIG_ENABLE_PYTHON_SCRIPTING 1) |
| 62 |
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) |
| 63 |
|
| 64 |
kde4_no_enable_final(kig) |
| 65 |
|
| 66 |
-@@ -45,14 +45,14 @@ add_subdirectory( macros ) |
| 67 |
+@@ -45,14 +49,14 @@ add_subdirectory( macros ) |
| 68 |
#add_subdirectory( kfile ) |
| 69 |
add_subdirectory( data ) |
| 70 |
add_subdirectory( pykig ) |
| 71 |
@@ -61,7 +65,7 @@ index ba3e377..67926ab 100644 |
| 72 |
|
| 73 |
# kigpart |
| 74 |
|
| 75 |
-@@ -173,7 +173,7 @@ kde4_add_ui_files(kigpart_PART_SRCS |
| 76 |
+@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS |
| 77 |
misc/kigcoordinateprecisiondialog.ui |
| 78 |
) |
| 79 |
|
| 80 |
@@ -70,7 +74,7 @@ index ba3e377..67926ab 100644 |
| 81 |
set(kigpart_PART_SRCS ${kigpart_PART_SRCS} |
| 82 |
scripting/newscriptwizard.cc |
| 83 |
scripting/python_scripter.cc |
| 84 |
-@@ -183,15 +183,15 @@ if(BOOST_PYTHON_FOUND) |
| 85 |
+@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND) |
| 86 |
) |
| 87 |
|
| 88 |
set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") |
Archives