From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: Andy Tai <atai@atai.org>
Cc: 72330@debbugs.gnu.org
Subject: [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0
Date: Tue, 30 Jul 2024 14:19:45 +0800 [thread overview]
Message-ID: <87le1jz9j2.fsf@iscas.ac.cn> (raw)
In-Reply-To: <7fb3e4467339bb60ccf54eb1ad9ae90afb1fc725.1722141217.git.atai@atai.org> (Andy Tai's message of "Sat, 27 Jul 2024 21:34:19 -0700")
[-- Attachment #1: Type: text/plain, Size: 3153 bytes --]
Andy Tai <atai@atai.org> writes:
> * gnu/packages/xorg.scm (xpra): Update to 6.1.0.
> * gnu/packages/patches/xpra-6.0-install_libs.patch: Update for xpra 6.1.0.
^^^ maybe rename this file to 6.1 ?.
>
> Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de
> ---
> gnu/packages/patches/xpra-6.0-install_libs.patch | 10 +++++-----
> gnu/packages/xorg.scm | 4 ++--
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/patches/xpra-6.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch
> index c608b519f4..0ec2aee288 100644
> --- a/gnu/packages/patches/xpra-6.0-install_libs.patch
> +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch
> @@ -4,19 +4,19 @@ This workaround for Gentoo interferes with our use of --no-compile during
> the 'install stage.
>
> diff --git a/setup.py b/setup.py
> -index 4f066fa8bf..14a9ed65ed 100755
> +index be7a3758e8..28dc1be191 100755
> --- a/setup.py
> +++ b/setup.py
> -@@ -760,8 +760,6 @@ if modules_ENABLED:
> +@@ -953,8 +953,6 @@ if modules_ENABLED:
> # Utility methods for building with Cython
>
> - def do_add_cython_ext(*args, **kwargs):
> + 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):
> - return
> if not cython_ENABLED:
> raise ValueError(f"cannot build {args}: cython compilation is disabled")
> if cython_tracing_ENABLED:
> -@@ -1971,9 +1969,6 @@ else:
> +@@ -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]
> @@ -26,7 +26,7 @@ index 4f066fa8bf..14a9ed65ed 100755
> print(f" root_prefix={root_prefix!r}")
> build_xpra_conf(root_prefix)
>
> -@@ -2116,13 +2111,6 @@ else:
> +@@ -2320,13 +2315,6 @@ else:
> if uinput_ENABLED:
> add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
>
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index 6b953ef152..bdce6174ff 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -6158,7 +6158,7 @@ (define-public xcompmgr
> (define-public xpra
> (package
> (name "xpra")
> - (version "6.0.2")
> + (version "6.1.0")
> (source
> (origin
> (method git-fetch)
> @@ -6167,7 +6167,7 @@ (define-public xpra
> (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> (sha256
> - (base32 "176qxrksgr07jhrlny3zxybnvf091kxkfmfnv9ci3h2k1nbwqh2x"))
> + (base32 "1x1ld2p3q47irqq6p1b3rd9ffbi7kvgxyvfmgi0skfin17b2aqx4"))
> (patches (search-patches "xpra-6.0-systemd-run.patch"
> "xpra-6.0-install_libs.patch"))))
> (build-system python-build-system)
>
> base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2024-07-30 6:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-28 4:34 [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0 Andy Tai
[not found] ` <handler.72330.B.172214128513649.ack@debbugs.gnu.org>
2024-07-28 23:23 ` [bug#72330] Acknowledgement ([PATCH] gnu: xpra: Update to 6.1.0) Andy Tai
2024-07-30 6:19 ` Zheng Junjie [this message]
2024-08-09 1:15 ` [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0 Andy Tai
2024-08-03 4:37 ` [bug#72330] [PATCH v2] " Andy Tai
2024-08-11 10:33 ` bug#72330: " Christopher Baines
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87le1jz9j2.fsf@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=72330@debbugs.gnu.org \
--cc=atai@atai.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.