aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0990_fix-DEBUG-and-TEST-builds.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/0990_fix-DEBUG-and-TEST-builds.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/0990_fix-DEBUG-and-TEST-builds.full.patch')
-rw-r--r--debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch b/debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch
index acb86e24d..4b88e157a 100644
--- a/debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch
+++ b/debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch
@@ -91,7 +91,7 @@ Abstract:
#endif
nxagentMarkCorruptedRegion(pDst -> pDrawable, pDstRegion);
-@@ -1176,10 +1179,12 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1176,10 +1179,12 @@ void nxagentGlyphs(CARD8 op, PicturePtr
}
#ifdef TEST
@@ -108,7 +108,7 @@ Abstract:
#endif
pForm = NULL;
-@@ -1264,9 +1269,11 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1264,9 +1269,11 @@ void nxagentGlyphs(CARD8 op, PicturePtr
nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)
{
#ifdef TEST
@@ -123,7 +123,7 @@ Abstract:
#endif
/*
-@@ -1280,12 +1287,14 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1280,12 +1287,14 @@ void nxagentGlyphs(CARD8 op, PicturePtr
if (pSrc -> repeat == 1 || nxagentGlyphsExtents == NullBox)
{
#ifdef DEBUG
@@ -144,7 +144,7 @@ Abstract:
#endif
nxagentSynchronizeBox(pSrc -> pDrawable, NullBox, NEVER_BREAK);
-@@ -1293,12 +1302,14 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1293,12 +1302,14 @@ void nxagentGlyphs(CARD8 op, PicturePtr
else
{
#ifdef DEBUG
@@ -165,7 +165,7 @@ Abstract:
#endif
nxagentSynchronizeBox(pSrc -> pDrawable, &glyphBox, NEVER_BREAK);
-@@ -1314,20 +1325,24 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1314,20 +1325,24 @@ void nxagentGlyphs(CARD8 op, PicturePtr
nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized)
{
#ifdef TEST
@@ -199,7 +199,7 @@ Abstract:
#endif
nxagentSynchronizeBox(pDst -> pDrawable, NullBox, NEVER_BREAK);
-@@ -1335,12 +1350,14 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1335,12 +1350,14 @@ void nxagentGlyphs(CARD8 op, PicturePtr
else
{
#ifdef DEBUG
@@ -220,7 +220,7 @@ Abstract:
#endif
nxagentSynchronizeBox(pDst -> pDrawable, &glyphBox, NEVER_BREAK);
-@@ -1355,9 +1372,11 @@ void nxagentGlyphs(CARD8 op, PicturePtr
+@@ -1355,9 +1372,11 @@ void nxagentGlyphs(CARD8 op, PicturePtr
nxagentSetDrawableContainGlyphs(pDst -> pDrawable, 1);
#ifdef TEST
@@ -306,7 +306,7 @@ Abstract:
nxagentMarkCorruptedRegion(pDst -> pDrawable, pDstRegion);
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
-@@ -735,7 +735,7 @@ Reply Total Cached Bits In Bits Out
+@@ -735,7 +735,7 @@ Reply Total Cached Bits In Bits Out
client->sequence++;
#ifdef DEBUG