Drop unused patch.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

9 files changed, 11 insertions, 415 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 5f814b94d75c..52edee08088a 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.701 2010/08/09 17:34:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.702 2010/08/10 13:06:15 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch,
+  -files/kdelibs-4.3.1-macos-kinit-fork.patch,
+  -files/kdelibs-4.3.1-macos-unbundle.patch,
+  -files/kdelibs-4.3.1-module-suffix.patch,
+  -files/kdelibs-4.3.3-glibc-2.11.patch,
+  -files/kdelibs-4.3.3-plasma-pixmap-cache.patch,
+  -files/kdelibs-4.4.2-hang.patch, -files/dist/11-xdg-menu-kde:
+  Drop unused patch.
 
   09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> kdelibs-4.4.5.ebuild:
   Drop alpha ia64 and sparc per the AT Lead permission.
diff --git a/kde-base/kdelibs/files/dist/11-xdg-menu-kde b/kde-base/kdelibs/files/dist/11-xdg-menu-kde
deleted file mode 100755
index 1360fc371c36..000000000000
--- a/kde-base/kdelibs/files/dist/11-xdg-menu-kde
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "KDE-4" ]
-then
-	export XDG_MENU_PREFIX=@REPLACE_MENU_PREFIX@
-fi
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch
deleted file mode 100644
index b03f7a09a89c..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-There's some non 64-bit supported code in here. So try to redo it in a 640bit
-compatible way.
-
-Author: Heiko Przybyl <zuxez@cs.tu-berlin.de>
-
---- kdelibs-4.3.1/work/kdelibs-4.3.1/kdeui/util/kkeyserver_mac.cpp.orig	2009-09-24 15:59:10 +0200
-+++ kdelibs-4.3.1/work/kdelibs-4.3.1/kdeui/util/kkeyserver_mac.cpp	2009-09-24 16:48:46 +0200
-@@ -65,11 +65,11 @@ namespace KKeyServer {
-     
-     static QMultiMap<int, uint> scancodes;
-     static long lastLayoutID = -1;
--    static KeyboardLayoutRef lastLayout = NULL;
-+    static TISInputSourceRef lastLayout = NULL;
-     
-     void updateScancodes() {
--        KeyboardLayoutRef layout;
--        if (KLGetCurrentKeyboardLayout(&layout) != noErr) {
-+		TISInputSourceRef layout = TISCopyCurrentKeyboardLayoutInputSource();
-+        if (layout == NULL) {
-             kWarning() << "Error retrieving current layout";
-         }
-         if (layout != lastLayout) {
-@@ -80,16 +80,27 @@ namespace KKeyServer {
- #endif
-             lastLayout = layout;
-             scancodes.clear();
--            void *kchr;
--            if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) {
-+            UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData);
-+            if (uchr == NULL) {
-                 kWarning() << "Couldn't load active keyboard layout";
-             } else {
-                 for (int i = 0; i < 128; i++) {
-                     UInt32 tmpState = 0;
--                    UInt32 chr = KeyTranslate(kchr, i, &tmpState);
--                    if (chr && chr != kFunctionKeyCharCode) {
--                        scancodes.insert(chr, i);
--                    }
-+                    UInt32 deadKeyState = 0;
-+					UInt32 flags = 0;
-+					UniCharCount maxStringLength = 255;
-+					UniCharCount actualStringLength = 0;
-+					UniChar unicodeString[maxStringLength];
-+
-+					UCKeyTranslate(uchr, i, kUCKeyActionDown,
-+							flags, LMGetKbdType(),
-+							1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString);
-+					fprintf(stderr, "Got key: %s\n", unicodeString);
-+					fflush(stderr);
-+                    //UInt32 chr = KeyTranslate(kchr, i, &tmpState);
-+                    //if (chr && chr != kFunctionKeyCharCode) {
-+                    //    scancodes.insert(chr, i);
-+                    //}
-                 }
-             }
-         }
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-macos-kinit-fork.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-macos-kinit-fork.patch
deleted file mode 100644
index 85b006ed3bb2..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-macos-kinit-fork.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch avoids calling of QDesktopServices::storageLocation() to workaround
-the abort(USING_FORK_WITHOUT_EXEC_IS_NOT_SUPPORTED_BY_FILE_MANAGER) on kdeinit4
-startup.
-
---- kdelibs-4.3.2/kinit/kinit.cpp.orig	2009-10-09 18:46:20 +0200
-+++ kdelibs-4.3.2/kinit/kinit.cpp	2009-10-09 18:46:51 +0200
-@@ -46,6 +46,7 @@
- 
- #include <QtCore/QLibrary>
- #include <QtCore/QString>
-+#include <QtCore/QDir>
- #include <QtCore/QFile>
- #include <QtCore/QDate>
- #include <QtCore/QFileInfo>
---- kdelibs-4.3.2/kinit/kinit.cpp.orig	2009-10-09 18:28:59 +0200
-+++ kdelibs-4.3.2/kinit/kinit.cpp	2009-10-09 18:29:05 +0200
-@@ -513,7 +513,7 @@ static pid_t launch(int argc, const char
-      if (cwd && *cwd) {
-          (void)chdir(cwd);
-      } else {
--         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
-+         const QByteArray docPath = QFile::encodeName(QDir::homePath());
-          (void)chdir(docPath.constData());
-      }
- 
---- kdelibs-4.3.2/kinit/klauncher_main.cpp.orig	2009-10-09 19:11:17 +0200
-+++ kdelibs-4.3.2/kinit/klauncher_main.cpp	2009-10-09 19:11:24 +0200
-@@ -62,7 +62,7 @@ extern "C" KDE_EXPORT int kdemain( int a
- #endif
- 
-    KComponentData componentData("klauncher", "kdelibs4");
--   KGlobal::locale();
-+   //KGlobal::locale();
- 
-    // WABA: Make sure not to enable session management.
-    putenv(strdup("SESSION_MANAGER="));
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-macos-unbundle.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-macos-unbundle.patch
deleted file mode 100644
index 4551e279271d..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-macos-unbundle.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-KDE is smart, too smart. We don't want application bundles. And since our Qt is
-configured to not build application bundles, since wouldn't even work. So this
-patch disables KDE's smartness regarding application bundles.
-
-Author: Heiko Przybyl <zuxez@cs.tu-berlin.de>
-
---- kdelibs-4.3.1/kdecore/kernel/kstandarddirs.cpp.orig	2009-09-28 02:05:37 +0200
-+++ kdelibs-4.3.1/kdecore/kernel/kstandarddirs.cpp	2009-09-28 02:22:20 +0200
-@@ -1207,32 +1207,8 @@ QStringList KStandardDirs::systemPaths( 
-     return exePaths;
- }
- 
--#ifdef Q_WS_MAC
--static QString getBundle( const QString& path, bool ignore )
--{
--    kDebug(180) << "getBundle(" << path << ", " << ignore << ") called";
--    QFileInfo info;
--    QString bundle = path;
--    bundle += ".app/Contents/MacOS/" + bundle.section('/', -1);
--    info.setFile( bundle );
--    if ( info.exists() && ( ignore || info.isExecutable() )
--         && ( info.isFile() || info.isSymLink() ) ) {
--        kDebug(180) << "getBundle(): returning " << bundle;
--        return bundle;
--    }
--    return QString();
--}
--#endif
--
- static QString checkExecutable( const QString& path, bool ignoreExecBit )
- {
--#ifdef Q_WS_MAC
--    QString bundle = getBundle( path, ignoreExecBit );
--    if ( !bundle.isEmpty() ) {
--        //kDebug(180) << "findExe(): returning " << bundle;
--        return bundle;
--    }
--#endif
-     QFileInfo info( path );
-     QFileInfo orig = info;
-     if( info.exists() && info.isSymLink() )
-@@ -1327,14 +1303,6 @@ int KStandardDirs::findAllExe( QStringLi
-         p = (*it) + '/';
-         p += real_appname;
- 
--#ifdef Q_WS_MAC
--        QString bundle = getBundle( p, (options & IgnoreExecBit) );
--        if ( !bundle.isEmpty() ) {
--            //kDebug(180) << "findExe(): returning " << bundle;
--            list.append( bundle );
--        }
--#endif
--
-         info.setFile( p );
- 
-         if( info.exists() && ( ( options & IgnoreExecBit ) || info.isExecutable())
-@@ -1636,18 +1604,6 @@ void KStandardDirs::addKDEDefaults()
-         addPrefix(localKdeDir);
-     }
- 
--#ifdef Q_WS_MACX
--    // Adds the "Contents" directory of the current application bundle to
--    // the search path. This way bundled resources can be found.
--    QDir bundleDir(mac_app_filename());
--    if (bundleDir.dirName() == "MacOS") { // just to be sure we're in a bundle
--        bundleDir.cdUp();
--        // now dirName should be "Contents". In there we can find our normal
--        // dir-structure, beginning with "share"
--        addPrefix(bundleDir.absolutePath());
--    }
--#endif
--
-     QStringList::ConstIterator end(kdedirList.end());
-     for (QStringList::ConstIterator it = kdedirList.constBegin();
-          it != kdedirList.constEnd(); ++it)
-@@ -1680,11 +1636,7 @@ void KStandardDirs::addKDEDefaults()
-     }
-     else
-     {
--#ifdef Q_WS_MACX
--        localXdgDir =  QDir::homePath() + "/Library/Preferences/XDG/";
--#else
-         localXdgDir =  QDir::homePath() + "/.config/";
--#endif
-     }
- 
-     localXdgDir = KShell::tildeExpand(localXdgDir);
---- ./kinit/kinit.cpp.orig	2009-09-28 12:38:02 +0200
-+++ ./kinit/kinit.cpp	2009-09-28 12:40:02 +0200
-@@ -551,14 +551,7 @@ static pid_t launch(int argc, const char
-        QByteArray procTitle;
-        d.argv = (char **) malloc(sizeof(char *) * (argc+1));
-        d.argv[0] = (char *) _name;
--#ifdef Q_WS_MAC
--       QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));
--       if (!argvexe.isEmpty()) {
--          QByteArray cstr = argvexe.toLocal8Bit();
--          kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
--          d.argv[0] = strdup(cstr.data());
--       }
--#endif
-+
-        for (int i = 1;  i < argc; i++)
-        {
-           d.argv[i] = (char *) args;
-@@ -627,12 +620,6 @@ static pid_t launch(int argc, const char
-         setup_tty( tty );
- 
-         QByteArray executable = execpath;
--#ifdef Q_WS_MAC
--        QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(executable));
--        if (!bundlepath.isEmpty())
--           executable = QFile::encodeName(bundlepath);
--#endif
--
-         if (!executable.isEmpty())
-            execvp(executable, d.argv);
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-module-suffix.patch
deleted file mode 100644
index 5ec4c2d9f350..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-module-suffix.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-The current approach to load shared objects in KDE4 sucks, so
-just use the cmake provided shared object extensions for the
-KPluginLoader as the preferred extension.
-
-Author: Heiko Przybyl <zuxez@cs.tu-berlin.de>
-
---- kdelibs-4.3.1/config.h.cmake     2009-02-04 16:44:05 +0100
-+++ kdelibs-4.3.1/config.h.cmake     2009-02-04 16:43:43 +0100
-@@ -12,6 +12,7 @@
- #define kde_socklen_t socklen_t
- 
- #define KDELIBSUFF "${KDELIBSUFF}"
-+#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"
- 
- /****************************/
- 
---- kdelibs-4.3.1/kdecore/util/kpluginloader.cpp	2009-09-28 13:52:23 +0200
-+++ kdelibs-4.3.1/kdecore/util/kpluginloader.cpp	2009-09-28 14:57:15 +0200
-@@ -27,6 +27,8 @@
- #include "klibrary.h"
- #include <kdebug.h>
- 
-+#include <config.h>
-+
- #include <QtCore/QLibrary>
- #include <QtCore/QDir>
- #include <QtCore/QFileInfo>
-@@ -53,25 +55,37 @@ protected:
-     KLibrary *lib;
- };
- 
--inline QString makeLibName( const QString &libname )
-+inline QString makeLibName( const QString &libname, const QString &type )
- {
- #ifdef Q_OS_WIN
-     if (!libname.endsWith(".dll"))
-         return libname + ".dll";
-     return libname;
--#else
-+#else // Q_OS_WIN
-     int pos = libname.lastIndexOf('/');
-     if (pos < 0)
-       pos = 0;
-     if (libname.indexOf('.', pos) < 0) {
--        const char* const extList[] = { ".so", ".dylib", ".bundle", ".sl" };
-+#ifdef Q_OS_MAC
-+		// Libraries are always .dylib
-+		if (type.compare("lib") == 0) {
-+			return libname + ".dylib";
-+		}
-+		// Modules mostly go .bundle but we'll use CMake smartness
-+		else {
-+			return libname + KDE_MODULE_SUFFIX;
-+		}
-+#else // Q_OS_MAC
-+		// Prefer the value specified by cmake for the target, fall back to standard
-+        const char* const extList[] = { KDE_MODULE_SUFFIX, ".so", ".sl" };
-         for (uint i = 0; i < sizeof(extList) / sizeof(*extList); ++i) {
-            if (QLibrary::isLibrary(libname + extList[i]))
-                return libname + extList[i];
-         }
-+#endif // Q_OS_MAC
-     }
-     return libname;
--#endif
-+#endif // Q_OS_WIN
- }
- 
- #ifdef Q_OS_WIN
-@@ -80,13 +94,13 @@ extern QString fixLibPrefix(const QStrin
- 
- QString findLibraryInternal(const QString &name, const KComponentData &cData)
- {
--    // Convert name to a valid platform libname
--    QString libname = makeLibName(name);
--
-     QFileInfo fileinfo(name);
-     bool hasPrefix = fileinfo.fileName().startsWith("lib");
-     bool kdeinit = fileinfo.fileName().startsWith("libkdeinit4_");
- 
-+    // Convert name to a valid platform libname depending on requested type.
-+    QString libname = makeLibName(name, kdeinit ? "lib" : "module");
-+
-     if (hasPrefix && !kdeinit)
-         kDebug(150) << "plugins should not have a 'lib' prefix:" << libname;
- #ifdef Q_OS_WIN
---- kdelibs-4.3.1/kdecore/util/klibloader.cpp	2009-09-28 13:57:03 +0200
-+++ kdelibs-4.3.1/kdecore/util/klibloader.cpp	2009-09-28 13:57:46 +0200
-@@ -57,7 +57,7 @@ KLibLoader::~KLibLoader()
- {
- }
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- 
- extern QString findLibrary(const QString &name, const KComponentData &cData);
- 
---- kdelibs-4.3.1/kdecore/util/klibrary.cpp	2009-09-28 13:57:13 +0200
-+++ kdelibs-4.3.1/kdecore/util/klibrary.cpp	2009-09-28 13:58:04 +0200
-@@ -27,7 +27,7 @@
- #include <kpluginfactory.h>
- #include <kdebug.h>
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- 
- extern QString findLibraryInternal(const QString &name, const KComponentData &cData);
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-glibc-2.11.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-glibc-2.11.patch
deleted file mode 100644
index 1872a3521f2f..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-glibc-2.11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.kde.org/show_bug.cgi?id=213223
-
---- kdelibs-4.3.3/kdecore/fakes.c
-+++ kdelibs-4.3.3/kdecore/fakes.c
-@@ -313,6 +313,8 @@
- #endif /* !HAVE_MKDTEMP */
- 
- #ifndef HAVE_STRLCPY
-+#include <string.h>
-+
- KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
- {
-     unsigned long len, ret = strlen(s);
-@@ -331,6 +333,8 @@
- #endif
- 
- #ifndef HAVE_STRLCAT
-+#include <string.h>
-+
- KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
- {
-     char *cp;
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-plasma-pixmap-cache.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-plasma-pixmap-cache.patch
deleted file mode 100644
index 59e285155710..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-plasma-pixmap-cache.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- branches/KDE/4.3/kdelibs/plasma/framesvg.cpp	2009/11/28 18:23:00	1055787
-+++ branches/KDE/4.3/kdelibs/plasma/framesvg.cpp	2009/11/28 18:25:53	1055788
-@@ -625,8 +625,8 @@
-     }
- 
-     QSizeF size = frameSize(frame);
--    QString id = QString::fromLatin1("%7_%6_%5_%4_%3_%2_%1_").
--        arg(overlayPos.y()).arg(overlayPos.x()).arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefixToSave).arg(q->imagePath());
-+    QString id = QString::fromLatin1("%5_%4_%3_%2_%1_").
-+        arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefixToSave).arg(q->imagePath());
- 
-     //kDebug()<<"Saving to cache frame"<<id;
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch b/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
deleted file mode 100644
index a9bf81d90544..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: kio/kio/kfileitem.cpp
-===================================================================
---- kio/kio/kfileitem.cpp       (revision 1110210)
-+++ kio/kio/kfileitem.cpp       (revision 1110211)
-@@ -1217,13 +1217,13 @@
-     d->m_metaInfo = info;
- }
- 
--KFileMetaInfo KFileItem::metaInfo(bool autoget, int) const
-+KFileMetaInfo KFileItem::metaInfo(bool autoget, int what) const
- {
-     if ((isRegularFile() || isDir()) && autoget && !d->m_metaInfo.isValid())
-     {
-         bool isLocalUrl;
-         KUrl url(mostLocalUrl(isLocalUrl));
--        d->m_metaInfo = KFileMetaInfo(url);//, mimetype() );
-+        d->m_metaInfo = KFileMetaInfo(url.toLocalFile(), mimetype(), (KFileMetaInfo::What)what);
-     }
-     return d->m_metaInfo;
- }
-Index: kio/kio/kfileitem.h
-===================================================================
---- kio/kio/kfileitem.h (revision 1110210)
-+++ kio/kio/kfileitem.h (revision 1110211)
-@@ -550,11 +550,14 @@
- 
-     /**
-      * Returns the metainfo of this item.
-+     *
-+     * (since 4.4.3) By default it uses the KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo.
-+     * If you need more information, create your own KFileMetaInfo object and set it using setMetaInfo()
-      * @param autoget if true, the metainfo will automatically be created
--     * @param what ignored
-+     * @param what how much metainfo you need to retrieve from the file (KFileMetaInfo::WhatFlag)
-      */
-     KFileMetaInfo metaInfo(bool autoget = true,
--                                   int what = KFileMetaInfo::Fastest) const;
-+                           int what = KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo) const;
- 
-     /**
-      * @deprecated simply use '='
-Index: kio/kfile/kmetaprops.cpp
-===================================================================
---- kio/kfile/kmetaprops.cpp    (revision 1110210)
-+++ kio/kfile/kmetaprops.cpp    (revision 1110211)
-@@ -63,7 +63,8 @@
-     d->m_info  = fileitem.metaInfo();
-     if (!d->m_info.isValid())
-     {
--        d->m_info = KFileMetaInfo(properties->kurl().path(KUrl::RemoveTrailingSlash));
-+        d->m_info = KFileMetaInfo(properties->kurl().path(KUrl::RemoveTrailingSlash), QString(),
-+                                  KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo);
-         fileitem.setMetaInfo(d->m_info);
-     }
- 
\ No newline at end of file