aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.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/0027_nxcomp_abstract-X11-socket.full+lite.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/0027_nxcomp_abstract-X11-socket.full+lite.patch')
-rw-r--r--debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch b/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch
index 4c457c5d5..5da813577 100644
--- a/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch
+++ b/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch
@@ -1,11 +1,9 @@
Description: Add X11 abstract socket support to nxcomp/nxproxy
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
-index 92b6fc2..d86809d 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
-@@ -4250,6 +4250,39 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
+@@ -4250,6 +4250,39 @@ int SetupDisplaySocket(int &xServerAddrF
// where the socket will be created.
//
@@ -45,7 +43,7 @@ index 92b6fc2..d86809d 100644
struct stat statInfo;
char unixSocketDir[DEFAULT_STRING_LENGTH];
-@@ -4322,6 +4355,11 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
+@@ -4322,6 +4355,11 @@ int SetupDisplaySocket(int &xServerAddrF
xServerAddr = (sockaddr *) xServerAddrUNIX;
xServerAddrLength = sizeof(sockaddr_un);