* [bug#46536] Fix build of materialdecoration.
@ 2021-02-15 16:35 Raghav Gururajan
2021-02-15 17:07 ` Leo Prikler
0 siblings, 1 reply; 4+ messages in thread
From: Raghav Gururajan @ 2021-02-15 16:35 UTC (permalink / raw)
To: 46536; +Cc: Leo Prikler
[-- Attachment #1.1.1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #1.1.2: 0001-gnu-cmake-shared-Update-to-1.1.0-32.patch --]
[-- Type: text/x-patch, Size: 2948 bytes --]
From 6d5fdf31616eb31aca756cb8ceb81e644677fb3c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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.
[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))
(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 projects
+ (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 projects
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))))
;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system.
--
2.30.0
[-- Attachment #1.1.3: 0002-gnu-materialdecoration-Update-to-1.1.0-9.patch --]
[-- Type: text/x-patch, Size: 3662 bytes --]
From 06382a8cac4a8320e636f1ce5c4af0d3e98419df Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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)))
(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=-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 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#46536] Fix build of materialdecoration.
2021-02-15 16:35 [bug#46536] Fix build of materialdecoration Raghav Gururajan
@ 2021-02-15 17:07 ` Leo Prikler
2021-02-15 17:41 ` Raghav Gururajan
0 siblings, 1 reply; 4+ messages in thread
From: Leo Prikler @ 2021-02-15 17:07 UTC (permalink / raw)
To: Raghav Gururajan, 46536
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 <commit hash>".
* 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#46536] Fix build of materialdecoration.
2021-02-15 17:07 ` Leo Prikler
@ 2021-02-15 17:41 ` Raghav Gururajan
2021-02-15 18:08 ` bug#46536: " Leo Prikler
0 siblings, 1 reply; 4+ messages in thread
From: Raghav Gururajan @ 2021-02-15 17:41 UTC (permalink / raw)
To: Leo Prikler, 46536
[-- Attachment #1.1.1: Type: text/plain, Size: 825 bytes --]
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 <commit hash>".
>
> * 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.
[-- Attachment #1.1.2: 0001-gnu-cmake-shared-Update-to-1.1.0-32.patch --]
[-- Type: text/x-patch, Size: 2922 bytes --]
From 4723f4774bfe91a20e50285374763b94dd9e9398 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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))
(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 projects
+ (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 projects
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))))
;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system.
--
2.30.0
[-- Attachment #1.1.3: 0002-gnu-materialdecoration-Update-to-1.1.0-9.patch --]
[-- Type: text/x-patch, Size: 3643 bytes --]
From 921c99fd1402d96b24f551c191898d7f92986b40 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#46536: Fix build of materialdecoration.
2021-02-15 17:41 ` Raghav Gururajan
@ 2021-02-15 18:08 ` Leo Prikler
0 siblings, 0 replies; 4+ messages in thread
From: Leo Prikler @ 2021-02-15 18:08 UTC (permalink / raw)
To: Raghav Gururajan, 46536-done, 46314-done
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-15 18:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-15 16:35 [bug#46536] Fix build of materialdecoration Raghav Gururajan
2021-02-15 17:07 ` Leo Prikler
2021-02-15 17:41 ` Raghav Gururajan
2021-02-15 18:08 ` bug#46536: " Leo Prikler
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).