rpms/kdelibs/devel kdelibs-4.0.1-autostart.patch, 1.1, 1.2 kdelibs.spec, 1.266, 1.267

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513

Modified Files:
	kdelibs-4.0.1-autostart.patch kdelibs.spec 
Log Message:
autostart  upstream patch


kdelibs-4.0.1-autostart.patch:

Index: kdelibs-4.0.1-autostart.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.0.1-autostart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.0.1-autostart.patch	1 Feb 2008 12:57:29 -0000	1.1
+++ kdelibs-4.0.1-autostart.patch	4 Feb 2008 17:07:25 -0000	1.2
@@ -1,16 +1,26 @@
-diff -up kdelibs-4.0.1/kinit/autostart.cpp.orig kdelibs-4.0.1/kinit/autostart.cpp
---- kdelibs-4.0.1/kinit/autostart.cpp.orig	2008-02-01 12:37:47.000000000 +0100
-+++ kdelibs-4.0.1/kinit/autostart.cpp	2008-02-01 13:52:38.000000000 +0100
-@@ -39,6 +39,12 @@ AutoStart::AutoStart()
+--- kdelibs-4.0.1/kinit/autostart.cpp.sav	2007-10-30 11:13:33.000000000 +0100
++++ kdelibs-4.0.1/kinit/autostart.cpp	2008-02-04 14:08:27.000000000 +0100
+@@ -38,7 +38,9 @@ AutoStart::AutoStart()
+   : m_phase(-1), m_phasedone(false)
  {
    m_startList = new AutoStartList;
-   KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
-+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
-+  if (xdgconf_dirs.isEmpty())
-+         xdgconf_dirs = "/etc/xdg";
-+  QStringList xdgconf_dirslist = QString(xdgconf_dirs).split(':');
-+  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
-+         KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
+-  KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
++  KGlobal::dirs()->addResourceType("xdgconf-autostart", NULL, "autostart/"); // xdg ones
++  KGlobal::dirs()->addResourceType("autostart", "xdgconf-autostart", "/"); // merge them
++  KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart"); // KDE ones are higher priority
  }
  
  AutoStart::~AutoStart()
+--- kdelibs-4.0.1/kdecore/kernel/kautostart.cpp.sav	2007-11-13 11:43:41.000000000 +0100
++++ kdelibs-4.0.1/kdecore/kernel/kautostart.cpp	2008-02-04 14:08:14.000000000 +0100
+@@ -51,7 +51,9 @@ KAutostart::KAutostart(const QString& en
+     : QObject(parent),
+       d(new Private)
+ {
+-    KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
++    KGlobal::dirs()->addResourceType("xdgconf-autostart", NULL, "autostart/"); // xdg ones
++    KGlobal::dirs()->addResourceType("autostart", "xdgconf-autostart", "/"); // merge them
++    KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart"); // KDE ones are higher priority
+     if (entryName.isEmpty())
+     {
+         // XXX sure that the mainComponent is available at this point?


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- kdelibs.spec	1 Feb 2008 15:37:29 -0000	1.266
+++ kdelibs.spec	4 Feb 2008 17:07:25 -0000	1.267
@@ -60,10 +60,10 @@
 Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
 # openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
 Patch6: kdelibs-4.0.0-openssl.patch
-Patch7: kdelibs-4.0.1-autostart.patch
 
 # upstream patches
 Patch100: kdelibs-4.0.1-objectembed-handling.patch
+Patch101: kdelibs-4.0.1-autostart.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -281,6 +281,7 @@
 %changelog
 * Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-3
 - upstream patch to fix a regression in <object><embed> handling
+- autostart upstream patch
 
 * Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-2
 - autostart from XDG_CONFIG_DIRS