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

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

[Zheng Junjie]

* 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(-)

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

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

[John Kehayias via Guix-patches via]

Hi,

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

> * 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/73071 I 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

> 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