merge of '36d8e178bafb50c7881d637db537e08c72510ace'

     and '409f0e4c54eb53279e57c78f8ba5c98e3fa9ceb3'

4 files changed, 64 insertions, 0 deletions

diff --git a/packages/nxcl/.mtn2git_empty b/packages/nxcl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nxcl/.mtn2git_empty
diff --git a/packages/nxcl/files/.mtn2git_empty b/packages/nxcl/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nxcl/files/.mtn2git_empty
diff --git a/packages/nxcl/files/gcc4.3-ftbfs.patch b/packages/nxcl/files/gcc4.3-ftbfs.patch
new file mode 100644
index 0000000000..d73e828677
--- /dev/null
+++ b/packages/nxcl/files/gcc4.3-ftbfs.patch
@@ -0,0 +1,41 @@
+patch taken from the debian unstable package
+to let nxcl build with gcc-4.3
+
+
+Index: nxcl/lib/notQt.cpp
+===================================================================
+--- nxcl/lib/notQt.cpp	2008-04-10 11:05:10.338942907 +0000
++++ nxcl/lib/notQt.cpp	2008-04-10 11:05:10.338942907 +0000
+@@ -19,6 +19,7 @@
+ 
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ extern "C" {
+ #include <unistd.h>
+ #include <errno.h>
+Index: nxcl/lib/nxclientlib.cpp
+===================================================================
+--- nxcl/lib/nxclientlib.cpp	2008-04-10 11:05:10.338942907 +0000
++++ nxcl/lib/nxclientlib.cpp	2008-04-10 11:05:10.338942907 +0000
+@@ -42,6 +42,8 @@
+     #include <sys/types.h>
+     #include <sys/stat.h>
+     #include <unistd.h>
++    #include <stdlib.h>
++    #include <string.h>
+ }
+ 
+ /*
+Index: nxcl/nxcl/nxcl.cpp
+===================================================================
+--- nxcl/nxcl/nxcl.cpp	2008-04-10 11:06:21.840797475 +0000
++++ nxcl/nxcl/nxcl.cpp	2008-04-10 11:06:47.841471864 +0000
+@@ -29,6 +29,7 @@
+ extern "C" {
+ #include <dbus/dbus.h>
+ #include <X11/Xlib.h>
++#include <stdlib.h>
+ }
+ 
+ using namespace nxcl;
diff --git a/packages/nxcl/libnxcl_0.9.bb b/packages/nxcl/libnxcl_0.9.bb
new file mode 100644
index 0000000000..ea62579019
--- /dev/null
+++ b/packages/nxcl/libnxcl_0.9.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Backend library for the free nx-clients"
+HOMEPAGE = "http://freenx.berlios.de/"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r0"
+
+RDEPENDS = "nxproxy ssh"
+
+SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \
+	   file://gcc4.3-ftbfs.patch;patch=1 \
+	  "
+
+S = "${WORKDIR}/freenx-client-${PV}/nxcl"
+
+EXTRA_OECONF += "--without-nxcmd \
+	         --without-doxygen \
+                "
+
+inherit lib_package autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}