Added patches.

Package-Manager: portage-2.1.4

3 files changed, 62 insertions, 1 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index dda3483fdaaa..4a409857195b 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.1 2008/01/17 23:29:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.2 2008/01/18 00:10:28 philantrop Exp $
+
+  18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/dolphin-4.0.0-linkage.patch,
+  +files/dolphin-4.0.0-make-semantic-desktop-optional.patch:
+  Added patches.
 
 *dolphin-4.0.0 (17 Jan 2008)
 
diff --git a/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch b/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch
new file mode 100644
index 000000000000..dabf3e76368d
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch
@@ -0,0 +1,21 @@
+diff -ur kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt
+--- kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt	2007-11-20 23:01:04.000000000 +0100
++++ kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt	2007-12-10 13:23:37.000000000 +0100
+@@ -59,7 +59,7 @@
+ 
+ kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
+ 
+-target_link_libraries(dolphinpart dolphinprivate)
++target_link_libraries(dolphinpart dolphinprivate ${KDE4_KPARTS_LIBS})
+ 
+ install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+@@ -113,7 +113,7 @@
+    dolphinmainwindow.h DolphinMainWindow)
+ kde4_add_executable(dolphin ${dolphin_SRCS})
+ 
+-target_link_libraries(dolphin  ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate)
++target_link_libraries(dolphin  ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} konq dolphinprivate)
+ 
+ if (Nepomuk_FOUND)
+   target_link_libraries(dolphin ${NEPOMUK_LIBRARIES})
diff --git a/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch b/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch
new file mode 100644
index 000000000000..d9c1efb26978
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch
@@ -0,0 +1,35 @@
+commit b5a2927b633d2ad357febe13efc717b02f04a5ba
+Author: Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+Date:   Sat Jan 12 15:28:44 2008 +0100
+
+    Make Nepomuk & Soprano optional dependencies.
+    Move the macro_optional_find_package({nepomuk,soprano}) statements before checking the results.r
+---
+ kdebase/apps/dolphin/src/CMakeLists.txt |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/kdebase/apps/dolphin/src/CMakeLists.txt b/kdebase/apps/dolphin/src/CMakeLists.txt
+index f9902dc..c379e95 100644
+--- a/kdebase/apps/dolphin/src/CMakeLists.txt
++++ b/kdebase/apps/dolphin/src/CMakeLists.txt
+@@ -1,3 +1,8 @@
++macro_optional_find_package(Nepomuk)
++macro_optional_find_package(Soprano)
++macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
++
++configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
+ 
+ add_subdirectory( pics )
+ add_subdirectory( tests )
+@@ -40,11 +45,6 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
+ 
+ kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
+ 
+-find_package(Nepomuk)
+-find_package(Soprano)
+-macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
+-
+-configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
+ 
+ target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES})
+ if (Nepomuk_FOUND)