| 1 |
dilfridge 12/02/07 23:19:34 |
| 2 |
|
| 3 |
Added: calligra-2.3.87-marble.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/calligra/files/calligra-2.3.87-marble.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/files/calligra-2.3.87-marble.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/files/calligra-2.3.87-marble.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: calligra-2.3.87-marble.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN calligra-2.3.87.orig/CMakeLists.txt calligra-2.3.87/CMakeLists.txt |
| 18 |
--- calligra-2.3.87.orig/CMakeLists.txt 2012-01-28 15:26:27.000000000 +0100 |
| 19 |
+++ calligra-2.3.87/CMakeLists.txt 2012-02-07 23:53:45.000000000 +0100 |
| 20 |
@@ -264,12 +264,9 @@ |
| 21 |
## |
| 22 |
find_file(MARBLECONTROLBOX_H MarbleControlBox.h ${MARBLE_INCLUDE_DIR}) |
| 23 |
if( MARBLECONTROLBOX_H ) |
| 24 |
- INCLUDE(CheckCXXSourceCompiles) |
| 25 |
- set(CMAKE_REQUIRED_LIBRARIES_SWAP ${CMAKE_REQUIRED_LIBRARIES}) |
| 26 |
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${MARBLE_LIBRARIES}) |
| 27 |
- CHECK_CXX_SOURCE_COMPILES ( "#include <${MARBLECONTROLBOX_H}>\nint main(){Marble::MarbleControlBox*p; p->setMarbleWidget(0); return 0;}" SETMARBLEWIDGET) |
| 28 |
- # subsequent tests will fail if this is not set back. |
| 29 |
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SWAP}) |
| 30 |
+ execute_process(COMMAND grep -m 1 -e "setMarbleWidget" ${MARBLECONTROLBOX_H} |
| 31 |
+ OUTPUT_VARIABLE SETMARBLEWIDGET |
| 32 |
+ ) |
| 33 |
if( SETMARBLEWIDGET ) |
| 34 |
add_definitions(-DHAVE_SETMARBLEWIDGET) |
| 35 |
endif( SETMARBLEWIDGET) |
Archives