[X2Go-Commits] [nx-libs] 07/11: nx-X11: Backport: ProcRRGetScreenInfo: swap configTimestamp as well

git-admin at x2go.org git-admin at x2go.org
Sat Jul 4 02:23:34 CEST 2015


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

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

commit f3079befb8bb33cb1c3221143dfa93baee5a4248
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 4 00:39:35 2015 +0200

    nx-X11: Backport: ProcRRGetScreenInfo: swap configTimestamp as well
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Tested-by: Daniel Stone <daniel at fooishbar.org>
    
    Backported from Arctica GH 3.6.x branch.
    
    v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
    v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
---
 debian/changelog                                   |    6 +++++
 ...RRGetScreenInfo-swap-configTimestamp.full.patch |   27 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 62a064c..4cfcaca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -299,6 +299,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
     v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
     Adds:
     - 1255_nx-X11_RRModeCreate-plug-memory-leak-of-newMode.full.patch
+  * nx-X11: ProcRRGetScreenInfo: swap configTimestamp as well
+    Backported from Arctica GH 3.6.x branch.
+    v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
+    v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+    Adds:
+    - 1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 17 Mar 2015 19:19:32 +0100
 
diff --git a/debian/patches/1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch b/debian/patches/1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
new file mode 100644
index 0000000..c00b78a
--- /dev/null
+++ b/debian/patches/1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
@@ -0,0 +1,27 @@
+commit bd5754f94a9b48c246d115eaed0d0e8bece95aca
+Author: Alan Coopersmith <alan.coopersmith at oracle.com>
+Date:   Mon Jul 9 19:12:42 2012 -0700
+
+    Backport: ProcRRGetScreenInfo: swap configTimestamp as well
+
+    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+    Reviewed-by: Keith Packard <keithp at keithp.com>
+    Tested-by: Daniel Stone <daniel at fooishbar.org>
+
+    Backported from Arctica GH 3.6.x branch.
+
+    v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
+    v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+
+diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
+index 20eed11..011b97f 100644
+--- a/nx-X11/programs/Xserver/randr/rrscreen.c
++++ b/nx-X11/programs/Xserver/randr/rrscreen.c
+@@ -745,6 +745,7 @@ ProcRRGetScreenInfo (ClientPtr client)
+ 	swaps(&rep.sequenceNumber, n);
+ 	swapl(&rep.length, n);
+ 	swapl(&rep.timestamp, n);
++        swapl(&rep.configTimestamp, n);
+ 	swaps(&rep.rotation, n);
+ 	swaps(&rep.nSizes, n);
+ 	swaps(&rep.sizeID, n);
diff --git a/debian/patches/series b/debian/patches/series
index 95e6985..e4817ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -142,6 +142,7 @@
 1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch
 1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch
 1255_nx-X11_RRModeCreate-plug-memory-leak-of-newMode.full.patch
+1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
 9900-dxpc-license-history.full+lite.patch
 0016_nx-X11_install-location.debian.patch
 0102_xserver-xext_set-securitypolicy-path.debian.patch

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


More information about the x2go-commits mailing list