* [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0
@ 2024-07-28 4:34 Andy Tai
[not found] ` <handler.72330.B.172214128513649.ack@debbugs.gnu.org>
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andy Tai @ 2024-07-28 4:34 UTC (permalink / raw)
To: 72330; +Cc: Andy Tai
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <handler.72330.B.172214128513649.ack@debbugs.gnu.org>]
* [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0
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-30 6:19 ` Zheng Junjie
2024-08-09 1:15 ` Andy Tai
2024-08-03 4:37 ` [bug#72330] [PATCH v2] " Andy Tai
2 siblings, 1 reply; 6+ messages in thread
From: Zheng Junjie @ 2024-07-30 6:19 UTC (permalink / raw)
To: Andy Tai; +Cc: 72330
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [bug#72330] [PATCH v2] gnu: xpra: Update to 6.1.0
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-30 6:19 ` [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0 Zheng Junjie
@ 2024-08-03 4:37 ` Andy Tai
2024-08-11 10:33 ` bug#72330: " Christopher Baines
2 siblings, 1 reply; 6+ messages in thread
From: Andy Tai @ 2024-08-03 4:37 UTC (permalink / raw)
To: 72330, zhengjunjie; +Cc: Andy Tai
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-11 10:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0 Zheng Junjie
2024-08-09 1:15 ` Andy Tai
2024-08-03 4:37 ` [bug#72330] [PATCH v2] " Andy Tai
2024-08-11 10:33 ` bug#72330: " Christopher Baines
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.