rev 10482 - in branches/kde4/packages/koffice/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Mon May 5 20:40:54 UTC 2008


Author: ana
Date: 2008-05-05 20:40:54 +0000 (Mon, 05 May 2008)
New Revision: 10482

Added:
   branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4/packages/koffice/debian/changelog
   branches/kde4/packages/koffice/debian/patches/series
Log:
Add patch 98_link_interfaces_library.diff to fix the CMake's 
TARGET_LINK_LIBRARIES fields. (Work in progress, help welcome)

Close new bug  #479559 in changelog




Modified: branches/kde4/packages/koffice/debian/changelog
===================================================================
--- branches/kde4/packages/koffice/debian/changelog	2008-05-05 20:19:17 UTC (rev 10481)
+++ branches/kde4/packages/koffice/debian/changelog	2008-05-05 20:40:54 UTC (rev 10482)
@@ -2,8 +2,11 @@
 
   * New upstrem release 1.9.95.4.
   * Remove patch fix_desktop_entry, merged upstream.
+  * Add patch 98_link_interfaces_library.diff to fix the CMake's 
+    TARGET_LINK_LIBRARIES fields. (WIP, help welcomed...)
   * Bump build depends to build against KDE 4.0.72 (snapshot from KDE 4.1).
-  * Update build depends, add libboost-dev and libopenexr-dev.
+  * Update build depends, add libboost-dev and libopenexr-dev. 
+    (Closes: #479559)
   * Split kword data files in kword-data. (Closes: #472931)
   * Remove Recommends: libkscan1 from kword. That is KDE 3 stuff.
 

Added: branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff	                        (rev 0)
+++ branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff	2008-05-05 20:40:54 UTC (rev 10482)
@@ -0,0 +1,29 @@
+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
+@@ -86,7 +86,7 @@
+ 
+ kde4_add_library(komain SHARED ${komain_LIB_SRCS})
+ 
+-target_link_libraries(komain koodf kstore ${KDE4_KPARTS_LIBS} ${KDE4_KABC_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS})
++target_link_libraries(komain koodf kstore ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KABC_LIBS} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS})
+ 
+ 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
+@@ -73,6 +73,11 @@
+ 
+ target_link_libraries(pigmentcms ${KDE4_KPARTS_LIBS} ${LCMS_LIBRARIES} ${LINK_OPENEXR_LIB} komain ${LINK_OPENCTL_LIB})
+ 
++if (X11_FOUND)
++  target_link_libraries(pigmentcms ${X11_X11_LIB})
++endif (X11_FOUND)
++
++
+ set_target_properties(pigmentcms PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+ 
+ 

Modified: branches/kde4/packages/koffice/debian/patches/series
===================================================================
--- branches/kde4/packages/koffice/debian/patches/series	2008-05-05 20:19:17 UTC (rev 10481)
+++ branches/kde4/packages/koffice/debian/patches/series	2008-05-05 20:40:54 UTC (rev 10482)
@@ -0,0 +1 @@
+97_fix_target_link_libraries.diff




More information about the pkg-kde-commits mailing list