drop automake related build artifacts

[packages/kdebase.git] / kdebase-screensavers.patch

--- kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp~	2014-05-27 14:43:26.000000000 +0300
+++ kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp	2014-05-27 14:44:03.279359098 +0300
@@ -84,10 +84,9 @@
     mMonitor = 0;
     mTesting = false;
 
-    // Add non-KDE path
     KGlobal::dirs()->addResourceType("scrsav",
-                                     KGlobal::dirs()->kde_default("apps") +
-                                     "apps/ScreenSavers/");
+                                     KGlobal::dirs()->kde_default("data") +
+                                     "kscreensaver/");
 
     setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and"
        " configure a screen saver. Note that you can enable a screen saver"
@@ -111,19 +111,6 @@
 
     setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
 
-    // Add KDE specific screensaver path
-    TQString relPath="System/ScreenSavers/";
-    KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" );
-    if (servGroup)
-    {
-      relPath=servGroup->relPath();
-      kdDebug() << "relPath=" << relPath << endl;
-    }
-
-    KGlobal::dirs()->addResourceType("scrsav",
-                                     KGlobal::dirs()->kde_default("apps") +
-                                     relPath);
-
     readSettings( false );
 
     mSetupProc = new KProcess;
--- kdebase-trinity-3.5.13.2/kscreensaver/CMakeLists.txt~	2012-09-16 15:52:04.000000000 +0300
+++ kdebase-trinity-3.5.13.2/kscreensaver/CMakeLists.txt	2014-06-04 11:07:10.329823207 +0300
@@ -23,7 +23,7 @@
 
 ##### other data ################################
 
-install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers )
+install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${DATA_INSTALL_DIR}/kscreensaver)
 
 
 ##### krandom (executable) ######################
--- kdebase-trinity-3.5.13.2/kdesktop/lock/lockprocess.cc~	2013-05-14 22:43:53.000000000 +0300
+++ kdebase-trinity-3.5.13.2/kdesktop/lock/lockprocess.cc	2014-05-27 14:45:38.113472747 +0300
@@ -276,22 +276,9 @@
     }
     XSelectInput( qt_xdisplay(), qt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
 
-    // Add non-KDE path
     KGlobal::dirs()->addResourceType("scrsav",
-                                    KGlobal::dirs()->kde_default("apps") +
-                                    "System/ScreenSavers/");
-
-    // Add KDE specific screensaver path
-    TQString relPath="System/ScreenSavers/";
-    KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers");
-    if (servGroup)
-    {
-      relPath=servGroup->relPath();
-      kdDebug(1204) << "relPath=" << relPath << endl;
-    }
-    KGlobal::dirs()->addResourceType("scrsav",
-                                     KGlobal::dirs()->kde_default("apps") +
-                                     relPath);
+                                     KGlobal::dirs()->kde_default("data") +
+                                     "kscreensaver/");
 
     // virtual root property
     gXA_VROOT = XInternAtom (qt_xdisplay(), "__SWM_VROOT", False);