diff --git a/kdelibs-3.5.9-KDE3.patch b/kdelibs-3.5.9-KDE3.patch new file mode 100644 index 0000000..70f3a6c --- /dev/null +++ b/kdelibs-3.5.9-KDE3.patch @@ -0,0 +1,41 @@ +diff -up kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservice.cpp +--- kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 2008-02-13 03:41:06.000000000 -0600 ++++ kdelibs-3.5.9/kio/kio/kservice.cpp 2008-05-15 15:36:13.000000000 -0500 +@@ -701,7 +701,7 @@ bool KService::noDisplay() const { + { + QString aValue = it.data().toString(); + QStringList aList = QStringList::split(';', aValue); +- if (!aList.contains("KDE")) ++ if (!(aList.contains("KDE") || aList.contains("KDE3")) ) + return true; + } + +@@ -710,7 +710,7 @@ bool KService::noDisplay() const { + { + QString aValue = it.data().toString(); + QStringList aList = QStringList::split(';', aValue); +- if (aList.contains("KDE")) ++ if (aList.contains("KDE") || aList.contains("KDE3")) + return true; + } + +diff -up kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservicegroup.cpp +--- kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 2007-05-14 02:52:35.000000000 -0500 ++++ kdelibs-3.5.9/kio/kio/kservicegroup.cpp 2008-05-15 15:39:34.000000000 -0500 +@@ -76,12 +76,14 @@ KServiceGroup::KServiceGroup( const QStr + QStringList tmpList; + if (config.hasKey("OnlyShowIn")) + { +- if (!config.readListEntry("OnlyShowIn", ';').contains("KDE")) ++ QStringList onlyShowInList = config.readListEntry("OnlyShowIn", ';'); ++ if (! (onlyShowInList.contains("KDE") || onlyShowInList.contains("KDE3"))) + d->m_bNoDisplay = true; + } + if (config.hasKey("NotShowIn")) + { +- if (config.readListEntry("NotShowIn", ';').contains("KDE")) ++ QStringList notShowInList = config.readListEntry("NotShowIn", ';'); ++ if (notShowInList.contains("KDE") || notShowInList.contains("KDE3")) + d->m_bNoDisplay = true; + } + diff --git a/kdelibs-3.5.9-drkonqi-kde4.patch b/kdelibs-3.5.9-drkonqi-kde4.patch new file mode 100644 index 0000000..5df229d --- /dev/null +++ b/kdelibs-3.5.9-drkonqi-kde4.patch @@ -0,0 +1,21 @@ +diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp +--- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 ++++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200 +@@ -158,7 +158,7 @@ + int i = 0; + + // argument 0 has to be drkonqi +- argv[i++] = "drkonqi"; ++ argv[i++] = "/usr/libexec/kde4/drkonqi"; + + #if defined Q_WS_X11 + // start up on the correct display +@@ -325,7 +325,7 @@ + _exit(253); + if(!geteuid() && setuid(getuid()) < 0) + _exit(253); +- execvp("drkonqi", const_cast< char** >( argv )); ++ execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv )); + _exit(errno); + } + else diff --git a/kdelibs-3.5.9-kate-regression.patch b/kdelibs-3.5.9-kate-regression.patch deleted file mode 100644 index da20fe5..0000000 --- a/kdelibs-3.5.9-kate-regression.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdelibs/kate/part/katesupercursor.cpp 2008/02/08 14:17:43 772352 -+++ kdelibs/kate/part/katesupercursor.cpp 2008/02/20 11:02:18 777286 -@@ -186,7 +186,7 @@ - { - if (newLine) - { -- if (m_line > int(line) || (m_line == int(line) && m_col > int(col))) -+ if (m_line > int(line) || (m_line == int(line) && m_col >= int(col))) - { - if(m_line == int(line)) - m_col -= col;