Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Adds:
  - debian/patches/1500_all_propagate-optflags-to-subcompone.full+lite.patch

Hopefully just a temporary workaround until
https://bugzilla.redhat.com/show_bug.cgi?id=1489712 /
https://bugs.centos.org/view.php?id=13779 are resolved.

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

nxcomp: Reduce control->TokenSize slightly again in order to fix fragmentation of packages when on VPN (or otherwise encapsulated) connections.

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Adds:
  - debian/patches/1301_nxcomp_Reduce-TokenSize-slightly-for.full+lite.patch

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Adds:
  - debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch

Improving non-xrender based browser scrolling behaviour when link type
is set to ADSL or WAN.

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Adds:
  - debian/patches/1300_nxcomp_Set-TokenSize-to-1536-for-lin.full+lite.patch

Removes some fuzziness and adds the -p diff option to show the C
function name in hunk headers.

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

debian/Makefile.nx-libs: make sure that 'make all' only calls 'make build' and _not_ the global '%:' ruleset afterwards.

Backported from Arctica GH 3.6.x branch.

v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)

Affects:
  - 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch

  - 0016_nx-X11_install-location.debian.patch
  - 9900-dxpc-license-history.full+lite.patch

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)

nx-libs.spec: copy new debian/x2goagent.options file into build environment, analogous to what debian/roll-tarballs.sh does.

Also, force a rebuild due to the changed versioning.

debian/changelog: Add closures for #757, #758, #760. The issue occurred earlier (#410) and was resolved by properly setting up Xinerama symlinks

Backported from Arctica GH 3.6.x branch.

This reverts commit 5a9f8294.

Conflicts (resolved by Mike Gabriel):
	debian/changelog

Should be a weak dependency, but RPM doesn't support that too well yet.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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)

The lastSetTime value which indicates when the configuration within the
server was last changed was not getting set in the appropriate RandR
requests.
Signed-off-by: Keith Packard <keithp@keithp.com>

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)

set but not used variables
shadowing a previous local

A hidden problem was that the VERIFY_RR_* macros define local 'rc'
variables, any other local definitions for those would be shadowed and
generate warnings from gcc. I've renamed the other locals 'ret'
instead of 'rc'.
Signed-off-by: Keith Packard <keithp@keithp.com>

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)

ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by
REQUEST_SIZE_MATCH(xRRGetScreenInfoReq).  This happens to work out because both
requests have the same size, so this is not a functional change, just a cosmetic
one.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

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)

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)

Reported by parfait 1.0:

Error: Memory leak (CWE 401)
   Memory leak of pointer 'newModes' allocated with realloc(((char*)modes), ((num_modes + 1) * 8))
        at line 93 of randr/rrmode.c in function 'RRModeCreate'.
          pointer allocated at line 82 with realloc(((char*)modes), ((num_modes + 1) * 8)).
Error: Memory leak (CWE 401)
   Memory leak of pointer 'newModes' allocated with malloc(8)
        at line 93 of randr/rrmode.c in function 'RRModeCreate'.
          pointer allocated at line 84 with malloc(8).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>

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)

We don't return rates to randr < 1.1 clients, so don't allocate space
for them.  This fixes a FatalError due to not all allocated space being
used.

X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861>
Reported-by: Guillaume Quintin <coincoin169g@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.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)