Fix patch for kdelibs and powerdevil by Civil

5 files changed, 110 insertions, 7 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 06a387207ba..500abde6330 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -16,7 +16,8 @@ AUX kdelibs-4.4.80-icon-name-qt47.patch 822 RMD160 96a08e4cb42f919153387bbcb675d
 AUX kdelibs-4.4.90-icon-name-qt47.patch 874 RMD160 756104159f5d1b388d30b28cb40cdd398c49e6e2 SHA1 97bce81cccb04ed1c3dde42c167a86b90fb92a45 SHA256 f1cf8f7f0a8ea4d19219d60ab0d8bcc42c9cdc661cf796489a3a28911626236b
 AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0f SHA1 24faa51f5d3645858ca55c744b9b76952eb383c6 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b
 AUX kdelibs-4.5.0-kfilemetadatawidget.patch 1604 RMD160 a6ce10ad49190a779aabff86aef47579134ac279 SHA1 69ce54b4821859105717a6002444d2ba41e13632 SHA256 81da7bc2a364f67a22729b9ddd9fea30944ee5aaac768cd801adc0ce44fb21db
+AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9
 EBUILD kdelibs-4.4.9999.ebuild 9145 RMD160 347c547039836cf309e8a882f2fb3b080ce60451 SHA1 b85c962e01b4d9d2baf7774e93519787be0e84f7 SHA256 843fd1bf4859b2f5a5bbd23c912e5ec513a576d19fe94ae0f5b80278b77914ea
 EBUILD kdelibs-4.5.9999.ebuild 9192 RMD160 aea9f8a496a66d9bcb169aff45a79f834cb42039 SHA1 140b699b0f526df9f86fe11ac36299aa4d98eae6 SHA256 513782145bb5267debf06d363c29b263e3db056b6ef573ff1f9f8242f0b00ac4
-EBUILD kdelibs-9999.ebuild 9070 RMD160 1924cb991ba9b42a21771097a6c51786c3903843 SHA1 b9c47e3db93c4fa62f2a8b7b0876666fd5440e0f SHA256 0e170477df56d97b2f4525e6f08fa11755b92000aafb9ec1319ce2755588745b
+EBUILD kdelibs-9999.ebuild 9070 RMD160 5b1086c411aa4fa94df0014ba7a86c6c79a7b016 SHA1 75f31ed561a2cbfba26bdc5db6f12df6d1ff4109 SHA256 e79f99010a8edae4f87915cbea5d4fc7564041b960b456a057fc6df2d995f8a1
 MISC metadata.xml 365 RMD160 89b40199e62fcd8b57f5988b6822e9f21ed0e1d3 SHA1 18c13fc79abbba130d2d841c07f456141344927a SHA256 13afa723b18e72007644c80cbaa54705be9f9a756451baaa898948c57874a350
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
new file mode 100644
index 00000000000..1b517d9e94a
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
@@ -0,0 +1,106 @@
+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
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 821b881d13f..8fb295934d4 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -123,7 +123,7 @@ add_blocker plasma-workspace '<4.3.75'
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
-	"${FILESDIR}/${PN}-4.3.80-module-suffix.patch"
+	"${FILESDIR}/${PN}-4.5.73-module-suffix.patch"
 	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch"
 	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
 	"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 242adad69d6..913d875fd27 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,5 +1,5 @@
 AUX powerdevil-4.4.3-fix-sleep-205453.patch 431 RMD160 21dc46c060f7804f10413cbee49ae6fc8d990cf5 SHA1 2041e88c60fc950d835e683984a0e7990cf7bf5a SHA256 85bf67a7c60ff7406b681752762d408d1ba20a3ca3178b2874ca44b76102291b
 EBUILD powerdevil-4.4.9999.ebuild 776 RMD160 a1d2b49b53ab4a3a21a9c265c52c225b9e2b5ba8 SHA1 9fdf470c4b3afc33350566f81df748736778ac44 SHA256 61eb0f6b3cd935473981ddb265e161057b96b7697009fc9be94daa08da8866f6
 EBUILD powerdevil-4.5.9999.ebuild 776 RMD160 a1d2b49b53ab4a3a21a9c265c52c225b9e2b5ba8 SHA1 9fdf470c4b3afc33350566f81df748736778ac44 SHA256 61eb0f6b3cd935473981ddb265e161057b96b7697009fc9be94daa08da8866f6
-EBUILD powerdevil-9999.ebuild 776 RMD160 a1d2b49b53ab4a3a21a9c265c52c225b9e2b5ba8 SHA1 9fdf470c4b3afc33350566f81df748736778ac44 SHA256 61eb0f6b3cd935473981ddb265e161057b96b7697009fc9be94daa08da8866f6
+EBUILD powerdevil-9999.ebuild 713 RMD160 2166aa21f6be3a5ce971dc8974f5b8ecae1e7032 SHA1 b4e78e25ee9ee85b0b45b2ba31aca8a31cf0d948 SHA256 5d704b3bd8402c4e4b7b1261a442baf8bc272dd573c9d9988e655a0f69e27da8
 MISC metadata.xml 281 RMD160 81ae5951c6f8387eb7c87bf07d7c136d4c3f7589 SHA1 e1e397b43276333f8c5a5f1300977fca84c39920 SHA256 f42f84b6cbe3862afd6839a2da268b563bbac43ed8d39f127db2bd1ad5b53c88
diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
index 262c5830e16..4c067f1de0a 100644
--- a/kde-base/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -31,7 +31,3 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
-)