summaryrefslogtreecommitdiff
path: root/packages/qscintilla
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-04 13:56:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-04 13:56:00 +0000
commit195155f18b2298eda12ca3eacc828f8229e012d5 (patch)
treef6f3801a8c3be39df051f675cee636a6713524b1 /packages/qscintilla
parent4e576d874c40f5358b6f3df70bb10bbcd2ae1717 (diff)
qscintilla 1.65: add patch to remove bogus DynLibrary use when built against Qt/Embedded
Diffstat (limited to 'packages/qscintilla')
-rw-r--r--packages/qscintilla/files/.mtn2git_empty0
-rw-r--r--packages/qscintilla/files/no-external-lexers.patch24
-rw-r--r--packages/qscintilla/qscintilla_1.65-gpl-1.6.bb14
3 files changed, 35 insertions, 3 deletions
diff --git a/packages/qscintilla/files/.mtn2git_empty b/packages/qscintilla/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qscintilla/files/.mtn2git_empty
diff --git a/packages/qscintilla/files/no-external-lexers.patch b/packages/qscintilla/files/no-external-lexers.patch
new file mode 100644
index 0000000000..5953043190
--- /dev/null
+++ b/packages/qscintilla/files/no-external-lexers.patch
@@ -0,0 +1,24 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- ../src/ExternalLexer.cpp~no-external-lexers
++++ ../src/ExternalLexer.cpp
+@@ -110,7 +110,7 @@
+ // Initialise some members...
+ first = NULL;
+ last = NULL;
+-
++#ifndef ZPATCH
+ // Load the DLL
+ lib = DynamicLibrary::Load(ModuleName);
+ if (lib->IsValid()) {
+@@ -155,6 +155,7 @@
+ }
+ }
+ }
++#endif
+ next = NULL;
+ }
+
diff --git a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
index a313d8c73e..1620ef62c5 100644
--- a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
+++ b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
@@ -4,7 +4,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
PR = "r0"
-SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz"
+SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \
+ file://no-external-lexers.patch;patch=1;pnum=0"
S = "${WORKDIR}/qscintilla-${PV}/qt"
@@ -12,7 +13,8 @@ inherit opie
QMAKE_PROFILES = "qscintilla.pro"
-EXTRA_QMAKEVARS_POST += " CONFIG-=thread INCLUDEPATH+=${S}/patches DEFINES+=ZPATCH \
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/patches \
+ DEFINES+=ZPATCH DEFINES+=ZAURUS \
HEADERS-=qextscintillaprinter.h \
SOURCES-=qextscintillaprinter.cpp \
SOURCES+=patches/qsettings.cpp \
@@ -21,8 +23,14 @@ EXTRA_QMAKEVARS_POST += " CONFIG-=thread INCLUDEPATH+=${S}/patches DEFINES+=ZPAT
PARALLEL_MAKE = ""
-
do_stage() {
install -m 0644 qextscintilla*.h ${STAGING_INCDIR}/
oe_libinstall -so libqscintilla ${STAGING_LIBDIR}
}
+
+do_install() {
+ install -d ${D}${libdir}
+ oe_libinstall -so libqscintilla ${D}${libdir}
+}
+
+FILES_${PN} = "${libdir}"