| 1 |
philantrop 08/02/07 00:12:53 |
| 2 |
|
| 3 |
Added: dolphin-4.0.1-make-semantic-desktop-optional.patch |
| 4 |
dolphin-4.0.1-linkage.patch |
| 5 |
Log: |
| 6 |
Version bump to KDE 4.0.1. |
| 7 |
(Portage version: 2.1.4.1) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/dolphin/files/dolphin-4.0.1-make-semantic-desktop-optional.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/dolphin/files/dolphin-4.0.1-make-semantic-desktop-optional.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/dolphin/files/dolphin-4.0.1-make-semantic-desktop-optional.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: dolphin-4.0.1-make-semantic-desktop-optional.patch |
| 16 |
=================================================================== |
| 17 |
commit b5a2927b633d2ad357febe13efc717b02f04a5ba |
| 18 |
Author: Ingmar Vanhassel <ingmar.vanhassel@×××××.com> |
| 19 |
Date: Sat Jan 12 15:28:44 2008 +0100 |
| 20 |
|
| 21 |
Make Nepomuk & Soprano optional dependencies. |
| 22 |
Move the macro_optional_find_package({nepomuk,soprano}) statements before checking the results.r |
| 23 |
--- |
| 24 |
kdebase/apps/dolphin/src/CMakeLists.txt | 10 +++++----- |
| 25 |
1 files changed, 5 insertions(+), 5 deletions(-) |
| 26 |
|
| 27 |
diff --git a/kdebase/apps/dolphin/src/CMakeLists.txt b/kdebase/apps/dolphin/src/CMakeLists.txt |
| 28 |
index f9902dc..c379e95 100644 |
| 29 |
--- a/kdebase/apps/dolphin/src/CMakeLists.txt |
| 30 |
+++ b/kdebase/apps/dolphin/src/CMakeLists.txt |
| 31 |
@@ -1,3 +1,8 @@ |
| 32 |
+macro_optional_find_package(Nepomuk) |
| 33 |
+macro_optional_find_package(Soprano) |
| 34 |
+macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) |
| 35 |
+ |
| 36 |
+configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) |
| 37 |
|
| 38 |
add_subdirectory( pics ) |
| 39 |
add_subdirectory( tests ) |
| 40 |
@@ -40,11 +45,6 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS |
| 41 |
|
| 42 |
kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) |
| 43 |
|
| 44 |
-find_package(Nepomuk) |
| 45 |
-find_package(Soprano) |
| 46 |
-macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) |
| 47 |
- |
| 48 |
-configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) |
| 49 |
|
| 50 |
target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES}) |
| 51 |
if (Nepomuk_FOUND) |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 kde-base/dolphin/files/dolphin-4.0.1-linkage.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/dolphin/files/dolphin-4.0.1-linkage.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/dolphin/files/dolphin-4.0.1-linkage.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: dolphin-4.0.1-linkage.patch |
| 61 |
=================================================================== |
| 62 |
diff -ur kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt |
| 63 |
--- kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt 2007-11-20 23:01:04.000000000 +0100 |
| 64 |
+++ kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt 2007-12-10 13:23:37.000000000 +0100 |
| 65 |
@@ -59,7 +59,7 @@ |
| 66 |
|
| 67 |
kde4_add_plugin(dolphinpart ${dolphinpart_SRCS}) |
| 68 |
|
| 69 |
-target_link_libraries(dolphinpart dolphinprivate) |
| 70 |
+target_link_libraries(dolphinpart dolphinprivate ${KDE4_KPARTS_LIBS}) |
| 71 |
|
| 72 |
install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} ) |
| 73 |
|
| 74 |
@@ -113,7 +113,7 @@ |
| 75 |
dolphinmainwindow.h DolphinMainWindow) |
| 76 |
kde4_add_executable(dolphin ${dolphin_SRCS}) |
| 77 |
|
| 78 |
-target_link_libraries(dolphin ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate) |
| 79 |
+target_link_libraries(dolphin ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} konq dolphinprivate) |
| 80 |
|
| 81 |
if (Nepomuk_FOUND) |
| 82 |
target_link_libraries(dolphin ${NEPOMUK_LIBRARIES}) |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
-- |
| 87 |
gentoo-commits@l.g.o mailing list |
Archives