aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-19 17:36:45 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-19 17:36:45 +0100
commit85be77cb3987999186be52686043c3f666d168dc (patch)
treedd0c10ab84dc58a40bfa63295758953a8dd790fc /debian
parentf7e6c45a57014f5da840606204872b0ea3d70e28 (diff)
downloadnx-libs-85be77cb3987999186be52686043c3f666d168dc.tar.gz
nx-libs-85be77cb3987999186be52686043c3f666d168dc.tar.bz2
nx-libs-85be77cb3987999186be52686043c3f666d168dc.zip
Add patch: 003_nxcompshad-gcc43.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/003_nxcompshad-gcc43.patch26
-rw-r--r--debian/patches/series1
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bbee93020..cd4504025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
* Add quilt as build dependency.
* Add main Makefile via patch: 001_add-main-makefile.patch.
* Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
+ * Add patch: 003_nxcompshad-gcc43.patch
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/003_nxcompshad-gcc43.patch b/debian/patches/003_nxcompshad-gcc43.patch
new file mode 100644
index 000000000..c16a5c154
--- /dev/null
+++ b/debian/patches/003_nxcompshad-gcc43.patch
@@ -0,0 +1,26 @@
+--- a/nxcompshad/Logger.h
++++ b/nxcompshad/Logger.h
+@@ -18,8 +18,8 @@
+ #ifndef Logger_H
+ #define Logger_H
+
+-#include <errno.h>
+-#include <stdarg.h>
++#include <cerrno>
++#include <cstdarg>
+
+ //
+ // Error handling macros.
+--- a/nxcompshad/Misc.h
++++ b/nxcompshad/Misc.h
+@@ -20,8 +20,8 @@
+
+ #include <iostream>
+
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
+
+ using namespace std;
+
diff --git a/debian/patches/series b/debian/patches/series
index 84fa73008..615573a8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
001_add-main-makefile.patch
002_nxcompshad-build-against-nx-x11-only.patch
+003_nxcompshad-gcc43.patch