aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
commit6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch)
tree253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
parenta4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff)
downloadnx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.gz
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.bz2
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.zip
debian/patches: refresh all patches.
Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers.
Diffstat (limited to 'debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch')
-rw-r--r--debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch b/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
index 129cb707e..0cd836c5a 100644
--- a/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
+++ b/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
@@ -7,7 +7,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2011-12-31
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
-@@ -1226,10 +1226,11 @@
+@@ -1226,10 +1226,11 @@ int nxagentConvertSelection(ClientPtr cl
Atom xa_STRING[4];
xEvent x;
@@ -24,7 +24,7 @@ Last-Update: 2011-12-31
property,
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
-@@ -644,6 +644,10 @@
+@@ -644,6 +644,10 @@ FIXME: Should use these.
pDrawable -> depth != 1 &&
nxagentOption(DeferLevel) >= 1)
{
@@ -35,7 +35,7 @@ Last-Update: 2011-12-31
#ifdef TEST
fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] "
"for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1,
-@@ -654,6 +658,9 @@
+@@ -654,6 +658,9 @@ FIXME: Should use these.
nxagentMarkCorruptedRegion(pDrawable, pRegion);
goto nxagentPutImageEnd;