* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.5.73-module-suffix.patch kdelibs-4.5.90-mimetypes.patch kdelibs-4.5.74-klauncher_mac.patch
@ 2011-01-26 20:28 Alexey Shvetsov (alexxy)
0 siblings, 0 replies; only message in thread
From: Alexey Shvetsov (alexxy) @ 2011-01-26 20:28 UTC (permalink / raw
To: gentoo-commits
alexxy 11/01/26 20:28:37
Added: kdelibs-4.5.73-module-suffix.patch
kdelibs-4.5.90-mimetypes.patch
kdelibs-4.5.74-klauncher_mac.patch
Log:
[kde-base] Add KDE SC 4.6.0
(Portage version: 2.2.0_alpha19_p2/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.1 kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.5.73-module-suffix.patch
===================================================================
diff -purN kdelibs-4.3.80.orig/config.h.cmake kdelibs-4.3.80/config.h.cmake
--- kdelibs-4.3.80.orig/config.h.cmake 2009-10-26 05:15:52.000000000 -0400
+++ kdelibs-4.3.80/config.h.cmake 2009-12-14 16:56:15.667194286 -0500
@@ -12,6 +12,7 @@
#define kde_socklen_t socklen_t
#define KDELIBSUFF "${KDELIBSUFF}"
+#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"
/****************************/
diff -purN kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp kdelibs-4.3.80/kdecore/util/klibloader.cpp
--- kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp 2008-05-21 07:09:15.000000000 -0400
+++ kdelibs-4.3.80/kdecore/util/klibloader.cpp 2009-12-14 16:56:15.668194094 -0500
@@ -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);
diff -purN kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp kdelibs-4.3.80/kdecore/util/klibrary.cpp
--- kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp 2009-10-02 10:55:11.000000000 -0400
+++ kdelibs-4.3.80/kdecore/util/klibrary.cpp 2009-12-14 16:57:24.317056608 -0500
@@ -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);
int kLibraryDebugArea() {
diff -purN kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp kdelibs-4.3.80/kdecore/util/kpluginloader.cpp
--- kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp 2009-10-15 12:35:55.000000000 -0400
+++ kdelibs-4.3.80/kdecore/util/kpluginloader.cpp 2009-12-14 16:57:58.533877037 -0500
@@ -27,6 +27,8 @@
#include "klibrary.h"
#include <kdebug.h>
+#include <config.h>
+
#include <QtCore/QLibrary>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
@@ -54,26 +54,38 @@
KLibrary *lib;
};
-inline QString makeLibName( const QString &libname )
+inline QString makeLibName( const QString &libname, const QString &type )
{
#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
if (!libname.endsWith(".dll"))
return libname + ".dll";
return libname;
-#else
+#else // Q_OS_WIN
int pos = libname.lastIndexOf(QLatin1Char('/'));
if (pos < 0)
pos = 0;
if (libname.indexOf(QLatin1Char('.'), 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) {
const QString lib = libname + QString::fromLatin1(extList[i]);
if (QLibrary::isLibrary(lib))
return lib;
}
+#endif // Q_OS_MAC
}
return libname;
-#endif
+#endif // Q_OS_WIN
}
#ifdef Q_OS_WIN
@@ -82,12 +94,13 @@
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(QLatin1String("lib"));
bool kdeinit = fileinfo.fileName().startsWith(QLatin1String("libkdeinit4_"));
+ // Convert name to a valid platform libname depending on requested type.
+ QString libname = makeLibName(name, kdeinit ? "lib" : "module");
+
if (hasPrefix && !kdeinit)
kDebug(kLibraryDebugArea()) << "plugins should not have a 'lib' prefix:" << libname;
#ifdef Q_CC_MSVC
1.1 kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.5.90-mimetypes.patch
===================================================================
diff -ur kdelibs-4.5.90.orig/mimetypes/kde.xml kdelibs-4.5.90/mimetypes/kde.xml
--- kdelibs-4.5.90.orig/mimetypes/kde.xml 2010-12-22 10:56:01.000000000 +0100
+++ kdelibs-4.5.90/mimetypes/kde.xml 2010-12-23 11:31:53.000000000 +0100
@@ -178,34 +178,6 @@
<glob pattern="*.abc"/>
</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>
-
<mime-type type="application/vnd.kde.fontspackage">
<sub-class-of type="application/zip"/>
<comment>fonts package</comment>
@@ -346,12 +318,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"/>
1.1 kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.5.74-klauncher_mac.patch
===================================================================
--- kinit/klauncher.cpp.orig 2010-11-06 23:35:26.000000000 +0300
+++ kinit/klauncher.cpp 2010-11-07 02:45:19.000000000 +0300
@@ -1151,6 +1151,12 @@
kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol
<< " args=" << arg_list << endl;
+#ifdef Q_WS_MAC
+ arg_list.prepend(KLibLoader::findLibrary(name));
+ name = KStandardDirs::locate("exe", QString::fromLatin1("kioslave"));
+ arg_list.prepend(name);
+#endif
+
#ifdef Q_OS_UNIX
if (mSlaveDebug == arg1)
{
@@ -1161,8 +1167,10 @@
}
if (mSlaveValgrind == arg1)
{
+#ifdef Q_WS_MAC
arg_list.prepend(::findLibrary(name, KGlobal::mainComponent()));
arg_list.prepend(KStandardDirs::locate("exe", QString::fromLatin1("kioslave")));
+#endif
name = QString::fromLatin1("valgrind");
if (!mSlaveValgrindSkin.isEmpty()) {
arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-26 20:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-26 20:28 [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.5.73-module-suffix.patch kdelibs-4.5.90-mimetypes.patch kdelibs-4.5.74-klauncher_mac.patch Alexey Shvetsov (alexxy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox