bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xpra: Update to 6.4.1.

Browse source 
* gnu/packages/xorg.scm (xpra): Update to 6.4.1.
[source](origin): Update patch file name.
* gnu/packages/patches/xpra-6.0-systemd-run.patch: Delete.
* gnu/packages/patches/xpra-6.4-systemd-run.patch: New file.
* gnu/packages/patches/xpra-6.1-install_libs.patch: Delete.
* gnu/packages/patches/xpra-6.4-install_libs.patch: New file.
* gnu/local.mk: Unregister deleted file and register new file.

Change-Id: Ib026b49114f5afca39ee8ec1a8a209cd6c11c7d6
This commit is contained in:
Andy Tai 2026-01-17 01:00:40 -08:00 • committed by Andy Tai
parent 6d5255de95
commit 8455dba243
4 changed files with 41 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/local.mk
View file

@ -2534,8 +2534,8 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
%D%/packages/patches/xpra-5.0-install_libs.patch \
%D%/packages/patches/xpra-5.0-systemd-run.patch \
%D%/packages/patches/xpra-6.0-systemd-run.patch \
%D%/packages/patches/xpra-6.1-install_libs.patch \
%D%/packages/patches/xpra-6.4-systemd-run.patch \
%D%/packages/patches/xpra-6.4-install_libs.patch \
%D%/packages/patches/xterm-370-explicit-xcursor.patch \
%D%/packages/patches/xygrib-fix-finding-data.patch \
%D%/packages/patches/xygrib-newer-proj.patch \

26
gnu/packages/patches/xpra-6.1-install_libs.patch → gnu/packages/patches/xpra-6.4-install_libs.patch
View file

@ -4,11 +4,11 @@ This workaround for Gentoo interferes with our use of --no-compile during
the 'install stage.
diff --git a/setup.py b/setup.py
index be7a3758e8..28dc1be191 100755
index bd65109379..a97a310ea3 100755
--- a/setup.py
+++ b/setup.py
@@ -953,8 +953,6 @@ if modules_ENABLED:
# Utility methods for building with Cython
@@ -1081,8 +1081,6 @@ if verbose_ENABLED and not os.environ.get("DISTUTILS_DEBUG"):
def do_add_cython_ext(*args, **kwargs) -> None:
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
@ -16,17 +16,19 @@ index be7a3758e8..28dc1be191 100755
if not cython_ENABLED:
raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
@@ -2175,9 +2173,6 @@ else:
if root_prefix.endswith("/usr"):
# ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/"
root_prefix = root_prefix[:-4]
@@ -2301,11 +2299,6 @@ else:
def _get_root_prefix(self) -> str:
root_prefix = ""
- for x in sys.argv:
- if x.startswith("--root="):
- root_prefix = x[len("--root="):]
print(f" root_prefix={root_prefix!r}")
build_xpra_conf(root_prefix)
@@ -2320,13 +2315,6 @@ else:
- return x[len("--root="):]
- if x.startswith("--prefix="):
- root_prefix = x[len("--prefix="):]
if not root_prefix:
install_dir = self._get_install_dir()
root_prefix = install_dir.rstrip("/")
@@ -2466,13 +2459,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])

11
gnu/packages/patches/xpra-6.0-systemd-run.patch → gnu/packages/patches/xpra-6.4-systemd-run.patch
View file

@ -3,10 +3,10 @@ Distriction specific patch, not going upstream
Disable systemd-run if the command is not found.
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
index 1c5e8ddaad..084aabe792 100755
index 734e488eb9..36410d2d85 100755
--- a/xpra/scripts/main.py
+++ b/xpra/scripts/main.py
@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool:
@@ -437,20 +437,26 @@ def use_systemd_run(s) -> bool:
cmd = ["systemd-run", "--quiet"]
if getuid() != 0:
cmd += ["--user"]
@ -18,10 +18,7 @@ index 1c5e8ddaad..084aabe792 100755
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
- try:
- proc.terminate()
- except Exception:
- pass
- noerr(proc.terminate)
+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
try:
@ -45,4 +42,4 @@ index 1c5e8ddaad..084aabe792 100755
+ return False
def verify_gir():
def verify_gir() -> None:

50
gnu/packages/xorg.scm
View file

@ -6520,19 +6520,19 @@ basic eye-candy effects.")
(define-public xpra
(package
(name "xpra")
(version "6.3.6")
(version "6.4.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Xpra-org/xpra.git")
(commit (string-append "v" version))))
(url "https://github.com/Xpra-org/xpra.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0lrhj1xipgx839bvjwp2mbxf72c1c5g3y66vcaqs0zzk50zvyxwi"))
(patches (search-patches "xpra-6.0-systemd-run.patch"
"xpra-6.1-install_libs.patch"))))
(build-system python-build-system)
(base32 "0y6b70g16bh1pbjzmwsrrdjgnm0vgw8ff934n1y69vfb93sdfbc0"))
(patches (search-patches "xpra-6.4-systemd-run.patch"
"xpra-6.4-install_libs.patch"))))
(build-system pyproject-build-system)
(inputs
(list bash-minimal ; for wrap-program
;; Essential dependencies.
@ -6572,27 +6572,19 @@ basic eye-candy effects.")
python-lz4 ; Faster compression than zlib.
python-netifaces
python-pycups))
(native-inputs (list pkg-config pandoc python-cython))
(native-inputs (list pkg-config pandoc python-cython python-setuptools))
(arguments
(list
#:configure-flags #~(list "--without-Xdummy"
"--without-Xdummy_wrapper"
"--with-opengl"
"--without-debug"
"--without-strict") ; Ignore compiler warnings.
#:modules '((guix build python-build-system)
(guix build utils))
;; Do not run test-cases. This would rebuild all modules and they seem
;; to require python2.
#:configure-flags
#~'(("--without-Xdummy" . "")
("--without-Xdummy_wrapper" . "")
("--with-opengl" . "")
("--without-debug" . "")
("--without-strict" . "")) ; Ignore compiler warnings.
;; Do not run test-cases as they seem to require python2.
#:tests? #f
#:phases
#~(modify-phases %standard-phases
;; Must pass the same flags as 'install, otherwise enabled modules may
;; not be built.
(replace 'build
(lambda* (#:key configure-flags #:allow-other-keys)
(apply invoke (append (list "python" "setup.py" "build")
configure-flags))))
(add-before 'install 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
;; Fix binary paths.
@ -6625,7 +6617,7 @@ basic eye-candy effects.")
"EndSection\n\n"))
(substitute* '("xpra/scripts/config.py"
"fs/etc/xpra/conf.d/60_server.conf.in"
"tests/unittests/unit/server/mixins/notification_test.py")
"tests/unittests/unit/server/subsystem/notification_test.py")
;; The trailing -- is intentional, so we only replace it inside
;; a command line.
(("dbus-launch --")
@ -6636,10 +6628,10 @@ basic eye-candy effects.")
(("socket-dir.*: \"\",")
"socket-dir\" : \"~/.xpra\","))))
;; GTK3 will not be found, if GI can’t find its typelibs.
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(add-after 'wrap 'wrap-program
(lambda _
;; XXX: only export typelibs in inputs
(wrap-program (search-input-file outputs "bin/xpra")
(wrap-program (string-append #$output "/bin/xpra")
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://www.xpra.org/")
(synopsis "Remote access to individual applications or full desktops")
@ -6657,7 +6649,7 @@ X11 servers, Windows, or macOS.")
(package
(inherit xpra)
(name "xpra")
(version "5.1.3")
(version "5.1.4")
(source
(origin
(method git-fetch)
@ -6666,7 +6658,7 @@ X11 servers, Windows, or macOS.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1046dqfh97l586gzbvcd1vb515na35147jm55i50kc9zkssfmygc"))
(base32 "1hb6pjixs85laarypkx6dvb8n9qyahy8v251f71h7qll9l2w8ak0"))
(patches (search-patches "xpra-5.0-systemd-run.patch"
"xpra-5.0-install_libs.patch"))))))