rev 10642 - branches/kde4/packages/kdepim/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2008-05-18 22:50:18 +0000 (Sun, 18 May 2008)
New Revision: 10642

Modified:
   branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff
   branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
Log:
Refresh patches to apply on kdepim 4.0.74.


Modified: branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff	2008-05-18 22:15:55 UTC (rev 10641)
+++ branches/kde4/packages/kdepim/debian/patches/01_cmake_fixups.diff	2008-05-18 22:50:18 UTC (rev 10642)
@@ -1,8 +1,6 @@
-Index: b/korganizer/CMakeLists.txt
-===================================================================
 --- a/korganizer/CMakeLists.txt
 +++ b/korganizer/CMakeLists.txt
-@@ -223,7 +223,7 @@
+@@ -224,7 +224,7 @@
  
  add_dependencies(korganizerprivate kmail)
  
@@ -11,8 +9,6 @@
                                                        kdepim korganizer_eventviewer korganizer_calendar kocorehelper
                                                        korg_stdprinting kholidays korganizer_interfaces )
  
-Index: b/ktimetracker/CMakeLists.txt
-===================================================================
 --- a/ktimetracker/CMakeLists.txt
 +++ b/ktimetracker/CMakeLists.txt
 @@ -73,7 +73,7 @@
@@ -24,11 +20,9 @@
  if(X11_Xscreensaver_LIB)
  	target_link_libraries(karmpart  ${X11_Xscreensaver_LIB} )
  endif(X11_Xscreensaver_LIB)
-Index: b/akregator/src/CMakeLists.txt
-===================================================================
 --- a/akregator/src/CMakeLists.txt
 +++ b/akregator/src/CMakeLists.txt
-@@ -33,7 +33,7 @@
+@@ -31,7 +31,7 @@
  
  kde4_add_library(akregatorprivate SHARED ${akregatorprivate_LIB_SRCS})
  
@@ -37,11 +31,9 @@
  
  set_target_properties(akregatorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS akregatorprivate DESTINATION ${LIB_INSTALL_DIR})
-Index: b/libkdepim/CMakeLists.txt
-===================================================================
 --- a/libkdepim/CMakeLists.txt
 +++ b/libkdepim/CMakeLists.txt
-@@ -92,7 +92,7 @@
+@@ -94,7 +94,7 @@
  
  kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
  

Modified: branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-05-18 22:15:55 UTC (rev 10641)
+++ branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-05-18 22:50:18 UTC (rev 10642)
@@ -11,7 +11,7 @@
  install(TARGETS schema  DESTINATION ${LIB_INSTALL_DIR})
 --- a/libkdepim/CMakeLists.txt
 +++ b/libkdepim/CMakeLists.txt
-@@ -93,7 +93,7 @@
+@@ -94,7 +94,7 @@
  
  kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
  
@@ -44,7 +44,7 @@
  install(TARGETS imap DESTINATION ${LIB_INSTALL_DIR})
 --- a/libkleo/CMakeLists.txt
 +++ b/libkleo/CMakeLists.txt
-@@ -104,7 +104,7 @@
+@@ -105,7 +105,7 @@
  if(WIN32)
  target_link_libraries(kleo ${kleo_LIB_LIBS}  ${GPGME_VANILLA_LIBRARIES} )
  else(WIN32)
@@ -55,15 +55,15 @@
  install(TARGETS kleo DESTINATION ${LIB_INSTALL_DIR})
 --- a/kmail/CMakeLists.txt
 +++ b/kmail/CMakeLists.txt
-@@ -250,7 +250,7 @@
+@@ -264,7 +264,7 @@
+ endif(WIN32)
  
  kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS})
- 
 -kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY})
-+kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
- 
- if(Nepomuk_FOUND)
-    kdepim4_link_unique_libraries(kmailprivate ${NEPOMUK_LIBRARIES} )
++kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+ if(WIN32)
+   kdepim4_link_unique_libraries(kmailprivate ${SQLITE_LIBRARIES})
+ endif(WIN32)
 --- a/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt
 +++ b/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt
 @@ -93,6 +93,7 @@