diff options
| -rw-r--r-- | packages/kdepimpi/files/qt-mt.patch | 41 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi_2.2.7.bb | 3 | ||||
| -rw-r--r-- | packages/sword/sword-1.5.9/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sword/sword-1.5.9/gcc-visibility.patch | 26 | ||||
| -rw-r--r-- | packages/sword/sword_1.5.9.bb | 3 |
5 files changed, 71 insertions, 2 deletions
diff --git a/packages/kdepimpi/files/qt-mt.patch b/packages/kdepimpi/files/qt-mt.patch new file mode 100644 index 0000000000..c7e3f9d88a --- /dev/null +++ b/packages/kdepimpi/files/qt-mt.patch @@ -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> diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb index 6059bf8528..ca4d5c0786 100644 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ b/packages/kdepimpi/kdepimpi_2.2.7.bb @@ -1,5 +1,6 @@ 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 diff --git a/packages/sword/sword-1.5.9/.mtn2git_empty b/packages/sword/sword-1.5.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sword/sword-1.5.9/.mtn2git_empty diff --git a/packages/sword/sword-1.5.9/gcc-visibility.patch b/packages/sword/sword-1.5.9/gcc-visibility.patch new file mode 100644 index 0000000000..f23a66767f --- /dev/null +++ b/packages/sword/sword-1.5.9/gcc-visibility.patch @@ -0,0 +1,26 @@ +diff --git a/include/rawtext.h b/include/rawtext.h +index 32986fe..1304bf7 100644 +--- a/include/rawtext.h ++++ b/include/rawtext.h +@@ -43,7 +43,7 @@ public: + virtual ~RawText(); + virtual SWBuf &getRawEntryBuf(); + virtual void increment(int steps = 1); +- virtual void decrement(int steps = 1) { increment(-steps); } ++ virtual __attribute__((visibility("default"))) void decrement(int steps = 1) { increment(-steps); } + virtual signed char createSearchFramework( + void (*percent) (char, void *) = &nullPercent, + void *percentUserData = 0); +diff --git a/include/versekey.h b/include/versekey.h +index 0ca5e47..53084d9 100644 +--- a/include/versekey.h ++++ b/include/versekey.h +@@ -253,7 +253,7 @@ public: + */ + virtual const char *getText() const; + virtual const char *getShortText() const; +- virtual void setText(const char *ikey) { SWKey::setText(ikey); parse (); } ++ virtual __attribute__((visibility("default"))) void setText(const char *ikey) { SWKey::setText(ikey); parse (); } + virtual void copyFrom(const SWKey &ikey); + + /** Equates this VerseKey to another VerseKey diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb index 362b75e57c..2c180ac7e3 100644 --- a/packages/sword/sword_1.5.9.bb +++ b/packages/sword/sword_1.5.9.bb @@ -7,7 +7,8 @@ PRIORITY = "optional" LICENSE = "GPL" PR = "r0" -SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" +SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz \ + file://gcc-visibility.patch;patch=1" inherit autotools pkgconfig |