From unknown Fri Aug 15 14:16:25 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46536 <46536@debbugs.gnu.org> To: bug#46536 <46536@debbugs.gnu.org> Subject: Status: Fix build of materialdecoration. Reply-To: bug#46536 <46536@debbugs.gnu.org> Date: Fri, 15 Aug 2025 21:16:25 +0000 retitle 46536 Fix build of materialdecoration. reassign 46536 guix-patches submitter 46536 Raghav Gururajan severity 46536 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 15 11:35:37 2021 Received: (at submit) by debbugs.gnu.org; 15 Feb 2021 16:35:37 +0000 Received: from localhost ([127.0.0.1]:38597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBgqX-00055f-3f for submit@debbugs.gnu.org; Mon, 15 Feb 2021 11:35:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:46238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBgqU-00055X-SY for submit@debbugs.gnu.org; Mon, 15 Feb 2021 11:35:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBgqQ-00054b-5C for guix-patches@gnu.org; Mon, 15 Feb 2021 11:35:31 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:53385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBgqK-0001py-3y for guix-patches@gnu.org; Mon, 15 Feb 2021 11:35:29 -0500 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 relay11.mail.gandi.net (Postfix) with ESMTPSA id 98D6F100002; Mon, 15 Feb 2021 16:35:13 +0000 (UTC) To: guix-patches@gnu.org From: Raghav Gururajan Subject: Fix build of materialdecoration. Message-ID: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> Date: Mon, 15 Feb 2021 11:35:09 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.7.1 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="okLym3YVLSzpfxLZUCp22oxgWxv14zs2j" Received-SPF: pass client-ip=217.70.178.231; envelope-from=rg@raghavgururajan.name; helo=relay11.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Leo Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --okLym3YVLSzpfxLZUCp22oxgWxv14zs2j Content-Type: multipart/mixed; boundary="Wc0tDRNAtZR7MP7zQv3i7qysTQBPsOBfG"; protected-headers="v1" From: Raghav Gururajan To: guix-patches@gnu.org Cc: Leo Prikler Message-ID: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> Subject: Fix build of materialdecoration. --Wc0tDRNAtZR7MP7zQv3i7qysTQBPsOBfG Content-Type: multipart/mixed; boundary="------------797E017094F8B6AD3E1D595C" Content-Language: en-US This is a multi-part message in MIME format. --------------797E017094F8B6AD3E1D595C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable --------------797E017094F8B6AD3E1D595C 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 6d5fdf31616eb31aca756cb8ceb81e644677fb3c 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) [git-version]: Update to 1.1.0-32= =2E [arguments]<#:phases>['remove-3rdparty]: New phase. --- 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..66f1c3ccdc 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"= )))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-3rdparty + (lambda _ + (delete-file-recursively "3rdparty") + #t))))) + (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 --------------797E017094F8B6AD3E1D595C 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 06382a8cac4a8320e636f1ce5c4af0d3e98419df 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) [git-version]: Update to 1.1.0= -9. [arguments]<#:configure-flags>[-DCMAKE_CXX_FLAGS]: New flag. <#:phases>['remove-3rdparty]: New phase. [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..f8b6beaf9b 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"= )))) + (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))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-3rdparty + (lambda _ + (delete-file-recursively "cmake/3rdparty") + #t))))) + (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 --------------797E017094F8B6AD3E1D595C-- --Wc0tDRNAtZR7MP7zQv3i7qysTQBPsOBfG-- --okLym3YVLSzpfxLZUCp22oxgWxv14zs2j Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYCqivQUDAAAAAAAKCRBfWBZkf4vlUTJz AP9FMI5O9bs+tccE3ESgkHEmr0wySEDs+e99jswDXMOHhAD7Bjz35P+3qPgiAp7P7fSGAWXsxMcz kT2CcQQ/AKws/AM= =BQ6G -----END PGP SIGNATURE----- --okLym3YVLSzpfxLZUCp22oxgWxv14zs2j-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 15 12:07:55 2021 Received: (at 46536) by debbugs.gnu.org; 15 Feb 2021 17:07:55 +0000 Received: from localhost ([127.0.0.1]:38626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBhLm-0005s9-SK for submit@debbugs.gnu.org; Mon, 15 Feb 2021 12:07:55 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:48928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBhLk-0005ry-CZ for 46536@debbugs.gnu.org; Mon, 15 Feb 2021 12:07:53 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DfVsc3t5Mz3wY2; Mon, 15 Feb 2021 18:07:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613408868; bh=ZC0fW3lTsja/I7iMDH6QDw0pCTA54iallcenXpeLv7w=; h=Subject:From:To:Date:In-Reply-To:References; b=HFGh8ZXtSq7a1zKGwTNId8MDQ394xxMQTZBixGipZQe0rWd/wLxpNrNsmhXhqrBsk byOiflZC2ANU/G+49H/MbJJKYs4thW1GkBaP4zcxmXiKuLBA/HYERYURLqyOR1joPc uVOp0d6qeYd8lQbKlCNKMe6OXlWXHiNaRgZMjFBw= Message-ID: Subject: Re: Fix build of materialdecoration. From: Leo Prikler To: Raghav Gururajan , 46536@debbugs.gnu.org Date: Mon, 15 Feb 2021 18:07:47 +0100 In-Reply-To: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46536 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, > * 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. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 15 12:41:25 2021 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) To: Leo Prikler , 46536@debbugs.gnu.org References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> From: Raghav Gururajan Subject: Re: Fix build of materialdecoration. 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46536 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 15 13:08:47 2021 Received: (at 46536-done) by debbugs.gnu.org; 15 Feb 2021 18:08:47 +0000 Received: from localhost ([127.0.0.1]:38664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiIh-0007K4-Ew for submit@debbugs.gnu.org; Mon, 15 Feb 2021 13:08:47 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:23375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiId-0007Jo-JD; Mon, 15 Feb 2021 13:08:46 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DfXCr17Vjz3wZp; Mon, 15 Feb 2021 19:08:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613412520; bh=rAvqBu1ddjI60Nzlm5apU9HTA88hsQHRYWgvKuIqGt8=; h=Subject:From:To:Date:In-Reply-To:References; b=p1RZHbAPeALNyf0dmDEDEQeMoCcfJJ5Pew5p+j8ekO8ROWXWtKZdKlJ90p0Ts/wCv Kzg8dnMoa4hCK3mXb4mt2p7mPP76yIWiDM7+L1BCmoxqayQF6yqYGPncROJiPg98Zs xsp8JuH+kvriwenDhZw0Q/Wgnn0ExDPAvESXKtDY= Message-ID: <1ac1d87cca091781d9aa7efc992b134ecee89391.camel@student.tugraz.at> Subject: Re: Fix build of materialdecoration. From: Leo Prikler To: Raghav Gururajan , 46536-done@debbugs.gnu.org, 46314-done@debbugs.gnu.org Date: Mon, 15 Feb 2021 19:08:39 +0100 In-Reply-To: References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46536-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Am Montag, den 15.02.2021, 12:41 -0500 schrieb Raghav Gururajan: > Thanks for the review. I have attached revised patches. Thanks for the patches. I've pushed them upstream, so I'll be closing this and 46314. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 15 13:09:39 2021 Received: (at 46536-done) by debbugs.gnu.org; 15 Feb 2021 18:09:39 +0000 Received: from localhost ([127.0.0.1]:38680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiJX-0007Me-BP for submit@debbugs.gnu.org; Mon, 15 Feb 2021 13:09:39 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:45435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiJV-0007M8-4u; Mon, 15 Feb 2021 13:09:38 -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 relay8-d.mail.gandi.net (Postfix) with ESMTPSA id E24681BF206; Mon, 15 Feb 2021 18:09:28 +0000 (UTC) Subject: Re: Fix build of materialdecoration. To: Leo Prikler , 46536-done@debbugs.gnu.org, 46314-done@debbugs.gnu.org References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> <1ac1d87cca091781d9aa7efc992b134ecee89391.camel@student.tugraz.at> From: Raghav Gururajan Message-ID: <782e56b3-0743-6394-0b14-81c0f552eac7@raghavgururajan.name> Date: Mon, 15 Feb 2021 13:09:24 -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: <1ac1d87cca091781d9aa7efc992b134ecee89391.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vcBa9MNak0MR8uQ4aKBQ8SNB2fO1HK0Q5" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46536-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vcBa9MNak0MR8uQ4aKBQ8SNB2fO1HK0Q5 Content-Type: multipart/mixed; boundary="pj9V0XPHN6A6s9PKqreDR2vccZLIziiqr"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 46536-done@debbugs.gnu.org, 46314-done@debbugs.gnu.org Message-ID: <782e56b3-0743-6394-0b14-81c0f552eac7@raghavgururajan.name> Subject: Re: Fix build of materialdecoration. References: <4b5cdf69-da37-dd7a-22f9-c9c7334afa1e@raghavgururajan.name> <1ac1d87cca091781d9aa7efc992b134ecee89391.camel@student.tugraz.at> In-Reply-To: <1ac1d87cca091781d9aa7efc992b134ecee89391.camel@student.tugraz.at> --pj9V0XPHN6A6s9PKqreDR2vccZLIziiqr Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Leo! > Thanks for the patches. I've pushed them upstream, so I'll be closing > this and 46314. Thank you! Regards, RG. --pj9V0XPHN6A6s9PKqreDR2vccZLIziiqr-- --vcBa9MNak0MR8uQ4aKBQ8SNB2fO1HK0Q5 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYCq41AUDAAAAAAAKCRBfWBZkf4vlUbrQ AP9YdnvpaMTfiMQ4ZYTEnkE8ZWteS03APe4112eVKIDAcAD9FNOtXT49GdCL6pXJntO4fgg5Fxk4 P2ukpcDyB6Wy/Q0= =V17L -----END PGP SIGNATURE----- --vcBa9MNak0MR8uQ4aKBQ8SNB2fO1HK0Q5-- From unknown Fri Aug 15 14:16:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 16 Mar 2021 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator