rev 11382 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-07 19:57:24 +0000 (Mon, 07 Jul 2008)
New Revision: 11382

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
updating...


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-07-07 17:34:03 UTC (rev 11381)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-07-07 19:57:24 UTC (rev 11382)
@@ -11,7 +11,7 @@
   * Resync patches: 07_kdmrc_defaults,
     12_be_better_at_honouring_user_kdm_theming and
     21_kdm_doesnt_use_kstandarddirs.
-  * Remove 97_fix_target_link_libraries.
+  * Update  97_fix_target_link_libraries (WIP)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 2 Jul 2008 13:57:09 +0200
 

Added: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-07-07 19:57:24 UTC (rev 11382)
@@ -0,0 +1,34 @@
+--- kdebase-workspace-4.0.85+svn829067.orig/kcminit/CMakeLists.txt
++++ kdebase-workspace-4.0.85+svn829067/kcminit/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ 
+ kde4_add_kdeinit_executable( kcminit ${kcminit_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_kcminit  ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kdeinit_kcminit  ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
+ 
+ install(TARGETS kdeinit_kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kcminit         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+@@ -19,7 +19,7 @@
+ 
+ kde4_add_kdeinit_executable( kcminit_startup ${kcminit_startup_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_kcminit_startup  ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kdeinit_kcminit_startup  ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+ 
+ install(TARGETS kdeinit_kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kcminit_startup         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- kdebase-workspace-4.0.85+svn829067.orig/klipper/CMakeLists.txt
++++ kdebase-workspace-4.0.85+svn829067/klipper/CMakeLists.txt
+@@ -23,6 +23,11 @@
+   target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
+ endif (X11_Xfixes_FOUND)
+ 
++if (X11_X11_LIB)
++  target_link_libraries(kdeinit_klipper ${X11_X11_LIB})
++endif (X11_X11_LIB)
++
++
+ install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS klipper         ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-07-07 17:34:03 UTC (rev 11381)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-07-07 19:57:24 UTC (rev 11382)
@@ -8,4 +8,4 @@
 17_ksysguard_disable_procmon_when_unsupported.diff
 20_use_dejavu_as_default_font.diff
 21_kdm_doesnt_use_kstandarddirs.diff
-#97_fix_target_link_libraries.diff
+97_fix_target_link_libraries.diff