aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/056_nx-X11-Werror-format-security.full.patch6
-rw-r--r--debian/patches/108_nxagent_wine-close-delay.full.patch4
-rw-r--r--debian/patches/300_nxagent_set-wm-class.full.patch2
3 files changed, 6 insertions, 6 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; \
diff --git a/debian/patches/108_nxagent_wine-close-delay.full.patch b/debian/patches/108_nxagent_wine-close-delay.full.patch
index 875571c48..7a9c18cf2 100644
--- a/debian/patches/108_nxagent_wine-close-delay.full.patch
+++ b/debian/patches/108_nxagent_wine-close-delay.full.patch
@@ -22,7 +22,7 @@ Last-Update: 2011-12-31
/*
* This is currently unused.
*/
-@@ -1858,6 +1866,17 @@
+@@ -1861,6 +1869,17 @@
nxagentAddConfiguredWindow(pWin, CWStackingOrder);
nxagentAddConfiguredWindow(pWin, CW_Shape);
@@ -40,7 +40,7 @@ Last-Update: 2011-12-31
#ifdef SHAPE
/*
-@@ -1904,6 +1923,17 @@
+@@ -1907,6 +1926,17 @@
return True;
}
diff --git a/debian/patches/300_nxagent_set-wm-class.full.patch b/debian/patches/300_nxagent_set-wm-class.full.patch
index 7a67e434f..70b1c9212 100644
--- a/debian/patches/300_nxagent_set-wm-class.full.patch
+++ b/debian/patches/300_nxagent_set-wm-class.full.patch
@@ -15,7 +15,7 @@ Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
Last-Update: 2012-01-11
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
-@@ -1759,6 +1759,42 @@
+@@ -1762,6 +1762,42 @@
nxagentDefaultWindows[pScreen->myNum]);
#endif