aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.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/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.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/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch')
-rw-r--r--debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch b/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
index 48e4c4a4b..90dfe5339 100644
--- a/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
+++ b/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
@@ -6,7 +6,7 @@ Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
Last-Update: 2012-01-11
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
-@@ -77,6 +77,7 @@
+@@ -77,6 +77,7 @@ is" without express or implied warranty.
#include "NXlib.h"
#include NXAGENT_ICON_NAME
@@ -14,7 +14,7 @@ Last-Update: 2012-01-11
/*
* Set here the required log level.
-@@ -1941,12 +1942,29 @@
+@@ -1941,12 +1942,29 @@ Bool nxagentMakeIcon(Display *display, P
Bool success = False;
XlibPixmap IconPixmap;
XlibPixmap IconShape;
@@ -46,7 +46,7 @@ Last-Update: 2012-01-11
if (icon_fp != NULL)
{
-@@ -1985,7 +2003,7 @@
+@@ -1985,7 +2003,7 @@ Bool nxagentMakeIcon(Display *display, P
{
status = XpmCreatePixmapFromData(display,
DefaultRootWindow(display),