From patchwork Sun Sep 8 18:26:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67774 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5F44D27BBEA; Sun, 8 Sep 2024 19:27:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B9A5A27BBE2 for ; Sun, 8 Sep 2024 19:27:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snMco-0006b3-SW; Sun, 08 Sep 2024 14:27:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snMcn-0006a1-4x for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snMcm-00026y-SD for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=j3ml+Kqn1Z4bEdAKZo9kLCtj6USSorokPHbTos76T+4=; b=dkJr9Fj+ISNAXgERu/gtq4OVlfcxnwTejPKrD1gzh3RXNOC2RNafwHX5ngLWf+u4d7LY7Isp9nlUCWVmYNSSiHB5PXKWKnkOc+nbgQYqJ1E3JeS2saU2ZoeeQ4izQ1hMG6CilnfGzDDg3hRJGva5neYnTQ2avvwZOFAqE6eq9ZRHttfMhglaovAD1dbqx1/57YTfv7PyV/dnlbel6p8n56Ugb9G2Jjmn4EErG9gl2LHa5sJg8z49xBlaVesrXB4J0c/6OuXHwPJCNlADUKlodD7p4tymy8DOxkgu3XKb1Xa2vFEbq3qJgeHcowPCRrX7SIfKUohHE31YwVOrC1MVig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snMcp-0003qP-9v for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH v2 3/3] gnu: wlroots: add 0.18 Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 18:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73124@debbugs.gnu.org Cc: John Kehayias , Rutherther Received: via spool by 73124-submit@debbugs.gnu.org id=B73124.172582000014721 (code B ref 73124); Sun, 08 Sep 2024 18:27:03 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:40 +0000 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcP-0003pK-4p for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:40 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:35355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcN-0003ot-Om for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819986; x=1726079186; bh=j3ml+Kqn1Z4bEdAKZo9kLCtj6USSorokPHbTos76T+4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=B4JJ0QaeFhJ1BgXjsGDoNOumAJ7uJrA8sHmrKDNmJ8fc8GbXt4ItM/c0uOFnZkYMV 48GF3C6RHuuH85Jb0jecbOWXZH8fvUKGYpLPcZAa1c1wBGyTpowe4+ONuUzTST6FcT kZloNh/XqyJi6cjmdKUVZooVKb1thiNZA3xEvPHQ9mul44p5ZQR03C2a08IZ9dPMrh vLiU7V9EFWbyB4MuiGmrUv0nVdO4eF5QxPuTVqw0Kmk7Tk/bgKu/Uf4+IkLpRIV3w/ Ib90dcdtEjdDECi5LN4W0ET3iceJB620gpr4M12oh/Mjsa9MKdsZ1Td4NNaHy4mkT0 44jlWH0X4+v6w== Date: Sun, 08 Sep 2024 18:26:22 +0000 Message-ID: <364529bb0d4035b63b6f94250aa3637890642a73.1725819647.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: f4ad920a079f344c3d555df62d8b3b451c7339b4 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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")