aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2015-07-04 00:39:35 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-04 01:29:01 +0200
commitf3079befb8bb33cb1c3221143dfa93baee5a4248 (patch)
tree673b5891594e1eb684cf5f19653553c81c352b5f /debian
parente2f5d079ddb22a10a52731330309cd5c32128c21 (diff)
downloadnx-libs-f3079befb8bb33cb1c3221143dfa93baee5a4248.tar.gz
nx-libs-f3079befb8bb33cb1c3221143dfa93baee5a4248.tar.bz2
nx-libs-f3079befb8bb33cb1c3221143dfa93baee5a4248.zip
nx-X11: Backport: ProcRRGetScreenInfo: swap configTimestamp as well
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Tested-by: Daniel Stone <daniel@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)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch27
-rw-r--r--debian/patches/series1
3 files changed, 34 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 62a064cbb..4cfcaca08 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@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 000000000..c00b78a3f
--- /dev/null
+++ b/debian/patches/1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
@@ -0,0 +1,27 @@
+commit bd5754f94a9b48c246d115eaed0d0e8bece95aca
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 9 19:12:42 2012 -0700
+
+ Backport: ProcRRGetScreenInfo: swap configTimestamp as well
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@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 95e6985a9..e4817ac02 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