[X2Go-Commits] [nx-libs] 06/06: Update patches, to make them apply cleanly after above changes:

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit eca0ee98cfba39cb37c5da1779716b6b8b2ee602
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 21 23:20:33 2014 +0200

    Update patches, to make them apply cleanly after above changes:
    
      + 056_nx-X11-Werror-format-security.full.patch
      + 108_nxagent_wine-close-delay.full.patch
      + 300_nxagent_set-wm-class.full.patch
---
 debian/changelog                                   |   10 +++++++---
 .../056_nx-X11-Werror-format-security.full.patch   |    6 +++---
 .../108_nxagent_wine-close-delay.full.patch        |    4 ++--
 debian/patches/300_nxagent_set-wm-class.full.patch |    2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3edfbbe..78f6314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,6 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
     let NX proxy attempt connecting to the abstract X11 socket first, and only
     fallback to the file system socket, if the abstract socket is not
     available. (Fixes: #505).
-  * Make 220_nxproxy-bind-loopback-only.full+lite.patch cleanly apply after
-    having added 027_nxcomp_abstract-X11-socket.full+lite.patch.
-  * Make 016_nx-X11_install-location.debian.patch cleanly apply again.
   * Add 028_nx-X11_abstract-kernel-sockets.full.patch. Provide abstract local
     socket support for Linux based systems. This patch pulls in abstract
     socket relevant code from xtrans 1.2.7. (Fixes: #504).
@@ -33,6 +30,13 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
     test for xkb/rules/base instead of testing for deprecated file
     xkb/keymap.dir. (Fixes: #40).
 
+  * Update patches, to make them apply cleanly after above changes:
+    + 220_nxproxy-bind-loopback-only.full+lite.patch
+    + 016_nx-X11_install-location.debian.patch
+    + 056_nx-X11-Werror-format-security.full.patch
+    + 108_nxagent_wine-close-delay.full.patch
+    + 300_nxagent_set-wm-class.full.patch
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 May 2014 09:58:10 +0200
 
 nx-libs (2:3.5.0.24-0x2go1) unstable; urgency=low
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 e9d8bb4..a047de7 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 875571c..7a9c18c 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 7a67e43..70b1c92 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 at 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
  

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git