From patchwork Mon Feb 15 17:41:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 27071 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 372A627BC45; Mon, 15 Feb 2021 17:44:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C5FF27BC2E for ; Mon, 15 Feb 2021 17:44:21 +0000 (GMT) Received: from localhost ([::1]:57564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBhv2-0006Sr-GK for patchwork@mira.cbaines.net; Mon, 15 Feb 2021 12:44:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBhsp-0005lp-1e for guix-patches@gnu.org; Mon, 15 Feb 2021 12:42:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55331) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBhsn-0002eU-MH for guix-patches@gnu.org; Mon, 15 Feb 2021 12:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBhsn-0006gU-JJ for guix-patches@gnu.org; Mon, 15 Feb 2021 12:42:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46536] Fix build of materialdecoration. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Feb 2021 17:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46536 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Prikler , 46536@debbugs.gnu.org Received: via spool by 46536-submit@debbugs.gnu.org id=B46536.161341088525648 (code B ref 46536); Mon, 15 Feb 2021 17:42:01 +0000 Received: (at 46536) by debbugs.gnu.org; 15 Feb 2021 17:41:25 +0000 Received: from localhost ([127.0.0.1]:38644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBhsD-0006fb-9P for submit@debbugs.gnu.org; Mon, 15 Feb 2021 12:41:25 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:35115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBhs8-0006fK-GC for 46536@debbugs.gnu.org; Mon, 15 Feb 2021 12:41:24 -0500 X-Originating-IP: 76.68.120.100 Received: from [192.168.5.10] (bras-vprn-toroon474rw-lp130-08-76-68-120-100.dsl.bell.ca [76.68.120.100]) (Authenticated sender: rg@raghavgururajan.name) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id EC04C4000E; Mon, 15 Feb 2021 17:41:10 +0000 (UTC) References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> From: Raghav Gururajan Message-ID: Date: Mon, 15 Feb 2021 12:41:07 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.7.1 MIME-Version: 1.0 In-Reply-To: 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" X-getmail-retrieved-from-mailbox: Patches Hi Leo! >> * gnu/packages/cmake.scm (cmake-shared) [git-version]: Update to >> 1.1.0-32. > The git-version field doesn't actually change. You could annotate > [commit] and [revision] separately, but it usually makes sense to just > say "update to ". > > * gnu/packages/qt.scm (materialdecoration) [git-version]: Update to >> 1.1.0-9. > Same here. > >> [arguments]<#:phases>['remove-3rdparty]: New phase. > Should that be a snippet instead? > >> <#:phases>['remove-3rdparty]: New phase. > As above. > >> [arguments]<#:configure-flags>[-DCMAKE_CXX_FLAGS]: New flag. > That's a bit too much nesting. > "[arguments]<#:configure-flags: Add -DCMAKE_CXX_FLAGS" > is probably a better choice. > > Otherwise LGTM. Thanks for the review. I have attached revised patches. Regards, RG. From 921c99fd1402d96b24f551c191898d7f92986b40 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Feb 2021 11:19:32 -0500 Subject: [PATCH 2/2] gnu: materialdecoration: Update to 1.1.0-9. * gnu/packages/qt.scm (materialdecoration): Update to 1.1.0-9. [source]: Add snippet to remove bundled sources. [arguments]<#:configure-flags>: Add -DCMAKE_CXX_FLAGS. [inputs]: Add libxkbcommon. --- gnu/packages/qt.scm | 72 ++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4fbb157600..11e69ff5db 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -161,34 +161,52 @@ window managers, that don't provide Qt integration by themselves.") (license license:bsd-2))) (define-public materialdecoration - (package - (name "materialdecoration") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/lirios/materialdecoration.git") - (commit "2079487116c6c794af3a15452342a69293039b46"))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06")))) - (build-system qt-build-system) - (native-inputs - `(("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) - (inputs - `(("qtbase" ,qtbase) - ("qtwayland" ,qtwayland) - ("wayland" ,wayland))) - (synopsis "Material Decoration for Qt") - (description "MaterialDecoration is a client-side decoration for Qt + (let ((commit "6a5de23f2e5162fbee39d16f938473ff970a2ec0") + (revision "9")) + (package + (name "materialdecoration") + (version + (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/materialdecoration.git") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1zdrcb39fhhmn76w8anv1dnspz26pdl6izmj1mlm02aza4y8ffp4")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (delete-file-recursively "cmake/3rdparty"))))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs "qtbase") + "/include/qt5/QtXkbCommonSupport/" + ,(package-version qtbase))))) + (native-inputs + `(("cmake-shared" ,cmake-shared) + ("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("qtbase" ,qtbase) + ("qtwayland" ,qtwayland) + ("wayland" ,wayland) + ("xkbcommon" ,libxkbcommon))) + (synopsis "Material Decoration for Qt") + (description "MaterialDecoration is a client-side decoration for Qt applications on Wayland.") - (home-page "https://github.com/lirios/materialdecoration") - (license license:lgpl3+))) + (home-page "https://github.com/lirios/materialdecoration") + (license license:lgpl3+)))) (define-public grantlee (package -- 2.30.0