rev 10485 - branches/kde4/packages/koffice/debian/patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Tue May 6 06:19:51 UTC 2008


Author: ana
Date: 2008-05-06 06:19:51 +0000 (Tue, 06 May 2008)
New Revision: 10485

Modified:
   branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
Log:
updating patch, yeah!


Modified: branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff	2008-05-05 22:18:46 UTC (rev 10484)
+++ branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff	2008-05-06 06:19:51 UTC (rev 10485)
@@ -1,7 +1,5 @@
-Index: koffice-1.9.96.0~that.is.really.1.9.95.4/libs/main/CMakeLists.txt
-===================================================================
---- koffice-1.9.96.0~that.is.really.1.9.95.4.orig/libs/main/CMakeLists.txt	2008-05-05 20:08:51.000000000 +0000
-+++ koffice-1.9.96.0~that.is.really.1.9.95.4/libs/main/CMakeLists.txt	2008-05-05 20:08:52.000000000 +0000
+--- koffice/libs/main/CMakeLists.txt
++++ koffice/libs/main/CMakeLists.txt
 @@ -86,7 +86,7 @@
  
  kde4_add_library(komain SHARED ${komain_LIB_SRCS})
@@ -11,10 +9,8 @@
  
  set_target_properties(komain PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
  install(TARGETS komain DESTINATION ${LIB_INSTALL_DIR} )
-Index: koffice-1.9.96.0~that.is.really.1.9.95.4/libs/pigment/CMakeLists.txt
-===================================================================
---- koffice-1.9.96.0~that.is.really.1.9.95.4.orig/libs/pigment/CMakeLists.txt	2008-05-05 20:10:25.000000000 +0000
-+++ koffice-1.9.96.0~that.is.really.1.9.95.4/libs/pigment/CMakeLists.txt	2008-05-05 20:10:25.000000000 +0000
+--- koffice/libs/pigment/CMakeLists.txt
++++ koffice/libs/pigment/CMakeLists.txt
 @@ -73,6 +73,11 @@
  
  target_link_libraries(pigmentcms ${KDE4_KPARTS_LIBS} ${LCMS_LIBRARIES} ${LINK_OPENEXR_LIB} komain ${LINK_OPENCTL_LIB})
@@ -27,3 +23,13 @@
  set_target_properties(pigmentcms PROPERTIES VERSION 1.0.0 SOVERSION 1 )
  
  
+--- koffice/libs/kokross/CMakeLists.txt
++++ koffice/libs/kokross/CMakeLists.txt
+@@ -2,6 +2,6 @@
+ set(kokross_LIB_SRCS KoScriptingModule.cpp KoScriptingDocker.cpp KoScriptManager.cpp KoScriptManagerAdd.cpp KoScriptingPart.cpp KoScriptingOdf.cpp)
+ kde4_add_library(kokross SHARED ${kokross_LIB_SRCS})
+ 
+-target_link_libraries(kokross ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF2_LIBRARY} ${KDE4_KROSSUI_LIBS} komain)
++target_link_libraries(kokross krosscore ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF2_LIBRARY} ${KDE4_KROSSUI_LIBS} komain)
+ set_target_properties(kokross PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION})
+ install(TARGETS kokross DESTINATION ${LIB_INSTALL_DIR})




More information about the pkg-kde-commits mailing list