From patchwork Sun Sep 8 18:26:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67773 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 C829F27BBEA; Sun, 8 Sep 2024 19:27:24 +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 9D3E827BBE9 for ; Sun, 8 Sep 2024 19:27:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snMcq-0006bS-SB; Sun, 08 Sep 2024 14:27:04 -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 1snMcm-0006Ze-Be for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:00 -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-00026k-3B 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=wQWkSrl+4T3rLP0/nb3jgl9+SRIktV/Y6c4zYdLbRuc=; b=NSVEiRNjxY6E6I1u3bvMyW3FUO9qj81DYLw99t/hgJ5GDI0ELhGSPMNJ7jDKdFwmQKTTZTeZ2aww81SqplRZwHFYZXFJhAJnUb5AyFzNHCTh3Qa08RTtZhuGF1y6kTiwlZt26ERi2ReSxick7EhrvEUrVt7exqJ83iFeq2nKr757QmTRM8F+t2vh1HR8Y/u8wOMR1MlTVxOC+NEeUJFZ6PTpsW4aErJSiPPvhWxHAHd79AND/yCa0Qv8zkkHGylofZ9FnbEJUww4VGGvZsefR8s8tfTTwM4NbP7X5eTlxB9mQtjHkUZy8LAIeceXIORZBNU5GqZHWylLGHdAjv7Bpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snMco-0003q9-8y for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH v2 1/3] gnu: wlroots: Remove hwdata patch Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 18:27: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.172581998914683 (code B ref 73124); Sun, 08 Sep 2024 18:27:02 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:29 +0000 Received: from localhost ([127.0.0.1]:60035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcH-0003ol-D7 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:29 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:19053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcD-0003oI-Oy for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819976; x=1726079176; bh=wQWkSrl+4T3rLP0/nb3jgl9+SRIktV/Y6c4zYdLbRuc=; 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=XjmcYZBdjw/OzsdoRUcJJxYzWPEHvsn6c1zXSLvOqgXZGWpbJENeGFSmZSJ+dp21e Wzblg7HPp9tdOD+SK6U1wlvGhFSlr7vBG1NiergTQpkOiJkrgnQSWyVksuLCvwEQan VrN1PJWmI/w7B+fR/Egnz1H0JwpCWN6qLNiahJN5StzL5QnOftvZofIvVwmq2cBRlg iMtdbt/OdidRitjRhhxN0ZIh4MplYBv/J/ApCvhbqrkMqWA+ZQw2C6AgWbu0pKZGtD fmwYHh0FCbON+vg/rzLDLsV3VabT7V0EUtdaaBJNP453fAZ+3YDWJlEiiz5sI2tlGk b2wlVFOfQLi7g== Date: Sun, 08 Sep 2024 18:26:15 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 2f05714028bf966a4a255cb3dfd6750772fe1b7e 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 * gnu/packages/wm.scm: remove wlroots patch wlroots-hwdata-fallback.patch, since it's no longer necessary as hwdata package has "share/pkgconfig/hwdata.pc" * gnu/packages/patches/wlroots-hwdata-fallback.patch: Remove unused patch * gnu/local.mk: Remove reference of removed gnu/packages/patches/wlroots-hwdata-fallback.patch Change-Id: I4be3e203b99f1d8e4d837164d55a8c06c8fc71ee --- gnu/local.mk | 1 - .../patches/wlroots-hwdata-fallback.patch | 46 ------------------- gnu/packages/wm.scm | 4 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf42e2b6da..4a2b1c1dbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2288,7 +2288,6 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ - %D%/packages/patches/wlroots-hwdata-fallback.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch deleted file mode 100644 index 6468c7cbf3..0000000000 --- a/gnu/packages/patches/wlroots-hwdata-fallback.patch +++ /dev/null @@ -1,46 +0,0 @@ -backend/drm: add hardcoded hwdata path fallback - -Add hardcoded fallback "/usr/share/hwdata/pnp.ids" as a -temporary solution to get things working in Guix until -hwdata ships with pkg-config file. - -diff --git a/backend/drm/meson.build b/backend/drm/meson.build -index 6fcb2c15..ed95360a 100644 ---- a/backend/drm/meson.build -+++ b/backend/drm/meson.build -@@ -1,8 +1,7 @@ - hwdata = dependency( - 'hwdata', -- required: 'drm' in backends, -+ required: false, - native: true, -- not_found_message: 'Required for the DRM backend.', - ) - - libdisplay_info = dependency( -@@ -19,15 +18,21 @@ libliftoff = dependency( - required: false, - ) - --if not (hwdata.found() and libdisplay_info.found() and features['session']) -+if hwdata.found() -+ hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') -+ pnp_ids = files(hwdata_dir / 'pnp.ids') -+else -+ pnp_ids = files('/usr/share/hwdata/pnp.ids') -+endif -+ -+if not (libdisplay_info.found() and features['session']) - subdir_done() - endif - --hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') - pnpids_c = custom_target( - 'pnpids.c', - output: 'pnpids.c', -- input: files(hwdata_dir / 'pnp.ids'), -+ input: pnp_ids, - feed: true, - capture: true, - command: files('gen_pnpids.sh'), - diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d7ac3498f..30ae699550 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1735,9 +1735,7 @@ (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 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")))) (build-system meson-build-system) (arguments `(#:phases From patchwork Sun Sep 8 18:26:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67775 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 8E63327BBE9; Sun, 8 Sep 2024 19:27:38 +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=unavailable 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 4D4F627BBE2 for ; Sun, 8 Sep 2024 19:27:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snMco-0006av-Kf; 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 1snMcm-0006Zf-Kr for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:00 -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-00026p-BT 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=DuOhYXulaDFQZOF73vvtAonRWwpgACGJ5GL02+t1L2Q=; b=fvW4muM7iuPMOZhiiya2ZAFVAgJ5RHhnpuH+HT1T7dYtz0mcWOpQBJXaTl9IedB8K0bw/+54S+t792KlOY65eU3pUz6Pq1tHdRVw8nQL0KDSZSmr7dVaSnib1KWqAIVfzcCYF95EYlc/B6QlIPuOmCTxwKn463NwvX2LrFn55wh00qyIRFRdMqvJWyMnCvGVZRqIWBba78PRQqonmpj1hnsclFq80nogZs/+0RWgEsQ6VmRfifIfFdM/2Krw0STc3WRQkmTnJkflcYdGq04WUY/xWlfn3gCVNdy0Ug9cUQnI6aaWXRCaQM+W1Bc6pnlI+KUsicuduVIAefHqjZPUhg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snMco-0003qI-Py for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH v2 2/3] gnu: wayland: Update to 1.23.1 Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 18:27: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.172581999414701 (code B ref 73124); Sun, 08 Sep 2024 18:27:02 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:34 +0000 Received: from localhost ([127.0.0.1]:60039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcL-0003p3-S4 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:34 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:13693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcJ-0003oV-Fw for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819983; x=1726079183; bh=DuOhYXulaDFQZOF73vvtAonRWwpgACGJ5GL02+t1L2Q=; 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=TAtypECfhiQCqZjOE5I8J6dAGpMaa/VTpl7kbkqkEvb/wBdcmj1dvXczy+ePXZ7KW zCWVpKTjXrEnQ/4xbb7kDdOxOhksoiSLdrrhT4fM9v5HLlmk0HS37adgKqe8RJ4lMV Pg3FhrzfbcqCICENseE2U4hfMJvc/YN+Cj4QpLFPMgc9k1hovQnp1RkUEoZ7Ein1by yQFoFEsgEjfw3FG07Zid2JSKm/CbHKgpVsrDg+c9bQ59ego0E6mgwhXCypht/88w11 k8VsexGRgK+DClUTaUKIyfhSuOgaqV0mhf+ddP8Rxvu9OTMia7Mu2477vfH49/kKsh H8pPdUy729abA== Date: Sun, 08 Sep 2024 18:26:18 +0000 Message-ID: <8211d9a1fb43ff108d1d39951226e9cbf00e6df8.1725819647.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 0d81d27a8508dd6bb6b00008b73b6b1f103de2ad 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 * gnu/packages/freedesktop.scm: Update Wayland to 1.23.1 Change-Id: Iacfeb77617cb6a039822fa7f0649a6433fa96973 --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d5b31bf837..89509e7a1c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1316,7 +1316,7 @@ (define-public python-pyxdg (define-public wayland (package (name "wayland") - (version "1.22.0") + (version "1.23.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.freedesktop.org/" name @@ -1324,7 +1324,7 @@ (define-public wayland name "-" version ".tar.xz")) (sha256 (base32 - "0hjq8b1cprxpxcv2klgir1hd63vy5hrqilp9v317394qlqgayh0m")))) + "1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments 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")