Hello,

> xpra failed to build on armel and armhf. See
> https://buildd.debian.org/status/fetch.php?pkg=xpra&arch=armel&ver=3.0.8%2Bdfsg1-1&stamp=1586872010&raw=0

based on upstream suggestion, I removed the patch, and let the program do its 
job, by adding the dependencies on xorg and xvfb (this one can probably be 
installed just on arm)

I also added xvfb on debian/tests/control, and the autopkgtest went green also 
on armhf!

--- xpra-3.0.9+dfsg1/debian/changelog   2020-04-20 02:47:55.000000000 +0200
+++ xpra-3.0.9+dfsg1/debian/changelog   2020-07-21 18:49:46.000000000 +0200
@@ -1,3 +1,11 @@
+xpra (3.0.9+dfsg1-1.1) unstable; urgency=medium
+
+  * Add xorg and xvfb to build and test deps and comment xorg patch
+    - This should help detection of the right backend on arm* and elsewhere.
+      see https://xpra.org/trac/ticket/2737 and Debian bug: #956822
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Tue, 21 Jul 2020 
18:49:46 +0200
+
 xpra (3.0.9+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru xpra-3.0.9+dfsg1/debian/control xpra-3.0.9+dfsg1/debian/control
--- xpra-3.0.9+dfsg1/debian/control     2020-04-14 11:52:20.000000000 +0200
+++ xpra-3.0.9+dfsg1/debian/control     2020-07-21 18:49:46.000000000 +0200
@@ -28,6 +28,8 @@
     ,python3-all-dev
     ,python3-cairo-dev
     ,python-gi-dev
+    ,xorg
+    ,xvfb
 Rules-Requires-Root: no
 Homepage: http://xpra.org/
 Vcs-Git: https://salsa.debian.org/debian/xpra.git
diff -Nru xpra-3.0.9+dfsg1/debian/patches/series 
xpra-3.0.9+dfsg1/debian/patches/series
--- xpra-3.0.9+dfsg1/debian/patches/series      2020-03-26 11:08:09.000000000 
+0100
+++ xpra-3.0.9+dfsg1/debian/patches/series      2020-07-21 18:49:35.000000000 
+0200
@@ -1,7 +1,7 @@
 
 ## Fixes
 build-hurd.patch
-fix-xvfb-path.patch
+#fix-xvfb-path.patch
 
 ## Misc.
 buildinfo.patch
diff -Nru xpra-3.0.9+dfsg1/debian/tests/control 
xpra-3.0.9+dfsg1/debian/tests/control
--- xpra-3.0.9+dfsg1/debian/tests/control       2019-04-10 03:39:32.000000000 
+0200
+++ xpra-3.0.9+dfsg1/debian/tests/control       2020-07-21 18:49:46.000000000 
+0200
@@ -3,6 +3,6 @@
 #, isolation-container
 # ,isolation-machine
 # ,needs-recommends
-Depends: @ ,coreutils ,procps ,x11-apps ,x11-xserver-utils ,xauth
+Depends: @ ,coreutils ,procps ,x11-apps ,x11-xserver-utils ,xauth, xvfb
 # ,@builddeps@
 # ,x11-common


you can see autopkgtest results here
https://autopkgtest.ubuntu.com/packages/xpra/groovy/

I know adding xorg and xvfb is far from ideal, but I agree that the 
autodetection system that upstream
provides us should work, and eventually be fixed if something is not correct, 
rather than patching it manually
downstream.

I don't plan to NMU this change, because I still feel not too confident on it

G.

Reply via email to