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

Sune Vuorela pusling-guest at alioth.debian.org
Sat Jun 28 16:41:04 UTC 2008 

Author: pusling-guest
Date: 2008-06-28 16:41:04 +0000 (Sat, 28 Jun 2008)
New Revision: 11160

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install
   branches/kde4/packages/kdebase-workspace/debian/libplasma2.install
   branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
update patches and install files and build xinerama stuff while we are at it

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-06-28 16:41:04 UTC (rev 11160)
@@ -1,5 +1,7 @@
-kdebase-workspace (4:4.0.83+svn821094-0) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.84-1) experimental; urgency=low
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
   * New upstream snapshot.
   * Remove 14_correct_kde4home_for_kstartupconfig4.diff.
     KDE_DEFAULT_HOME defines kde home.
@@ -8,7 +10,7 @@
 
   * Fix up some dependencies and conflicts/replaces in kdebase-workspace-dbg
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 16 Jun 2008 13:59:07 +0200
+ -- Sune Vuorela <debian at pusling.com>  Sat, 28 Jun 2008 10:57:09 +0200
 
 kdebase-workspace (4:4.0.82+svn819867-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-06-28 16:41:04 UTC (rev 11160)
@@ -11,7 +11,7 @@
  libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, network-manager-dev,
  libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
- libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev
+ libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-06-28 16:41:04 UTC (rev 11160)
@@ -80,6 +80,8 @@
 usr/lib/kde4/solid_fakenet.so
 usr/lib/kde4/solid_hal_power.so
 usr/lib/kde4/solid_networkmanager.so
+usr/lib/kde4/kcm_xinerama.so
+usr/lib/kde4/libexec/test_kcm_xinerama
 usr/lib/libkdeinit4_kaccess.so
 usr/lib/libkdeinit4_kcminit.so
 usr/lib/libkdeinit4_kcminit_startup.so

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-06-28 16:41:04 UTC (rev 11160)
@@ -378,6 +378,7 @@
 usr/share/kde4/services/solidbackends/solid_hal_power.desktop
 usr/share/kde4/services/solidbackends/solid_networkmanager.desktop
 usr/share/kde4/services/style.desktop
+usr/share/kde4/services/xinerama.desktop
 usr/share/kde4/servicetypes/plasma-animator.desktop
 usr/share/kde4/servicetypes/plasma-applet.desktop
 usr/share/kde4/servicetypes/plasma-containment.desktop
@@ -390,6 +391,14 @@
 usr/share/kde4/servicetypes/solidnetworkmanager.desktop
 usr/share/kde4/servicetypes/solidpowermanager.desktop
 usr/share/kde4/servicetypes/weather_ion.desktop
+usr/share/wallpapers/Blue_Curl/contents/images/1024x768.jpg
+usr/share/wallpapers/Blue_Curl/contents/images/1280x1024.jpg
+usr/share/wallpapers/Blue_Curl/contents/images/1280x800.jpg
+usr/share/wallpapers/Blue_Curl/contents/images/1440x900.jpg
+usr/share/wallpapers/Blue_Curl/contents/images/1600x1200.jpg
+usr/share/wallpapers/Blue_Curl/contents/images/1920x1200.jpg
+usr/share/wallpapers/Blue_Curl/contents/screenshot.png
+usr/share/wallpapers/Blue_Curl/metadata.desktop
 usr/share/wallpapers/Code_Poets_Dream/contents/images/1024x768.jpg
 usr/share/wallpapers/Code_Poets_Dream/contents/images/1280x1024.jpg
 usr/share/wallpapers/Code_Poets_Dream/contents/images/1280x800.jpg
@@ -430,7 +439,7 @@
 usr/share/wallpapers/Emotion/contents/images/1920x1200.jpg
 usr/share/wallpapers/Emotion/contents/screenshot.png
 usr/share/wallpapers/Emotion/metadata.desktop
-usr/share/wallpapers/Fields_of_Peace/contents/images/1024x768.jpg
+usr/share/wallpapers/Fields_of_Peace/contents/images/1024x768.JPG
 usr/share/wallpapers/Fields_of_Peace/contents/images/1280x1024.JPG
 usr/share/wallpapers/Fields_of_Peace/contents/images/1280x800.JPG
 usr/share/wallpapers/Fields_of_Peace/contents/images/1440x900.JPG
@@ -446,6 +455,14 @@
 usr/share/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
 usr/share/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
 usr/share/wallpapers/Finally_Summer_in_Germany/metadata.desktop
+usr/share/wallpapers/Flower_drops/contents/images/1024x768.jpg
+usr/share/wallpapers/Flower_drops/contents/images/1280x1024.jpg
+usr/share/wallpapers/Flower_drops/contents/images/1280x800.jpg
+usr/share/wallpapers/Flower_drops/contents/images/1440x900.jpg
+usr/share/wallpapers/Flower_drops/contents/images/1600x1200.jpg
+usr/share/wallpapers/Flower_drops/contents/images/1920x1200.jpg
+usr/share/wallpapers/Flower_drops/contents/screenshot.png
+usr/share/wallpapers/Flower_drops/metadata.desktop
 usr/share/wallpapers/Fresh_Morning/contents/images/1024x768.jpg
 usr/share/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
 usr/share/wallpapers/Fresh_Morning/contents/images/1280x800.jpg
@@ -510,5 +527,13 @@
 usr/share/wallpapers/There_is_Rain_on_the_Table/contents/images/1920x1200.jpg
 usr/share/wallpapers/There_is_Rain_on_the_Table/contents/screenshot.png
 usr/share/wallpapers/There_is_Rain_on_the_Table/metadata.desktop
+usr/share/wallpapers/Vector_Sunset/contents/images/1024x768.jpg
+usr/share/wallpapers/Vector_Sunset/contents/images/1280x1024.jpg
+usr/share/wallpapers/Vector_Sunset/contents/images/1280x800.jpg
+usr/share/wallpapers/Vector_Sunset/contents/images/1440x900.jpg
+usr/share/wallpapers/Vector_Sunset/contents/images/1600x1200.jpg
+usr/share/wallpapers/Vector_Sunset/contents/images/1920x1200.jpg
+usr/share/wallpapers/Vector_Sunset/contents/screenshot.png
+usr/share/wallpapers/Vector_Sunset/metadata.desktop
 usr/share/wallpapers/default_blue.jpg
 usr/share/wallpapers/default_blue.jpg.desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install	2008-06-28 16:41:04 UTC (rev 11160)
@@ -15,8 +15,10 @@
 usr/include/KDE/Plasma/DataEngineScript                                                                                                                                                                        
 usr/include/KDE/Plasma/Delegate
 usr/include/KDE/Plasma/Dialog
+usr/include/KDE/Plasma/Flash
 usr/include/KDE/Plasma/GLApplet
 usr/include/KDE/Plasma/GroupBox                                                                                                                                                                                
+usr/include/KDE/Plasma/Icon
 usr/include/KDE/Plasma/Label
 usr/include/KDE/Plasma/LineEdit
 usr/include/KDE/Plasma/Package

Modified: branches/kde4/packages/kdebase-workspace/debian/libplasma2.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma2.install	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma2.install	2008-06-28 16:41:04 UTC (rev 11160)
@@ -35,3 +35,4 @@
 usr/lib/libplasma.so.2.0.0
 usr/lib/libplasmaclock.so.4
 usr/lib/libplasmaclock.so.4.1.0
+usr/share/kde4/config/plasmoids.knsrc

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff	2008-06-28 16:41:04 UTC (rev 11160)
@@ -1,7 +1,9 @@
+Index: b/libs/ksysguard/processui/CMakeLists.txt
+===================================================================
 --- a/libs/ksysguard/processui/CMakeLists.txt
 +++ b/libs/ksysguard/processui/CMakeLists.txt
-@@ -4,11 +4,47 @@
- check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
+@@ -6,14 +6,50 @@
+ check_include_files(byteswap.h HAVE_BYTESWAP_H)
  
  if (HAVE_SYS_PTRACE_H)
 -   set(processui_ptrace_SRCS KMonitorProcessIO.cpp DisplayProcessDlg.cpp)
@@ -28,7 +30,10 @@
 +   include(CheckCSourceCompiles)
 +   check_c_source_compiles("${_SUPPORTED_REGS_STRUCT_CHECK}" HAVE_KSYSGUARD_SUPPORTED_REGS_STRUCT)
  else (HAVE_SYS_PTRACE_H)
--   set(processui_ptrace_SRCS )
+    # Even if we don't have ptrace, we need KMonitorProcessIO.cpp
+    # because the widget is referenced from the .widgets file and
+    # from the .ui files.
+-   set(processui_ptrace_SRCS KMonitorProcessIO.cpp)
 +   set(HAVE_KSYSGUARD_SUPPORTED_REGS_STRUCT "NO")
  endif (HAVE_SYS_PTRACE_H)
  
@@ -50,7 +55,7 @@
  set(processui_LIB_SRCS
     ksysguardprocesslist.cpp
     ProcessFilter.cc
-@@ -36,11 +72,7 @@
+@@ -41,11 +77,7 @@
  
  #----------------------
  
@@ -63,6 +68,8 @@
  
  kde4_add_plugin(ksysguardwidgets ${ksysguardwidgets_PART_SRCS})
  
+Index: b/libs/ksysguard/processui/KMonitorProcessIO.widgets
+===================================================================
 --- /dev/null
 +++ b/libs/ksysguard/processui/KMonitorProcessIO.widgets
 @@ -0,0 +1,7 @@
@@ -73,9 +80,11 @@
 +Group=KSysGuard (KDE)
 +ConstructorArgs=(parent)
 +IncludeFile=KMonitorProcessIO.h
+Index: b/libs/ksysguard/processui/ksysguardprocesslist.cpp
+===================================================================
 --- a/libs/ksysguard/processui/ksysguardprocesslist.cpp
 +++ b/libs/ksysguard/processui/ksysguardprocesslist.cpp
-@@ -54,7 +54,7 @@
+@@ -56,7 +56,7 @@
  #include "ReniceDlg.h"
  #include "ui_ProcessWidgetUI.h"
  
@@ -84,7 +93,7 @@
  #include "DisplayProcessDlg.h"
  #endif
  
-@@ -150,7 +150,11 @@
+@@ -152,7 +152,11 @@
  
  		selectTracer = new QAction(i18n("Jump to Process Debugging This One"), q);
  		window = new QAction(i18n("Show Application Window"), q);
@@ -96,7 +105,7 @@
  		resume = new QAction(i18n("Resume Stopped Process"), q);
  		kill = new QAction(i18np("Kill Process", "Kill Processes", 1), q);
  		kill->setIcon(KIcon("process-stop"));
-@@ -265,8 +269,10 @@
+@@ -267,8 +271,10 @@
  	// Add all the actions to the main widget, and get all the actions to call actionTriggered when clicked
  	QSignalMapper *signalMapper = new QSignalMapper(this);
  	QList<QAction *> actions;
@@ -109,7 +118,7 @@
  	foreach(QAction *action, actions) {
  		addAction(action);
  		connect(action, SIGNAL(triggered(bool)), signalMapper, SLOT(map()));
-@@ -389,7 +395,7 @@
+@@ -391,7 +397,7 @@
  	if (numProcesses == 1 && !d->mModel.data(realIndex, ProcessModel::WindowIdRole).isNull()) {
  		d->mProcessContextMenu->addAction(d->window);
  	}
@@ -118,7 +127,7 @@
  		d->mProcessContextMenu->addAction(d->monitorio);
  	}
  
-@@ -443,8 +449,8 @@
+@@ -445,8 +451,8 @@
  				KWindowSystem::activateWindow(wid);
  			}
  		}
@@ -128,6 +137,8 @@
  		QModelIndexList selectedIndexes = d->mUi->treeView->selectionModel()->selectedRows();
  		if(selectedIndexes.isEmpty()) return;  //No processes selected
  		QModelIndex realIndex = d->mFilterModel.mapToSource(selectedIndexes.at(0));
+Index: b/libs/ksysguard/processui/ksysguard.widgets
+===================================================================
 --- a/libs/ksysguard/processui/ksysguard.widgets
 +++ b/libs/ksysguard/processui/ksysguard.widgets
 @@ -15,10 +15,3 @@

Modified: 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	2008-06-28 14:39:12 UTC (rev 11159)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-06-28 16:41:04 UTC (rev 11160)
@@ -1,3 +1,5 @@
+Index: b/kcminit/CMakeLists.txt
+===================================================================
 --- a/kcminit/CMakeLists.txt
 +++ b/kcminit/CMakeLists.txt
 @@ -5,7 +5,7 @@
@@ -18,6 +20,8 @@
  
  install(TARGETS kdeinit_kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} )
  install(TARGETS kcminit_startup         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+Index: b/klipper/CMakeLists.txt
+===================================================================
 --- a/klipper/CMakeLists.txt
 +++ b/klipper/CMakeLists.txt
 @@ -18,11 +18,15 @@
@@ -37,6 +41,8 @@
  install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
  install(TARGETS klipper         ${INSTALL_TARGETS_DEFAULT_ARGS})
  
+Index: b/kmenuedit/CMakeLists.txt
+===================================================================
 --- a/kmenuedit/CMakeLists.txt
 +++ b/kmenuedit/CMakeLists.txt
 @@ -12,8 +12,7 @@
@@ -49,6 +55,8 @@
  
  install(TARGETS kdeinit_kmenuedit  DESTINATION ${LIB_INSTALL_DIR} )
  
+Index: b/ksysguard/gui/CMakeLists.txt
+===================================================================
 --- a/ksysguard/gui/CMakeLists.txt
 +++ b/ksysguard/gui/CMakeLists.txt
 @@ -55,7 +55,7 @@
@@ -60,6 +68,8 @@
  
  install(TARGETS kdeinit_ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS})
  install(TARGETS ksysguard         ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
+===================================================================
 --- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt
 +++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
 @@ -2,7 +2,7 @@
@@ -71,6 +81,8 @@
  install(TARGETS kcm_kwinoptions  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
  
+Index: b/kwin/lib/CMakeLists.txt
+===================================================================
 --- a/kwin/lib/CMakeLists.txt
 +++ b/kwin/lib/CMakeLists.txt
 @@ -37,7 +37,7 @@
@@ -82,6 +94,8 @@
  set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
  
  install(TARGETS kwineffects ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: b/libs/kworkspace/CMakeLists.txt
+===================================================================
 --- a/libs/kworkspace/CMakeLists.txt
 +++ b/libs/kworkspace/CMakeLists.txt
 @@ -17,7 +17,7 @@
@@ -93,6 +107,8 @@
  
  set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kworkspace ${INSTALL_TARGETS_DEFAULT_ARGS} )
+Index: b/libs/solid/control/CMakeLists.txt
+===================================================================
 --- a/libs/solid/control/CMakeLists.txt
 +++ b/libs/solid/control/CMakeLists.txt
 @@ -31,7 +31,7 @@
@@ -104,6 +120,8 @@
  
  set_target_properties(solidcontrol PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS solidcontrol ${INSTALL_TARGETS_DEFAULT_ARGS} )
+Index: b/libs/taskmanager/CMakeLists.txt
+===================================================================
 --- a/libs/taskmanager/CMakeLists.txt
 +++ b/libs/taskmanager/CMakeLists.txt
 @@ -7,7 +7,7 @@
@@ -115,6 +133,8 @@
  if (X11_Xfixes_FOUND)
    target_link_libraries(taskmanager ${X11_Xfixes_LIB})
  endif (X11_Xfixes_FOUND)
+Index: b/solid/bluez/CMakeLists.txt
+===================================================================
 --- a/solid/bluez/CMakeLists.txt
 +++ b/solid/bluez/CMakeLists.txt
 @@ -18,7 +18,7 @@
@@ -126,6 +146,8 @@
  install(TARGETS solid_bluez DESTINATION ${PLUGIN_INSTALL_DIR})
  
  install(FILES solid_bluez.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends )
+Index: b/solid/hal/CMakeLists.txt
+===================================================================
 --- a/solid/hal/CMakeLists.txt
 +++ b/solid/hal/CMakeLists.txt
 @@ -13,7 +13,7 @@
@@ -137,6 +159,8 @@
  
  
  
+Index: b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
+===================================================================
 --- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt
 +++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
 @@ -2,7 +2,7 @@
@@ -148,6 +172,8 @@
  install(TARGETS kcm_kwindecoration  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
  ########### install files ###############
+Index: b/kwin/kcmkwin/kwinrules/CMakeLists.txt
+===================================================================
 --- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
 +++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt
 @@ -10,7 +10,7 @@
@@ -168,6 +194,8 @@
  
  install(TARGETS kcm_kwinrules  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kwin/clients/b2/CMakeLists.txt
+===================================================================
 --- a/kwin/clients/b2/CMakeLists.txt
 +++ b/kwin/clients/b2/CMakeLists.txt
 @@ -9,7 +9,7 @@
@@ -179,6 +207,8 @@
  
  install(TARGETS kwin3_b2  DESTINATION ${PLUGIN_INSTALL_DIR})
  
+Index: b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
+===================================================================
 --- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt
 +++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
 @@ -11,7 +11,7 @@
@@ -200,6 +230,8 @@
  
  
  ########### install files ###############
+Index: b/kwin/kcmkwin/kwindesktop/CMakeLists.txt
+===================================================================
 --- a/kwin/kcmkwin/kwindesktop/CMakeLists.txt
 +++ b/kwin/kcmkwin/kwindesktop/CMakeLists.txt
 @@ -5,7 +5,7 @@
@@ -211,6 +243,8 @@
  
  install(TARGETS kcm_kwindesktop  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/plasma/applets/devicenotifier/CMakeLists.txt
+===================================================================
 --- a/plasma/applets/devicenotifier/CMakeLists.txt
 +++ b/plasma/applets/devicenotifier/CMakeLists.txt
 @@ -6,7 +6,7 @@
@@ -222,6 +256,8 @@
  
  install(TARGETS plasma_applet_devicenotifier DESTINATION ${PLUGIN_INSTALL_DIR})
  install(FILES plasma-applet-devicenotifier.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+Index: b/plasma/applets/systemtray/CMakeLists.txt
+===================================================================
 --- a/plasma/applets/systemtray/CMakeLists.txt
 +++ b/plasma/applets/systemtray/CMakeLists.txt
 @@ -6,7 +6,7 @@
@@ -233,6 +269,8 @@
  
  install(TARGETS plasma_applet_systemtray DESTINATION ${PLUGIN_INSTALL_DIR})
  install(FILES plasma-applet-systemtray.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+Index: b/plasma/dataengines/dict/CMakeLists.txt
+===================================================================
 --- a/plasma/dataengines/dict/CMakeLists.txt
 +++ b/plasma/dataengines/dict/CMakeLists.txt
 @@ -5,7 +5,7 @@
@@ -244,6 +282,8 @@
  
  install(TARGETS plasma_engine_dict DESTINATION ${PLUGIN_INSTALL_DIR})
  install(FILES plasma-dataengine-dict.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+Index: b/kcontrol/keyboard/CMakeLists.txt
+===================================================================
 --- a/kcontrol/keyboard/CMakeLists.txt
 +++ b/kcontrol/keyboard/CMakeLists.txt
 @@ -14,6 +14,7 @@
@@ -254,9 +294,11 @@
      ${KDE4_KIO_LIBS} 
  )
  if(X11_XTest_FOUND)
+Index: b/kcontrol/kxkb/CMakeLists.txt
+===================================================================
 --- a/kcontrol/kxkb/CMakeLists.txt
 +++ b/kcontrol/kxkb/CMakeLists.txt
-@@ -72,7 +72,7 @@
+@@ -83,7 +83,7 @@
  
  kde4_add_plugin(kcm_keyboard_layout ${kcm_keyboard_layout_PART_SRCS})
  
@@ -265,15 +307,17 @@
      ${XKB_SUPPORT_LIB}
  )
  
-@@ -97,7 +97,7 @@
+@@ -108,7 +108,7 @@
  
- kde4_add_kdeinit_executable( kxkb ${kxkb_KDEINIT_SRCS})
+ kde4_add_kdeinit_executable(kxkb ${kxkb_KDEINIT_SRCS})
  
 -target_link_libraries(kdeinit_kxkb ${X11_X11_LIB} ${X11_Xext_LIB} ${KDE4_KDEUI_LIBS}
 +target_link_libraries(kdeinit_kxkb ${X11_X11_LIB} ${X11_Xext_LIB} ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY}
       ${XKB_SUPPORT_LIB})
  
- install(TARGETS kdeinit_kxkb ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kdeinit_kxkb ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: b/kcontrol/randr/CMakeLists.txt
+===================================================================
 --- a/kcontrol/randr/CMakeLists.txt
 +++ b/kcontrol/randr/CMakeLists.txt
 @@ -33,7 +33,7 @@
@@ -285,6 +329,8 @@
  
  install(TARGETS kcm_randr  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/plasma/dataengines/mouse/CMakeLists.txt
+===================================================================
 --- a/plasma/dataengines/mouse/CMakeLists.txt
 +++ b/plasma/dataengines/mouse/CMakeLists.txt
 @@ -9,7 +9,7 @@
@@ -296,6 +342,8 @@
  if (X11_Xfixes_FOUND)
  	target_link_libraries(plasma_engine_mouse ${X11_Xfixes_LIB})
  endif (X11_Xfixes_FOUND)
+Index: b/plasma/dataengines/soliddevice/CMakeLists.txt
+===================================================================
 --- a/plasma/dataengines/soliddevice/CMakeLists.txt
 +++ b/plasma/dataengines/soliddevice/CMakeLists.txt
 @@ -8,7 +8,7 @@
@@ -307,6 +355,8 @@
  
  install(TARGETS plasma_engine_soliddevice DESTINATION ${PLUGIN_INSTALL_DIR})
  install(FILES plasma-dataengine-soliddevice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+Index: b/plasma/runners/bookmarks/CMakeLists.txt
+===================================================================
 --- a/plasma/runners/bookmarks/CMakeLists.txt
 +++ b/plasma/runners/bookmarks/CMakeLists.txt
 @@ -6,7 +6,7 @@
@@ -318,6 +368,8 @@
  
  install(TARGETS krunner_bookmarksrunner DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/plasma/runners/webshortcuts/CMakeLists.txt
+===================================================================
 --- a/plasma/runners/webshortcuts/CMakeLists.txt
 +++ b/plasma/runners/webshortcuts/CMakeLists.txt
 @@ -3,7 +3,7 @@
@@ -329,6 +381,8 @@
  
  install(TARGETS krunner_webshortcuts DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/plasma/runners/xesam/CMakeLists.txt
+===================================================================
 --- a/plasma/runners/xesam/CMakeLists.txt
 +++ b/plasma/runners/xesam/CMakeLists.txt
 @@ -3,7 +3,7 @@
@@ -340,6 +394,8 @@
  
  install(TARGETS krunner_xesam DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kcontrol/access/CMakeLists.txt
+===================================================================
 --- a/kcontrol/access/CMakeLists.txt
 +++ b/kcontrol/access/CMakeLists.txt
 @@ -9,7 +9,7 @@
@@ -360,6 +416,8 @@
  
  install(TARGETS kdeinit_kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} )
  install(TARGETS kaccess         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+Index: b/kcontrol/colors/CMakeLists.txt
+===================================================================
 --- a/kcontrol/colors/CMakeLists.txt
 +++ b/kcontrol/colors/CMakeLists.txt
 @@ -5,7 +5,7 @@
@@ -371,6 +429,8 @@
  
  install(TARGETS kcm_colors  DESTINATION ${PLUGIN_INSTALL_DIR})
  install( FILES colors.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+Index: b/kcontrol/energy/CMakeLists.txt
+===================================================================
 --- a/kcontrol/energy/CMakeLists.txt
 +++ b/kcontrol/energy/CMakeLists.txt
 @@ -13,7 +13,7 @@
@@ -382,6 +442,8 @@
  
  install(TARGETS kcm_energy  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kcontrol/fonts/CMakeLists.txt
+===================================================================
 --- a/kcontrol/fonts/CMakeLists.txt
 +++ b/kcontrol/fonts/CMakeLists.txt
 @@ -11,7 +11,7 @@
@@ -393,6 +455,8 @@
  
  install(TARGETS kcm_fonts  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kcontrol/input/CMakeLists.txt
+===================================================================
 --- a/kcontrol/input/CMakeLists.txt
 +++ b/kcontrol/input/CMakeLists.txt
 @@ -42,6 +42,7 @@
@@ -412,6 +476,8 @@
  if (LIBUSB_FOUND)
     target_link_libraries(kcm_input ${LIBUSB_LIBRARIES})
  endif (LIBUSB_FOUND)
+Index: b/kcontrol/kdm/CMakeLists.txt
+===================================================================
 --- a/kcontrol/kdm/CMakeLists.txt
 +++ b/kcontrol/kdm/CMakeLists.txt
 @@ -27,7 +27,7 @@
@@ -423,6 +489,8 @@
  
  install(TARGETS kcm_kdm  DESTINATION ${PLUGIN_INSTALL_DIR})
  
+Index: b/kcontrol/keys/CMakeLists.txt
+===================================================================
 --- a/kcontrol/keys/CMakeLists.txt
 +++ b/kcontrol/keys/CMakeLists.txt
 @@ -13,7 +13,7 @@
@@ -434,6 +502,8 @@
  
  install(TARGETS kcm_keys  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kcontrol/launch/CMakeLists.txt
+===================================================================
 --- a/kcontrol/launch/CMakeLists.txt
 +++ b/kcontrol/launch/CMakeLists.txt
 @@ -13,7 +13,7 @@
@@ -445,6 +515,8 @@
  
  install(TARGETS kcm_launch  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/kcontrol/screensaver/CMakeLists.txt
+===================================================================
 --- a/kcontrol/screensaver/CMakeLists.txt
 +++ b/kcontrol/screensaver/CMakeLists.txt
 @@ -26,7 +26,7 @@
@@ -456,6 +528,8 @@
  
  if(HAVE_GLXCHOOSEVISUAL)
     target_link_libraries(kcm_screensaver ${OPENGL_gl_LIBRARY})
+Index: b/kcontrol/style/CMakeLists.txt
+===================================================================
 --- a/kcontrol/style/CMakeLists.txt
 +++ b/kcontrol/style/CMakeLists.txt
 @@ -12,7 +12,7 @@
@@ -467,6 +541,8 @@
  
  install(TARGETS kcm_style  DESTINATION ${PLUGIN_INSTALL_DIR})
  
+Index: b/khotkeys/libkhotkeysprivate/CMakeLists.txt
+===================================================================
 --- a/khotkeys/libkhotkeysprivate/CMakeLists.txt
 +++ b/khotkeys/libkhotkeysprivate/CMakeLists.txt
 @@ -83,6 +83,9 @@
@@ -479,6 +555,8 @@
  target_link_libraries(khotkeysprivate kworkspace ${KDE4_KDE3SUPPORT_LIBS})
  set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
+===================================================================
 --- a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
 +++ b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
 @@ -9,7 +9,7 @@
@@ -490,6 +568,8 @@
  
  install(TARGETS kcm_fontinst  DESTINATION ${PLUGIN_INSTALL_DIR} )
  install( FILES fontinst.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+Index: b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
+===================================================================
 --- a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
 +++ b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
 @@ -2,6 +2,6 @@
@@ -500,6 +580,8 @@
 +target_link_libraries(font ${STREAMANALYZER_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} kfontinst )
  set_target_properties(font PROPERTIES  PREFIX strigita_)
  install(TARGETS font LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
+Index: b/kcontrol/kfontinst/lib/CMakeLists.txt
+===================================================================
 --- a/kcontrol/kfontinst/lib/CMakeLists.txt
 +++ b/kcontrol/kfontinst/lib/CMakeLists.txt
 @@ -4,7 +4,7 @@
@@ -511,13 +593,28 @@
  set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  
  kde4_add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
+Index: b/libs/plasma/CMakeLists.txt
+===================================================================
 --- a/libs/plasma/CMakeLists.txt
 +++ b/libs/plasma/CMakeLists.txt
 @@ -90,6 +90,7 @@
  
- target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}
+ target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF2_LIBS}
                               ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
 +                             ${KDE4_SOLID_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY}
                               ${KDE4_THREADWEAVER_LIBRARIES})
  
  if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+Index: b/ksmserver/CMakeLists.txt
+===================================================================
+--- a/ksmserver/CMakeLists.txt
++++ b/ksmserver/CMakeLists.txt
+@@ -47,7 +47,7 @@
+ 
+ kde4_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_ksmserver plasma solidcontrol kworkspace ${KDE4_KDEUI_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
++target_link_libraries(kdeinit_ksmserver plasma solidcontrol kworkspace ${KDE4_KDEUI_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES} ${X11_Xrender_LIB})
+ 
+ install(TARGETS kdeinit_ksmserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+

More information about the pkg-kde-commits mailing list