From patchwork Sat Apr 20 10:12:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 63172 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 49B7127BBEA; Sat, 20 Apr 2024 11:19:00 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 9750227BBE2 for ; Sat, 20 Apr 2024 11:18:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ry7o0-0004nn-Cp; Sat, 20 Apr 2024 06:18:48 -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 1ry7nz-0004nZ-6d for guix-patches@gnu.org; Sat, 20 Apr 2024 06:18:47 -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 1ry7ny-0002oP-VD for guix-patches@gnu.org; Sat, 20 Apr 2024 06:18:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ry7oD-0008N5-Il for guix-patches@gnu.org; Sat, 20 Apr 2024 06:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70466] [PATCH v2] gnu: Add libdecor. References: <01e46762faf0b74581d07a365c65157354081f84.1713492642.git.aurtzy@gmail.com> In-Reply-To: <01e46762faf0b74581d07a365c65157354081f84.1713492642.git.aurtzy@gmail.com> Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2024 10:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70466@debbugs.gnu.org Cc: john.kehayias@protonmail.com, aurtzy Received: via spool by 70466-submit@debbugs.gnu.org id=B70466.171360828631828 (code B ref 70466); Sat, 20 Apr 2024 10:19:01 +0000 Received: (at 70466) by debbugs.gnu.org; 20 Apr 2024 10:18:06 +0000 Received: from localhost ([127.0.0.1]:35560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ry7nG-0008Gh-2f for submit@debbugs.gnu.org; Sat, 20 Apr 2024 06:18:05 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:57557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ry7nC-0008FI-A4 for 70466@debbugs.gnu.org; Sat, 20 Apr 2024 06:18:00 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-69b24162dd6so15677856d6.2 for <70466@debbugs.gnu.org>; Sat, 20 Apr 2024 03:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713608257; x=1714213057; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0kmRm18kHXGLYfluhf4glDNVlHt9GLo3JFVkcnFPWII=; b=XqozCXZ49bIADz4baUkbNv0EcIQGF4getEt3/SEw+dO5ZUZnphQy8rIoGD1vBEJ4GK Lv59QRC0KzKD+NL8HTy99ptBo7sh2XdFTBmz+TX3rvjNblSmoA7jtIdrD9S/7KT7WT5w ZKxlCj/pAeYaMfW74R/qTS8zjQQCwr0ErO1pcoP4L7s2pFtN7QWkXhhXnPMyuXKLeXty 6FVRo25oWc5lu+iUBO/XHT0/QNdgrOCs2mf8rvnGTNe5DuF5l48lHko84WD8bdhQuiPV p52FMVBg4UMWMjl4q/KGrva6Yvv1xjvcD5KpXIVSLfNKwLJUo8LpLEJhQRzu7SSXwfSX CLCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713608257; x=1714213057; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0kmRm18kHXGLYfluhf4glDNVlHt9GLo3JFVkcnFPWII=; b=u8XkxHwP62DKnzPtBgfk5iLjk8TTtyRDhpswp9dSsJD/VOVZpCl4HcBwHR5I4mmSIH GYsLgBviQu/2d63Df+O3RnJkpkZuKPDL/O6NczpqBIyYN2qpbLNZCL/8ISKLjMqTxAGw jzeGChfvSB9qexh/fySzbQqcruVJzIC8czXNCLkMB6GK7WfafayquqllrZsbdpuBx8+r KCEaANUkYoUvT00ybB3n1NTkv04FmXfyIabDfQpxYWiIMC0bUbLbVfI0mQETbqb7RSIe imtLvYzoHWKD/v7okbBgWPfxaMvyRJCtZSOGNPAgBOybaI76Z2JPz/5cqAbCdUAB3Y7D tLVg== X-Gm-Message-State: AOJu0YxXIJFW73QEFOQDqs2s3ghiqEL1iv4IakRycjyYPUECZyxGjBWQ y1B26x4MCxki3v3AjqtsmYX0mSNM5skXlUZfZwnktp7+JjE67H1gsq2goQ== X-Google-Smtp-Source: AGHT+IHFuPi7IqSjH36UYehTaoSO3KczppAdYbQ+k1lZOnqw1XEs5LIr06EK3ZsnObYpwqbAowsEgA== X-Received: by 2002:ad4:4684:0:b0:6a0:5344:aed4 with SMTP id pl4-20020ad44684000000b006a05344aed4mr5125483qvb.5.1713608256819; Sat, 20 Apr 2024 03:17:36 -0700 (PDT) Received: from localhost.localdomain ([2600:4808:a053:7600::92d]) by smtp.gmail.com with ESMTPSA id bz4-20020ad44c04000000b006a067efb28fsm1048085qvb.43.2024.04.20.03.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Apr 2024 03:17:36 -0700 (PDT) From: aurtzy Date: Sat, 20 Apr 2024 06:12:17 -0400 Message-ID: <72015ff750152dddde60f4c3ea994de388a5477f.1713590018.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 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: , 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 (libdecor): New variable. Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1 --- Hi John, > > * gnu/packages/xorg.scm (libdecor): New variable. > > > > Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1 > > --- > > > > Is this a reasonable location for libdecor? I had trouble deciding between > > (gnu packages xorg) and (gnu packages xdisorg), but even then I wasn't sure if > > it belonged in either. > > > > I'm not expert, but maybe in freedesktop? Since that is where wayland > is, for example (and this is a freedesktop project, though not sure that > maps for all). I think it makes sense; moved to freedesktop. > > gnu/packages/xorg.scm | 35 +++++++++++++++++++++++++++++++++++ > > 1 file changed, 35 insertions(+) > > > > diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm > > index 81d8462761..4fd4c3eece 100644 > > --- a/gnu/packages/xorg.scm > > +++ b/gnu/packages/xorg.scm > > @@ -38,6 +38,8 @@ > > ;;; Copyright © 2023 Janneke Nieuwenhuizen > > ;;; Copyright © 2023, 2024 John Kehayias > > ;;; Copyright © 2023, 2024 Kaelyn Takata > > +;;; Copyright © 2022 Samuel Culpepper > > Who is this for? Did this come from another channel/previous patch then? > (Not a problem and giving credit is, of course, correct! Just wondering.) Woops, should have explained that - yes, the original libdecor definition was found here: https://github.com/Admicos/minecraft-wayland/issues/18 > > + (native-inputs (list cmake > > + pkg-config)) > > Minor nit: this should be one line. Adjusted! > Otherwise LGTM, just want to confirm the extra copyright line. You can > send an update putting this in freedesktop if you agree and fixing the > native-inputs line, or I can do it when pushing. > > Thanks! > John Cheers, aurtzy gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) base-commit: 0797fff8b8b3feb1e421aad170b4c12a87091663 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 339297c087..081269ebaf 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -35,6 +35,8 @@ ;;; Copyright © 2023 Alex Devaure ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022 Samuel Culpepper +;;; Copyright © 2024 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -3234,3 +3236,34 @@ (define-public waypipe "Waypipe is a proxy for Wayland clients, with the aim of supporting behavior like @samp{ssh -X}.") (license license:expat))) + +(define-public libdecor + (package + (name "libdecor") + (version "0.2.2") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libdecor/libdecor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q")))) + (build-system meson-build-system) + (native-inputs (list cmake pkg-config)) + (inputs (list cairo + dbus + egl-wayland + gtk+ + libglvnd + libxkbcommon + pango + wayland + wayland-protocols)) + (home-page "https://gitlab.freedesktop.org/libdecor/libdecor") + (synopsis "Client-side decorations library for Wayland clients") + (description "libdecor is a library that can help Wayland clients draw +window decorations for them. It aims to provide multiple backends that +implements the decoration drawing.") + (license license:expat)))