Merge ~fheimes/ubuntu/+source/tigervnc/+git/tigervnc:tigervnc-lp1929790-impish into ~fheimes/ubuntu/+source/tigervnc/+git/tigervnc:importer/ubuntu/impish-devel

[Frank Heimes]

TigerVNC 1.11.0 contains a regression that causes vncviewer to display
incorrect colors when vncviewer and X11 server use different endianness.
It got fixed with the help of a cherry-pick of 7ab9263 from v1.11.90.

A manual setup and test was done on impish running tigervnc server on Ubuntu Server s390x and tigervncclient on amd64.

[Christian Ehrhardt  (paelzer)]

Thanks, this iteration LGTM.

Furthermore it does not need a feature freeze exception, so I could sponsor it as is - shall I?

[Christian Ehrhardt  (paelzer)]

review: Approve

[Christian Ehrhardt  (paelzer)]

uploaded, since the change is upstream we will pick it up with the next merge.
@frank - I'm not sure how fast they do releases, please do realize that you are kind of responsible to ensure this goes back to become a sync.

The best way to start this is to submit as similar fix to Debian (as they'd benefit as well) and request a sync once it is added there.

[Frank Heimes (fheimes)]

Even if this topic is a little bit old now, a quick update:
I've sent Joachim Falk - who maintains the Debian package - a note suggesting to incl. the fix in Debian too, but I'm waiting for an answer.
(I can't upload on Debian myself, since I'm not a Debian maintainer.)

In case he does not come back and the patch will not be incl. in Debian over time, I think it will be at least incl. in the next tigervnc update and sync to Ubuntu afterwards. Then we probably need to remove the patch again (since I strongly believe it will be part of the next version, since the patches are already upstream accepted).

That's my current plan ...

Unmerged commits

d201b23... by Frank Heimes on 2021-09-20

  * debian/control for debian/patches/0001-Update-Surface_X11.cxx.patch
    after update-maintainer run

03b075a... by Frank Heimes on 2021-09-20

  * debian/changelog for debian/patches/0001-Update-Surface_X11.cxx.patch

8baf025... by Frank Heimes on 2021-09-20

  * debian/patch/0001-Update-Surface_X11.cxx.patch
    TigerVNC 1.11.0 contains a regression that causes vncviewer to display
    incorrect colors when vncviewer and X11 server use different endianness.
    (LP: #1929790)

diff --git a/debian/changelog b/debian/changelog
index a6d978c..ff31a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tigervnc (1.11.0+dfsg-2ubuntu1) impish; urgency=medium
+
+  * debian/patch/0001-Update-Surface_X11.cxx.patch
+    TigerVNC 1.11.0 contains a regression that causes vncviewer to display
+    incorrect colors when vncviewer and X11 server use different endianness.
+    (LP: #1929790)
+
+ -- Frank Heimes <[e-mail]>  Mon, 20 Sep 2021 19:57:36 +0200
+
 tigervnc (1.11.0+dfsg-2) unstable; urgency=medium
 
   [ Joachim Falk ]
diff --git a/debian/control b/debian/control
index 72d0734..5a5de1a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: tigervnc
 Section: x11
 Priority: optional
-Maintainer: TigerVNC Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: TigerVNC Packaging Team <[e-mail]>
 Uploaders:
  Joachim Falk <[e-mail]>,
  Mike Gabriel <[e-mail]>,
diff --git a/debian/patches/0001-Update-Surface_X11.cxx.patch b/debian/patches/0001-Update-Surface_X11.cxx.patch
new file mode 100644
index 0000000..60628c7
--- /dev/null
+++ b/debian/patches/0001-Update-Surface_X11.cxx.patch
@@ -0,0 +1,54 @@
+Update Surface_X11.cxx
+
+Runtime sellection of ARGB  XImage byte order
+
+Author: johnmartin-oracle <[e-mail]>
+Origin: upstream, https://github.com/TigerVNC/tigervnc/pull/1084/commits/7ab92639848a6059e2b6b88499b008b9606f3af6
+Bug-IBM: Bugzilla 192826
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1929790
+Applied-Upstream: v1.11.90
+Reviewed-by: Frank Heimes <[e-mail]>
+Last-Update: 2021-09-20
+
+---
+ vncviewer/Surface_X11.cxx | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/vncviewer/Surface_X11.cxx b/vncviewer/Surface_X11.cxx
+index 6562634d..8944c3f7 100644
+--- a/vncviewer/Surface_X11.cxx
++++ b/vncviewer/Surface_X11.cxx
+@@ -123,17 +123,17 @@ void Surface::alloc()
+   // we find such a format
+   templ.type = PictTypeDirect;
+   templ.depth = 32;
+-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+-  templ.direct.alpha = 0;
+-  templ.direct.red   = 8;
+-  templ.direct.green = 16;
+-  templ.direct.blue  = 24;
+-#else
+-  templ.direct.alpha = 24;
+-  templ.direct.red   = 16;
+-  templ.direct.green = 8;
+-  templ.direct.blue  = 0;
+-#endif
++  if (XImageByteOrder(fl_display) == MSBFirst) {
++    templ.direct.alpha = 0;
++    templ.direct.red   = 8;
++    templ.direct.green = 16;
++    templ.direct.blue  = 24;
++  } else {
++    templ.direct.alpha = 24;
++    templ.direct.red   = 16;
++    templ.direct.green = 8;
++    templ.direct.blue  = 0;
++  }
+   templ.direct.alphaMask = 0xff;
+   templ.direct.redMask = 0xff;
+   templ.direct.greenMask = 0xff;
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index a59f237..31a52e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,5 @@ rh/tigervnc-working-tls-on-fips-systems.patch
 
 # The following patches are security fixes
 CVE-2014-8240-849479.patch
+
+0001-Update-Surface_X11.cxx.patch