Merge branch 'xpra' into '2023'

xpra (fix xcfb command)

See merge request software-team/easybuild!1845

Golden_Repo/x/xpra/xpra-4.4.3-GCCcore-11.3.0.eb

@@ -141,7 +141,16 @@ postinstallcmds = [
     # set specific configurations
     (
         # set xpra default configs
-        'cp -a %(builddir)s/xpra/xpra-4.4.3/build/etc %(installdir)s && '
+        'cp -a %(builddir)s/xpra/xpra-%(version)s/build/etc %(installdir)s && '
+        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/xorg.conf %(installdir)s/etc/xpra/ && '
+        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/xorg-uinput.conf %(installdir)s/etc/xpra/ && '
+        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/cuda.conf %(installdir)s/etc/xpra/ && '
+        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/nvenc.keys %(installdir)s/etc/xpra/ && '
+        'cp %(builddir)s/xpra/xpra-%(version)s/fs/etc/xpra/nvfbc.keys %(installdir)s/etc/xpra/ && '
+        # fix the xvfb call
+        "sed -i '/^[[:space:]]*-config \"${XORG_CONFIG_PREFIX}/c\ "
+        "   -config \"%(installdir)s/etc/xpra/xorg.conf\"'"
+        "   %(installdir)s/etc/xpra//conf.d/55_server_x11.conf && "
         # initialize script that can modify the environment of the server
         'touch %(installdir)s/etc/xpra/server.env && '
         "sed -i 's!^source =.*!source = %(installdir)s/etc/xpra/server.env!' "