aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/056_nx-X11-Werror-format-security.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-21 23:20:33 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-21 23:20:33 +0200
commiteca0ee98cfba39cb37c5da1779716b6b8b2ee602 (patch)
tree915d98d37f15943b980acdbca641de4b79665704 /debian/patches/056_nx-X11-Werror-format-security.full.patch
parent8be0a04722995e1bd77b0b3c95dfe272ad91f26c (diff)
downloadnx-libs-eca0ee98cfba39cb37c5da1779716b6b8b2ee602.tar.gz
nx-libs-eca0ee98cfba39cb37c5da1779716b6b8b2ee602.tar.bz2
nx-libs-eca0ee98cfba39cb37c5da1779716b6b8b2ee602.zip
Update patches, to make them apply cleanly after above changes:
+ 056_nx-X11-Werror-format-security.full.patch + 108_nxagent_wine-close-delay.full.patch + 300_nxagent_set-wm-class.full.patch
Diffstat (limited to 'debian/patches/056_nx-X11-Werror-format-security.full.patch')
-rw-r--r--debian/patches/056_nx-X11-Werror-format-security.full.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/056_nx-X11-Werror-format-security.full.patch b/debian/patches/056_nx-X11-Werror-format-security.full.patch
index e9d8bb4bd..a047de774 100644
--- a/debian/patches/056_nx-X11-Werror-format-security.full.patch
+++ b/debian/patches/056_nx-X11-Werror-format-security.full.patch
@@ -6,7 +6,7 @@ Abstract:
idea why.
--- a/nx-X11/lib/xtrans/Xtransint.h
+++ b/nx-X11/lib/xtrans/Xtransint.h
-@@ -443,7 +443,7 @@
+@@ -444,7 +444,7 @@
int hack= 0, saveerrno=errno; \
struct timeval tp;\
gettimeofday(&tp,0); \
@@ -15,7 +15,7 @@ Abstract:
ErrorF(x+hack,a,b,c); \
ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
errno=saveerrno; \
-@@ -453,7 +453,7 @@
+@@ -454,7 +454,7 @@
int hack= 0, saveerrno=errno; \
struct timeval tp;\
gettimeofday(&tp,0); \
@@ -24,7 +24,7 @@ Abstract:
fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
fflush(stderr); \
-@@ -465,14 +465,14 @@
+@@ -466,14 +466,14 @@
/* Use ErrorF() for the X server */
#define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
int hack= 0, saveerrno=errno; \