all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Rutherther via Guix-patches via <guix-patches@gnu.org>
To: 73124@debbugs.gnu.org
Cc: John Kehayias <john.kehayias@protonmail.com>,
	Rutherther <rutherther@protonmail.com>
Subject: [bug#73124] [PATCH v2 3/3] gnu: wlroots: add 0.18
Date: Sun, 08 Sep 2024 18:26:22 +0000	[thread overview]
Message-ID: <364529bb0d4035b63b6f94250aa3637890642a73.1725819647.git.rutherther@protonmail.com> (raw)
In-Reply-To: <cover.1725819647.git.rutherther@protonmail.com>

wlroots major versions are usually incompatible. With
change to 0.18 wlroots has a different .pc pkg-config file
name, wlroots-0.18.pc. That means any package using pkg-config
to search for wlroots won't be able to find it. So even if there
were no breaking changes inside wlroots code base, it means programs
cannot be compiled against different major version.

I've thus exposed every wlroots as a separate symbol without the need
for use of "wlroots" symbol, so every package can use major wlroots version
appropriate for its version. I've kept wlroots symbol to not break anything
that is currently using it for wlroots-0.17.

* gnu/packages/wm.scm: Add wlroots-0.18, bind wlroots 0.17
to wlroots-0.17 symbol to make it easier to target specific
major wlroots version.

Change-Id: I377ed66e91b4adc1216d42077fe7c34178a5552b
---
 gnu/packages/wm.scm | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 30ae699550..b558c1223c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1723,10 +1723,10 @@ (define-public polybar
 functionality to display information about the most commonly used services.")
     (license license:expat)))
 
-(define-public wlroots
+(define-public wlroots-0.18
   (package
     (name "wlroots")
-    (version "0.17.4")
+    (version "0.18.0")
     (source
      (origin
        (method git-fetch)
@@ -1735,7 +1735,7 @@ (define-public wlroots
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))))
+        (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -1782,9 +1782,25 @@ (define-public wlroots
 modules for building a Wayland compositor.")
     (license license:expat)))  ; MIT license
 
+(define-public wlroots-0.17
+  (package
+    (inherit wlroots-0.18)
+    (name "wlroots")
+    (version "0.17.4")
+    (source
+     (origin
+       (inherit (package-source wlroots-0.18))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))))))
+
 (define-public wlroots-0.16
   (package
-    (inherit wlroots)
+    (inherit wlroots-0.18)
     (name "wlroots-0.16")
     (version "0.16.2")
     (source
@@ -1801,7 +1817,7 @@ (define-public wlroots-0.16
 
 (define-public wlroots-0.15
   (package
-    (inherit wlroots)
+    (inherit wlroots-0.18)
     (name "wlroots-0.15")
     (version "0.15.1")
     (source
@@ -1814,6 +1830,8 @@ (define-public wlroots-0.15
        (sha256
         (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))))
 
+(define-public wlroots wlroots-0.17)
+
 (define-public wl-mirror
   (package
     (name "wl-mirror")
-- 
2.45.2






  parent reply	other threads:[~2024-09-08 18:27 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-08 17:27 [bug#73124] [PATCH 0/3] gnu: wlroots: update on mesa-updates Rutherther via Guix-patches via
2024-09-08 17:30 ` [bug#73124] [PATCH 1/3] gnu: wayland: Update to 1.23.1 Rutherther via Guix-patches via
2024-09-08 17:30 ` [bug#73124] [PATCH 2/3] gnu: wlroots: add 0.18 Rutherther via Guix-patches via
2024-09-08 17:30 ` [bug#73124] [PATCH 3/3] gnu: wlroots: Remove hwdata patch Rutherther via Guix-patches via
2024-09-08 18:26 ` [bug#73124] [PATCH v2 0/3] gnu: wlroots: update on mesa-updates Rutherther via Guix-patches via
2024-09-08 18:26   ` [bug#73124] [PATCH v2 1/3] gnu: wlroots: Remove hwdata patch Rutherther via Guix-patches via
2024-09-08 18:26   ` [bug#73124] [PATCH v2 2/3] gnu: wayland: Update to 1.23.1 Rutherther via Guix-patches via
2024-09-08 18:26   ` Rutherther via Guix-patches via [this message]
2024-09-09  3:31   ` bug#73124: [PATCH v2 0/3] gnu: wlroots: update on mesa-updates John Kehayias via Guix-patches via

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=364529bb0d4035b63b6f94250aa3637890642a73.1725819647.git.rutherther@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=73124@debbugs.gnu.org \
    --cc=john.kehayias@protonmail.com \
    --cc=rutherther@protonmail.com \
    /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.