From: Rutger Helling <rhelling@mykolab.com>
To: 29307@debbugs.gnu.org
Subject: [bug#29307] [PATCH] gnu: xpra: Fix paths.
Date: Wed, 15 Nov 2017 13:38:29 +0100 [thread overview]
Message-ID: <2403692d29693fd238372e08fc7a7cf1@mykolab.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 234 bytes --]
Hey Guix,
this patch fixes a few things about Xpra. Previously you had to manually
set the socket-dir and Xvfb values. This patch fixes it so that Xpra
works out of the box.
I've also added a note about the missing OpenGL support.
[-- Attachment #1.2: Type: text/html, Size: 433 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-xpra-Fix-paths.patch --]
[-- Type: text/x-diff; name=0001-gnu-xpra-Fix-paths.patch, Size: 2459 bytes --]
From 00df6cc379fb78838baa014859164c4b223b7018 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 15 Nov 2017 12:22:44 +0100
Subject: [PATCH] gnu: xpra: Fix paths.
* gnu/packages/xorg.scm (xpra): [arguments]: Add '--without-opengl',
'--without-Xdummy' and '--without-Xdummy-wrapper' to #:configure-flags. Add
substitutions to #phases for proper paths.
---
gnu/packages/xorg.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8435a463b..305e7eea4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5972,6 +5972,9 @@ basic eye-candy effects.")
`(#:python ,python-2 ;; no full Python 3 support yet
#:configure-flags '("--with-tests"
"--with-bundle_tests"
+ "--without-opengl" ;; TODO: pygtkglext needed.
+ "--without-Xdummy" ;; We use Xvfb instead.
+ "--without-Xdummy_wrapper"
"--without-strict")
#:modules ((guix build python-build-system)
(guix build utils))
@@ -6000,13 +6003,15 @@ basic eye-candy effects.")
(substitute* "setup.py"
(("/usr/lib/")
(string-append (assoc-ref outputs "out") "/lib/")))
- (substitute* "./etc/xpra/conf.d/55_server_x11.conf.in"
- (("xvfb = %.*")
- (string-append "xvfb = "
- (assoc-ref inputs "xorg-server")
- "/bin/Xvfb +extension Composite -nolisten tcp"
- " -noreset -auth $XAUTHORITY"
- " -screen 0 5760x2560x24+32")))
+ (substitute* "./xpra/scripts/config.py"
+ ((":.*join.*xvfb.*")
+ (string-append ": \"" (assoc-ref inputs "xorg-server")
+ "/bin/Xvfb +extension Composite"
+ " -screen 0 5760x2560x24+32 -dpi 96 -nolisten"
+ " tcp -noreset -auth $XAUTHORITY\",\n")))
+ (substitute* "./xpra/scripts/config.py"
+ (("socket-dir.*: \"\",")
+ "socket-dir\" : \"~/.xpra\","))
#t)))))
(home-page "https://www.xpra.org/")
(synopsis "Remote access to individual applications or full desktops")
--
2.15.0
next reply other threads:[~2017-11-15 12:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-15 12:38 Rutger Helling [this message]
2017-11-16 9:21 ` bug#29307: [PATCH] gnu: xpra: Fix paths Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2403692d29693fd238372e08fc7a7cf1@mykolab.com \
--to=rhelling@mykolab.com \
--cc=29307@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).