[bug#40812] [PATCH] gnu: herbstluftwm: update to 0.8.1

[bug#40812] [PATCH] gnu: herbstluftwm: update to 0.8.1

[Boris A. Dekshteyn]

---
 gnu/packages/wm.scm | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 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

[bug#40812] [PATCH] gnu: herbstluftwm: update to 0.8.1

[Jakub Kądziołka]

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

On Fri, Apr 24, 2020 at 07:21:06PM +1200, Boris A. Dekshteyn wrote:
> @@ -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 the
package builds fine when I remove this line. Apart from this, LGTM.

Thanks for your patch!
Jakub Kądziołka

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#40812: [PATCH] gnu: herbstluftwm: update to 0.8.1

[Jakub Kądziołka]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

On Tue, Apr 28, 2020 at 03:25:26AM +1200, Boris A. Dekshteyn wrote:
> 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 added
inputs a bit to preserve the alphabetical sort and added a copyright
line for you, then pushed to master as commit
138896e1ea4d0ba420d04bff067692fecf93a613.

Cheers!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]