GNU bug report logs - #72330
[PATCH] gnu: xpra: Update to 6.1.0

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72330 in the body.
You can then email your comments to 72330 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH] gnu: xpra: Update to 6.1.0
Date: Sat, 27 Jul 2024 21:34:19 -0700

* 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.

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
-- 
2.34.1

Message #8 received at 72330 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 72330 <at> debbugs.gnu.org
Subject: Re: bug#72330: Acknowledgement ([PATCH] gnu: xpra: Update to 6.1.0)
Date: Sun, 28 Jul 2024 16:23:36 -0700

patch passed QA
https://qa.guix.gnu.org/issue/72330

Message #11 received at 72330 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Andy Tai <atai <at> atai.org>
Cc: 72330 <at> debbugs.gnu.org
Subject: Re: [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0
Date: Tue, 30 Jul 2024 14:19:45 +0800

[Message part 1 (text/plain, inline)]

Andy Tai <atai <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 72330 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 72330 <at> debbugs.gnu.org,
	zhengjunjie <at> iscas.ac.cn
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2] gnu: xpra: Update to 6.1.0
Date: Fri,  2 Aug 2024 21:37:17 -0700

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

Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de
---
 gnu/local.mk                                           |  2 +-
 ...-install_libs.patch => xpra-6.1-install_libs.patch} | 10 +++++-----
 gnu/packages/xorg.scm                                  |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename gnu/packages/patches/{xpra-6.0-install_libs.patch => xpra-6.1-install_libs.patch} (90%)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6d2b14e72d..28953b76de 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2266,7 +2266,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch	\
   %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch	\
   %D%/packages/patches/xpra-6.0-systemd-run.patch		\
-  %D%/packages/patches/xpra-6.0-install_libs.patch		\
+  %D%/packages/patches/xpra-6.1-install_libs.patch		\
   %D%/packages/patches/xsane-fix-memory-leak.patch		\
   %D%/packages/patches/xsane-fix-pdf-floats.patch		\
   %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch	\
diff --git a/gnu/packages/patches/xpra-6.0-install_libs.patch b/gnu/packages/patches/xpra-6.1-install_libs.patch
similarity index 90%
rename from gnu/packages/patches/xpra-6.0-install_libs.patch
rename to gnu/packages/patches/xpra-6.1-install_libs.patch
index c608b519f4..0ec2aee288 100644
--- a/gnu/packages/patches/xpra-6.0-install_libs.patch
+++ b/gnu/packages/patches/xpra-6.1-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..6825474a6a 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,9 +6167,9 @@ (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"))))
+                                "xpra-6.1-install_libs.patch"))))
     (build-system python-build-system)
     (inputs
      (list bash-minimal                 ; for wrap-program

base-commit: b20956651a53a8f23828fdeb6945e1a31e6997a8
-- 
2.34.1

Message #17 received at 72330 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 72330 <at> debbugs.gnu.org
Subject: Re: [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0
Date: Thu, 8 Aug 2024 18:15:21 -0700

patch passes QA
https://qa.guix.gnu.org/issue/72330

Message #22 received at 72330-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Andy Tai <atai <at> atai.org>
Cc: 72330-done <at> debbugs.gnu.org
Subject: Re: [bug#72330] [PATCH v2] gnu: xpra: Update to 6.1.0
Date: Sun, 11 Aug 2024 11:33:42 +0100

[Message part 1 (text/plain, inline)]

Andy Tai <atai <at> atai.org> writes:

> * gnu/packages/xorg.scm (xpra): Update to 6.1.0.
> [source](origin): Update patch file name.
> * gnu/packages/patches/xpra-6.0-install_libs.patch: Delete.
> * gnu/packages/patches/xpra-6.1-install_libs.patch: New file.
> * gnu/local.mk: Unregister deleted file and register new file.
>
> Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de
> ---
>  gnu/local.mk                                           |  2 +-
>  ...-install_libs.patch => xpra-6.1-install_libs.patch} | 10 +++++-----
>  gnu/packages/xorg.scm                                  |  6 +++---
>  3 files changed, 9 insertions(+), 9 deletions(-)
>  rename gnu/packages/patches/{xpra-6.0-install_libs.patch => xpra-6.1-install_libs.patch} (90%)

Thanks, I've pushed this to master as
8b943673a15a337c48c71cecad18d9eb68143d95.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.