[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/files/

[Tomas Chvatal]

commit:     91063b54346c6faa5cec58b36931960516936f6e
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 22:14:02 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May  1 22:14:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=91063b54

[kde-base/kdelibs] drop two more patches

---
 .../kdelibs/files/kdelibs-4.4.3-mimetypes.patch    |   58 ---------
 .../files/kdelibs-4.4.66-macos-unbundle.patch      |  129 --------------------
 2 files changed, 0 insertions(+), 187 deletions(-)

diff --git a/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch
deleted file mode 100644
index 687f240..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -r -u kdelibs-4.4.3.orig/mimetypes/kde.xml kdelibs-4.4.3/mimetypes/kde.xml
---- kdelibs-4.4.3.orig/mimetypes/kde.xml	2009-10-06 23:37:48.000000000 +0200
-+++ kdelibs-4.4.3/mimetypes/kde.xml	2010-05-28 22:48:51.000000000 +0200
-@@ -180,41 +180,6 @@
-     <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/>
-   </mime-type>
- 
--  <!-- all/ fake mime types -->
--  <mime-type type="all/all">
--    <comment>all files and folders</comment>
--  </mime-type>
--  <mime-type type="all/allfiles">
--    <comment>all files</comment>
--  </mime-type>
--
--  <!-- uri/ fake mime types -->
--  <mime-type type="uri/mms">
--    <comment>mms: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmst">
--    <comment>mmst: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmsu">
--    <comment>mmsu: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/pnm">
--    <comment>pnm: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspt">
--    <comment>rtspt: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspu">
--    <comment>rtspu: URIs</comment>
--  </mime-type>
--
--  <!-- fonts/ fake mime types -->
--  <mime-type type="fonts/package">
--    <sub-class-of type="application/zip"/>
--    <comment>fonts package</comment>
--    <glob pattern="*.fonts.zip"/>
--  </mime-type>
--
-   <mime-type type="application/x-konsole">
-     <comment>file to open a shell</comment>
-     <glob pattern="*.shell"/>
-@@ -349,12 +314,6 @@
-     <glob pattern="*.icq"/>
-   </mime-type>
- 
--  <mime-type type="interface/x-winamp-skin">
--    <sub-class-of type="application/zip"/>
--    <comment>compressed Winamp skin</comment>
--    <glob pattern="*.wsz"/>
--  </mime-type>
--
-   <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" -->
-     <comment>Microsoft Media Format</comment>
-     <sub-class-of type="video/x-ms-wmv"/>

diff --git a/kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch b/kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch
deleted file mode 100644
index 614ee87..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch
+++ /dev/null
@@ -1,129 +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@××××××××××××.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
-@@ -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);
- 
---- kdelibs-9999/kdecore/kernel/kstandarddirs.cpp.orig	2010-03-06 15:47:40.108111613 +0100
-+++ kdelibs-9999/kdecore/kernel/kstandarddirs.cpp	2010-03-06 23:17:01.853905357 +0100
-@@ -1207,41 +1207,8 @@
-     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 );
--    FILE *file;
--    if (file = fopen(info.absoluteFilePath().toUtf8().constData(), "r")) {
--        fclose(file);
--        struct stat _stat;
--        if ((stat(info.absoluteFilePath().toUtf8().constData(), &_stat)) < 0) {
--            return QString();
--        }
--        if ( ignore || (_stat.st_mode & S_IXUSR) ) {
--            if ( ((_stat.st_mode & S_IFMT) == S_IFREG) || ((_stat.st_mode & S_IFMT) == S_IFLNK) ) {
--                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 defined(Q_OS_DARWIN) || defined(Q_OS_MAC)