[PATCH mesa-updates] gnu: Remove wayland-protocols-next.

  • Done
  • quality assurance status badge
Details
2 participants
  • John Kehayias
  • Zheng Junjie
Owner
unassigned
Submitted by
Zheng Junjie
Severity
normal

Debbugs page

Z
Z
Zheng Junjie wrote on 5 Sep 10:18 -0700
(address . guix-patches@gnu.org)
7451095aece1788e0be2ce43297daaa2efdeca5a.1725556713.git.zhengjunjie@iscas.ac.cn
* gnu/packages/freedesktop.scm (wayland-protocols-next): Delete variable.
* gnu/packages/kde-plasma.scm (kwin)[native-inputs]: Replace
wayland-protocols-next with wayland-protocols.

Change-Id: I819bfdcdfb93ab0f4692055269b0ec324c3b2c5e
---
gnu/packages/freedesktop.scm | 13 -------------
gnu/packages/kde-plasma.scm | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)

Toggle diff (41 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 35c7f5a8fc..244a8c2c03 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1395,19 +1395,6 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
-(define-public wayland-protocols-next
- (package (inherit wayland-protocols)
- (name "wayland-protocols-next")
- (version "1.36")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://gitlab.freedesktop.org/wayland/"
- "wayland-protocols/-/releases/" version "/downloads/"
- "wayland-protocols-" version ".tar.xz"))
- (sha256
- (base32
- "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi"))))))
-
(define-public wayland-utils
(package
(name "wayland-utils")
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 5e9b9688d1..7a35209da8 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1451,7 +1451,7 @@ (define-public kwin
mesa-utils
pkg-config
qttools
- wayland-protocols-next
+ wayland-protocols
xorg-server-for-tests
python-minimal
;; for QtWaylandScanner

base-commit: 5b64aa0be64da50eb82a770c4af1c74f8742f88a
--
2.45.2
J
J
John Kehayias wrote on 6 Sep 18:12 -0700
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)(address . 73054-done@debbugs.gnu.org)
87ed5wl11g.fsf@protonmail.com
Hi,

On Fri, Sep 06, 2024 at 01:18 AM, Zheng Junjie wrote:

Toggle quote (5 lines)
> * gnu/packages/freedesktop.scm (wayland-protocols-next): Delete variable.
> * gnu/packages/kde-plasma.scm (kwin)[native-inputs]: Replace
> wayland-protocols-next with wayland-protocols.
>

My apologies, I didn't see this patch when I was working on mesa-updates
with the following series https://issues.guix.gnu.org/73071I included a
similar change there after updating wayland-protocols to the latest
version.

Closing, please followup on the mesa issue if there's anything else,
thanks!

John

Toggle quote (45 lines)
> Change-Id: I819bfdcdfb93ab0f4692055269b0ec324c3b2c5e
> ---
> gnu/packages/freedesktop.scm | 13 -------------
> gnu/packages/kde-plasma.scm | 2 +-
> 2 files changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index 35c7f5a8fc..244a8c2c03 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -1395,19 +1395,6 @@ (define-public wayland-protocols
> . "https://wayland.freedesktop.org/releases.html")))
> (license license:expat)))
>
> -(define-public wayland-protocols-next
> - (package (inherit wayland-protocols)
> - (name "wayland-protocols-next")
> - (version "1.36")
> - (source (origin
> - (method url-fetch)
> - (uri (string-append "https://gitlab.freedesktop.org/wayland/"
> - "wayland-protocols/-/releases/" version "/downloads/"
> - "wayland-protocols-" version ".tar.xz"))
> - (sha256
> - (base32
> - "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi"))))))
> -
> (define-public wayland-utils
> (package
> (name "wayland-utils")
> diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
> index 5e9b9688d1..7a35209da8 100644
> --- a/gnu/packages/kde-plasma.scm
> +++ b/gnu/packages/kde-plasma.scm
> @@ -1451,7 +1451,7 @@ (define-public kwin
> mesa-utils
> pkg-config
> qttools
> - wayland-protocols-next
> + wayland-protocols
> xorg-server-for-tests
> python-minimal
> ;; for QtWaylandScanner
>
> base-commit: 5b64aa0be64da50eb82a770c4af1c74f8742f88a
Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 73054@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 73054
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch