autostart upstream patch
This commit is contained in:
parent
e079d00faf
commit
00fbaa215b
@ -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?
|
||||
|
@ -60,10 +60,10 @@ Patch4: kdelibs-3.97.0-alsa-default-device.patch
|
||||
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 @@ rm -rf %{buildroot}
|
||||
%changelog
|
||||
* Fri Feb 01 2008 Than Ngo <than@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@redhat.com> 4.0.1-2
|
||||
- autostart from XDG_CONFIG_DIRS
|
||||
|
Loading…
Reference in New Issue
Block a user