From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kGM6J/iyKmAABQAA0tVLHw (envelope-from ) for ; Mon, 15 Feb 2021 17:44:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kJLiIviyKmBUFgAAbx9fmQ (envelope-from ) for ; Mon, 15 Feb 2021 17:44:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EBABF15AC2 for ; Mon, 15 Feb 2021 18:44:23 +0100 (CET) Received: from localhost ([::1]:57564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBhv4-0006Sr-RW for larch@yhetil.org; Mon, 15 Feb 2021 12:44:23 -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: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mIMPZptG5H1DDl5FHmn5K8B0X0OJY5dji" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.46 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: EBABF15AC2 X-Spam-Score: -4.46 X-Migadu-Scanner: scn1.migadu.com X-TUID: 0e8BMFo0jcug This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --mIMPZptG5H1DDl5FHmn5K8B0X0OJY5dji Content-Type: multipart/mixed; boundary="KMIk3VbWIVVP9I00zhgObvz3QeiGycDlk"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 46536@debbugs.gnu.org Message-ID: Subject: Re: Fix build of materialdecoration. References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> In-Reply-To: --KMIk3VbWIVVP9I00zhgObvz3QeiGycDlk Content-Type: multipart/mixed; boundary="------------A7920089822A9B6D76D8A318" Content-Language: en-US This is a multi-part message in MIME format. --------------A7920089822A9B6D76D8A318 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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 ". >=20 > * gnu/packages/qt.scm (materialdecoration) [git-version]: Update to >> 1.1.0-9. > Same here. >=20 >> [arguments]<#:phases>['remove-3rdparty]: New phase. > Should that be a snippet instead? >=20 >> <#:phases>['remove-3rdparty]: New phase. > As above. >=20 >> [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. >=20 > Otherwise LGTM. Thanks for the review. I have attached revised patches. Regards, RG. --------------A7920089822A9B6D76D8A318 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-cmake-shared-Update-to-1.1.0-32.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-cmake-shared-Update-to-1.1.0-32.patch" =46rom 4723f4774bfe91a20e50285374763b94dd9e9398 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Feb 2021 10:03:09 -0500 Subject: [PATCH 1/2] gnu: cmake-shared: Update to 1.1.0-32. * gnu/packages/cmake.scm (cmake-shared): Update to 1.1.0-32. [source]: Add snippet to remove bundled sources. --- gnu/packages/cmake.scm | 56 ++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ab74650066..65580c9ff7 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -55,31 +55,39 @@ #:use-module (srfi srfi-1)) =20 (define-public cmake-shared - (package - (name "cmake-shared") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/lirios/cmake-shared.git") - (commit - (string-append "v" version)))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry"))= )) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ; No target - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) - (synopsis "Shared CMake functions and macros") - (description "CMake-Shared are shared functions and macros for proje= cts + (let ((commit "8122f2b96c8da38ea41b653cf69958e75fe2129d") + (revision "32")) + (package + (name "cmake-shared") + (version + (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/cmake-shared.git") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "05avwzqcnliwx9h7qi1kl0iz4smqmxc4vkavyjbmlc6h2b97i58g"= )) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (delete-file-recursively "3rdparty"))))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; No target + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (synopsis "Shared CMake functions and macros") + (description "CMake-Shared are shared functions and macros for pro= jects using the CMake build system.") - (home-page "https://github.com/lirios/cmake-shared/") - (license license:bsd-3))) + (home-page "https://github.com/lirios/cmake-shared/") + (license license:bsd-3)))) =20 ;;; Build phases shared between 'cmake-bootstrap' and the later variants= ;;; that use cmake-build-system. --=20 2.30.0 --------------A7920089822A9B6D76D8A318 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-materialdecoration-Update-to-1.1.0-9.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-materialdecoration-Update-to-1.1.0-9.patch" =46rom 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))) =20 (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=3D-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 Q= t applications on Wayland.") - (home-page "https://github.com/lirios/materialdecoration") - (license license:lgpl3+))) + (home-page "https://github.com/lirios/materialdecoration") + (license license:lgpl3+)))) =20 (define-public grantlee (package --=20 2.30.0 --------------A7920089822A9B6D76D8A318-- --KMIk3VbWIVVP9I00zhgObvz3QeiGycDlk-- --mIMPZptG5H1DDl5FHmn5K8B0X0OJY5dji Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYCqyMwUDAAAAAAAKCRBfWBZkf4vlUXP4 AQCbDlSiPmm2U7MOUr6frt4dTY38zSM3Q3QzEzbi5AIligD+NjGupY7sLdPneDvGuUPm2FZss2BN iuHh2Di3RQsLawc= =ZzaO -----END PGP SIGNATURE----- --mIMPZptG5H1DDl5FHmn5K8B0X0OJY5dji--