merge of 8aba1d7399a8286555d917d8cc039be86a2fd93b

     and 9e19112a1220e2f1c7cb44d9f8f9f71c7b3cae88

6 files changed, 72 insertions, 1 deletions

diff --git a/packages/dcop/.mtn2git_empty b/packages/dcop/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dcop/.mtn2git_empty
diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb
new file mode 100644
index 0000000000..8a2e8738a7
--- /dev/null
+++ b/packages/dcop/dcopidl-native_3.5.4.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "DCOP IDL parser"
+SECTION     = "kde/dev"
+PRIORITY    = "optional"
+MAINTAINER  = "freyther@kde.org"
+LICENSE     = "GPL"
+DEPENDS     = "uicmoc3-native"
+
+
+SRC_URI     = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \
+	      file://dcopidl-compile.patch;patch=1 "
+S           = "${WORKDIR}/dcopidl" 
+
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+# create a .pro file now
+do_configure_prepend() {
+     echo "SOURCES += main.cpp yacc.cc scanner.cc " > dcopidl.pro
+     echo "HEADERS += yacc.cc.h " >> dcopidl.pro
+}
+
+do_stage() {
+     install -d ${STAGING_BINDIR}
+     install -m 0755 dcopidl ${STAGING_BINDIR}
+}
diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
new file mode 100644
index 0000000000..5828bc35ec
--- /dev/null
+++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "DCOP IDL parser"
+SECTION     = "kde/dev"
+PRIORITY    = "optional"
+MAINTAINER  = "freyther@kde.org"
+LICENSE     = "GPL"
+DEPENDS     = "uicmoc3-native"
+
+
+SRC_URI     = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp "
+#\
+#	      file://dcopidl-compile.patch;patch=1 "
+S           = "${WORKDIR}/dcopidl2cpp" 
+
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+# create a .pro file now
+do_configure_prepend() {
+     echo "SOURCES += main.cpp skel.cpp stub.cpp stubimpl.cpp" > dcopidl2cpp.pro
+     echo "HEADERS += main.h " >> dcopidl2cpp.pro
+}
+
+do_stage() {
+     install -d ${STAGING_BINDIR}
+     install -m 0755 dcopidl2cpp ${STAGING_BINDIR}
+}
diff --git a/packages/dcop/files/.mtn2git_empty b/packages/dcop/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dcop/files/.mtn2git_empty
diff --git a/packages/dcop/files/dcopidl-compile.patch b/packages/dcop/files/dcopidl-compile.patch
new file mode 100644
index 0000000000..320112395f
--- /dev/null
+++ b/packages/dcop/files/dcopidl-compile.patch
@@ -0,0 +1,12 @@
+Index: dcopidl/yacc.cc
+===================================================================
+--- dcopidl.orig/yacc.cc	2006-04-26 21:59:13.000000000 +0200
++++ dcopidl/yacc.cc	2006-04-26 22:28:28.859672808 +0200
+@@ -213,7 +213,6 @@
+ 
+ ******************************************************************/
+ 
+-#include <config.h>
+ 
+ // Workaround for a bison issue:
+ // bison.simple concludes from _GNU_SOURCE that stpcpy is available,
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index 1d269e611e..e5f2901cb8 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
 SECTION = "opie/applications"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
-DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native"
+DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL/GPL"
 PR = "r2"