[oe-commits] org.oe.dev kdepimpi: fix the QMutexLocker build fix

[polyonymous commit]

kdepimpi: fix the QMutexLocker build fix
- patch to provide the QMutexLocker implementation.

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 526cf617891ba9951db25cdd4c8dcf1f8cb7d068
ViewMTN: http://monotone.openembedded.org/revision.psp?id=526cf617891ba9951db25cdd4c8dcf1f8cb7d068
Files:
1
packages/kdepimpi/files/qt-mt.patch
packages/kdepimpi/kdepimpi_2.2.7.bb
Diffs:

#
# mt diff -r63e16b0274f115b5c1bb05e6fd08ed582d954e8a -r526cf617891ba9951db25cdd4c8dcf1f8cb7d068
#
# 
# 
# add_file "packages/kdepimpi/files/qt-mt.patch"
#  content [f1a89c48541638d944a9512dd87c6ca9aa3f7cd5]
# 
# patch "packages/kdepimpi/kdepimpi_2.2.7.bb"
#  from [a0104167c445d258a20c5da11ed9b748f509c719]
#    to [1812ef579a9511787f6477d94f929712b573e766]
# 
============================================================
--- packages/kdepimpi/files/qt-mt.patch	f1a89c48541638d944a9512dd87c6ca9aa3f7cd5
+++ packages/kdepimpi/files/qt-mt.patch	f1a89c48541638d944a9512dd87c6ca9aa3f7cd5
@@ -0,0 +1,41 @@
+diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
+index cccd485..65d82e2 100644
+--- a/microkde/kresources/resource.cpp
++++ b/microkde/kresources/resource.cpp
+@@ -29,6 +29,23 @@
+ 
+ using namespace KRES;
+ 
++namespace fixme {
++    class QMutexLocker {
++	public:
++	    QMutexLocker(QMutex *m)  : mtx(m) {
++		if(mtx) mtx->lock();
++	    }
++	    ~QMutexLocker() {
++		if(mtx) mtx->unlock();
++	    }
++
++	    QMutex *mutex() const { return mtx; }
++	private:
++	    QMutex *mtx;
++    };
++}
++using namespace fixme;
++
+ class Resource::ResourcePrivate
+ {
+   public:
+diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
+index ed5af96..997fff6 100644
+--- a/microkde/kresources/resource.h
++++ b/microkde/kresources/resource.h
+@@ -25,7 +25,7 @@
+ 
+ //US
+ #ifdef QT_THREAD_SUPPORT
+-#include <qmutex.h>
++#include <qthread.h>
+ #endif //QT_THREAD_SUPPORT
+ 
+ #include <qvaluelist.h>
============================================================
--- packages/kdepimpi/kdepimpi_2.2.7.bb	a0104167c445d258a20c5da11ed9b748f509c719
+++ packages/kdepimpi/kdepimpi_2.2.7.bb	1812ef579a9511787f6477d94f929712b573e766
@@ -1,5 +1,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimp
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
-           file://gcc4.patch;patch=1"
+           file://gcc4.patch;patch=1 \
+	   file://qt-mt.patch;patch=1"
 
 require kdepimpi-base.inc