From patchwork Sun Sep 8 17:30:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67770 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 88B1627BBEA; Sun, 8 Sep 2024 18:31:16 +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 EB4A427BBE2 for ; Sun, 8 Sep 2024 18:31:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snLkc-0002wQ-Jp; Sun, 08 Sep 2024 13:31: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 1snLka-0002vi-EZ for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31: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 1snLka-0005rd-4d for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31: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=/4xIv4iPNKP1MeETM/1ZMrZz7VCCNhAs99kNAW5ATA4=; b=RGm6i33zuJui7wyGgfxWGilzEQ2dUqHXA7S7jGxNaJzWMNKZC7iH5HnAV5A1X7GIofoAIXGfTmwOSj9qujNYsJNg//QLGzQxW6h/JjhiGgdKBrS8rqVZfhvLE3VkeQpCL2tpEnUL4oMcjBkcbA0XIQQtZo+DDMcsfpCR1BbGw0mzewD4+xVybZ32acbOc65DvibG+nJznlVEGbTCu81r2dOqvmkybFbLCWqbfB4o9vzDMWVt9tLa2UOYZ1cXBE+GirZPabx0JNVppgS9kAPfulF+1yuC+YPACQzzbBBVWnebgx7Wamgeem65OFsfDrqueh+TK6G9QkFF8vgTcwNmdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snLkc-0000w2-HQ for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH 2/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 17:31:02 +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.17258166273525 (code B ref 73124); Sun, 08 Sep 2024 17:31:02 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 17:30:27 +0000 Received: from localhost ([127.0.0.1]:59989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLk2-0000ul-Oa for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:27 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:37563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLk0-0000uL-PH for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725816616; x=1726075816; bh=/4xIv4iPNKP1MeETM/1ZMrZz7VCCNhAs99kNAW5ATA4=; 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=kjLPV5S86ev7vLLYzHN+6RuE4o6qaWceWDGNB3y6M9jkoO8yYGnSB7mQ38ULUElir s7R4GtJFRH7I9UP/zpFFwwYzYppuHtkdAPGYhSqTnfuXu2O73NoS01oBAiBvQVHtZW y7jhdTrPHW02AKf2EvftJa+alGhF0wtWZm/RAO1/vBohLh8DlI+iKxuTlXkGrSAr65 tSiF/07BT3H1fGY4tzR7e9nKg5SseBYIgCFE5X474aOfm3BjVCLx7jzymUCsF671/O 1JipIJWWv28KVZmZXjdYkkTXK3HETyrb++QT1CwuE6kemhQ/VxCmgbbtat5NyMn6OR 9sdSfAQ5elpvA== Date: Sun, 08 Sep 2024 17:30:13 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 21e4e089fa7ba266211c7de60d1863834fec8233 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. Change-Id: Id7983e872e91543cbfc2b585f3723fa9b287309f --- gnu/packages/wm.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d7ac3498f..238f4138ab 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,9 +1735,8 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")) - ;; This patch can be removed once hwdata in Guix supports pkg-config - (patches (search-patches "wlroots-hwdata-fallback.patch")))) + (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")) + (patches (search-patches "wlroots-hwdata-fallback.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -1784,9 +1783,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 @@ -1803,7 +1818,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 @@ -1816,6 +1831,8 @@ (define-public wlroots-0.15 (sha256 (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h")))))) +(define-public wlroots wlroots-0.17) + (define-public wl-mirror (package (name "wl-mirror")