[PATCH] gnu: herbstluftwm: update to 0.8.1

DoneSubmitted by Boris A. Dekshteyn.
Details
2 participants
  • Boris A. Dekshteyn
  • Jakub Kądziołka
Owner
unassigned
Severity
normal
B
B
Boris A. Dekshteyn wrote on 24 Apr 09:21 +0200
(address . guix-patches@gnu.org)(name . Boris A. Dekshteyn)(address . boris.dekshteyn@google.com)
20200424072106.32741-1-boris.dekshteyn@google.com
--- gnu/packages/wm.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
Toggle diff (72 lines)diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scmindex 82f11d13fa..cd26607b27 100644--- a/gnu/packages/wm.scm+++ b/gnu/packages/wm.scm@@ -149,7 +149,7 @@ the leaves of a full binary tree.") (define-public herbstluftwm (package (name "herbstluftwm")- (version "0.7.2")+ (version "0.8.1") (source (origin (method url-fetch)@@ -157,9 +157,9 @@ the leaves of a full binary tree.") version ".tar.gz")) (sha256 (base32- "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"))+ "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y")) (file-name (string-append "herbstluftwm-" version ".tar.gz"))))- (build-system gnu-build-system)+ (build-system cmake-build-system) (inputs `(("dzen" ,dzen) ("dmenu" ,dmenu)@@ -169,13 +169,21 @@ the leaves of a full binary tree.") ("xsetroot" ,xsetroot) ("libx11" ,libx11) ("libxext" ,libxext)- ("libxinerama" ,libxinerama)))+ ("libxrandr" ,libxrandr)+ ("libxinerama" ,libxinerama)+ ("bash" ,bash))) (native-inputs- `(("pkg-config" ,pkg-config)))+ `(("pkg-config" ,pkg-config)+ ("asciidoc" ,asciidoc))) (arguments- '(#:phases+ '(#:tests? #f+ #:configure-flags+ (let ((out (assoc-ref %outputs "out")))+ (list "-DCC=gcc"+ (string-append "-DCMAKE_INSTALL_SYSCONF_PREFIX=" out "/etc")+ (string-append "-DBASHCOMPLETIONDIR=" out "/etc/bash_completion.d")))+ #:phases (modify-phases %standard-phases- (delete 'configure) ; no configure script (add-after 'install 'install-xsession (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))@@ -190,17 +198,7 @@ the leaves of a full binary tree.") Comment=Manual tiling window manager~@ Exec=~a/bin/herbstluftwm~@ Type=XSession~%" out)))- #t))))- #:tests? #f- #:make-flags- (let ((out (assoc-ref %outputs "out")))- (list "CC=gcc"- (string-append "PREFIX=''")- (string-append "DESTDIR=" out)- (string-append "FISHCOMPLETIONDIR="- "/share/fish/vendor_completions.d")- (string-append "BASHCOMPLETIONDIR=" out- "/etc/bash_completion.d")))))+ #t)))))) (synopsis "Tiling window manager for X11") (description "herbstluftwm is a manual tiling window manager for X11 using Xlib and GLib. Its main features are:-- 2.26.1
J
J
Jakub Kądziołka wrote on 26 Apr 18:33 +0200
(name . Boris A. Dekshteyn)(address . harlequin78@gmail.com)
20200426163340.scv6ih3l5up3bpha@gravity
On Fri, Apr 24, 2020 at 07:21:06PM +1200, Boris A. Dekshteyn wrote:
Toggle quote (9 lines)> @@ -169,13 +169,21 @@ the leaves of a full binary tree.")> ("xsetroot" ,xsetroot)> ("libx11" ,libx11)> ("libxext" ,libxext)> - ("libxinerama" ,libxinerama)))> + ("libxrandr" ,libxrandr)> + ("libxinerama" ,libxinerama)> + ("bash" ,bash)))
May I ask why you added bash to the dependencies? In my tests thepackage builds fine when I remove this line. Apart from this, LGTM.
Thanks for your patch!Jakub Kądziołka
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl6lt98ACgkQ4xWnWEYTFWRHJBAA0vabjBt0Yd/AZ5+vtFvwM4KnFt72y1UAyhCZJu3bmS/kkk1+n5y68wp68z4YUHHQ8yg4N+/ruytk1leypXrubNlm0yybBFmfSOxJWLXUXy5iFQ8d//Y1lOEwyWofdfXHODdmj+JQhfxO8ug9eJJOc8XBJhndr1oxGiJIl21i0HD/mTspTsW1Zbl+lk3uVWA4p31Fr3LGXhGybYpTkgvw8H22my7Cu3tnvTe2XTsSOL9PvsCVPZx4Fg4+vGZMpoq1XAK2rJWXVIa+BoKVJtmxCwzSr/WJuoww7GZeU4J5cudnK+U3Crxbcwdri0lj3tnYwJOW8ZZlRWC5ZnymJEWBSeg2GCeLz8HCI53fyoX8hTZqAufWJ7md6hUoAOlG63gHs+uKnkINkRT5dk1pUOH/E0o7Hebnx9Xs28O+U6bWmlKs2icridn4TDAt3vbnm/i0AFtK9XR1SsdATlcsMHCdz3DvcpjxVWlfwNNl06oFHiAEhfTf6ONh7/QH4BP3PmJmGVMe5rnhjtBbg5c6L7om21Tp0PEO1Wv+ZDv1rdb3mived3ylWV38F2YuwrErXVKvPCDGBWtp+caNfzZZQfRqolo7uc9C6kyAXFAsfJIFgW/xOkHPns8CnyeKqL758qRvqpyyhwNDxon01wmTQzmqJ0RmBo9PGj8cIPmhCllYMQ0==7ShC-----END PGP SIGNATURE-----

J
J
Jakub Kądziołka wrote on 27 Apr 18:08 +0200
(address . 40812-done@debbugs.gnu.org)
20200427160814.plpxyggb6gjbvbtu@gravity
On Tue, Apr 28, 2020 at 03:25:26AM +1200, Boris A. Dekshteyn wrote:
Toggle quote (8 lines)> Jakub Kądziołka <kuba@kadziolka.net> writes:> > > In Guix, the `inputs' field only affects packages available at build> > time. Runtime dependencies are inferred from the package hashes stored> > in build artifacts.> > Thanks for clarifying.
Thanks for your updated patch! I took the liberty to rearrange the addedinputs a bit to preserve the alphabetical sort and added a copyrightline for you, then pushed to master as commit138896e1ea4d0ba420d04bff067692fecf93a613.
Cheers!
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl6nA24ACgkQ4xWnWEYTFWQKHBAAtW397fTEFe5gfetF0HhQ2qrmdr3PXt4n1k14QJ11UcdDdmt8giZT+vGxWgjwkfJU/dgYphW4m5VBRdLHoXjqyeSG4NrluuhdpZsd0662czoF3r4qxv4MiYt/sPbjFTC2rlAibAxuuERLquKG7Yfotsrm9LMCwJCGeY9YbWYW+kYz4HSy26VGg2rUTAnuwtUHpgZwwvuzmMCWgd7CJn2K06RQX3flnWxB0rhP2q4TbOswqXVAb+sBnv+wO8iuzqb4xzzVioLmvqiG+AZtOWPV6NVAIBXwFQTCx/zu/VYlDngOvAqZeM9gX1puQSvfqkfqSVU1MBUbFhJLq4Lmlf1vJrdqEVA++kxHWmM95GFpcDiCjr5HNTi0jK44K+GeireZPersl3SfHAJwoNlyeQiwAj7grnpDB0V467vO4v6d7CF7mYBvsQjxnllNgZNOUfJaMmWjgRZsLugsdte28UmfmMz5xpf6mvNPUJhbOIZLyPdvZmBWtjKXQJaCdNxoc1x6qoxOK/0i0YHsofqXRm2tDQxMmjKNKNMkHYCJZXFLv3p9BACIZt741PsmAMugDHxjSnIK81J+3gHkeGqGMKnw2U5m9jYQWb001wZgwLLKmeReHsigKRFozGuiZBpAtMgiVkVPtj6n+5wdzko/X7/eF0miFxLIi9q3/45xojPI3LY==NYjC-----END PGP SIGNATURE-----

Closed
?