[PATCH 0/2] i3 window manager update 4.13

[PATCH 0/2] i3 window manager update 4.13

[Leo Famulari]

These patches update i3 to the latest upstream version, 4.13.

The first seems necessary since xcb-util-cursor's pkg-config file
includes the propagated packages in its 'Requires.private' field. I
noticed this issue when the i3 build failed because these packages
weren't available.

i3 itself has switched from a hand-made build system to Autotools.

I haven't actually tested this package, since my GuixSD system is not
currently using a graphical interface.

Leo Famulari (2):
  gnu: xcb-util-cursor: Propagate dependences from 'xcb-cursor.pc'.
  gnu: i3-wm: Update to 4.13.

 gnu/packages/wm.scm   | 37 +++++++++++++++++++++++++++++--------
 gnu/packages/xorg.scm |  5 +++--
 2 files changed, 32 insertions(+), 10 deletions(-)

-- 
2.11.0

[PATCH 1/2] gnu: xcb-util-cursor: Propagate dependencies from 'xcb-cursor.pc'.

[Leo Famulari]

* gnu/packages/xorg.scm (xcb-util-cursor)[inputs]: Move xcb-util-renderutil and
xcb-util-image to ...
[propagated-inputs]: ... here.
---
 gnu/packages/xorg.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 18271b5ed..fc721cafb 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5408,8 +5408,9 @@ The XCB util module provides the following libraries:
      `(("m4" ,m4)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("libxcb" ,libxcb)
-       ("xcb-util-renderutil" ,xcb-util-renderutil)
+     `(("libxcb" ,libxcb)))
+    (propagated-inputs
+     `(("xcb-util-renderutil" ,xcb-util-renderutil)
        ("xcb-util-image" ,xcb-util-image)))
     (home-page "https://cgit.freedesktop.org/xcb/util-cursor/")
     (synopsis "Port of libxcursor")
-- 
2.11.0

[PATCH 2/2] gnu: i3-wm: Update to 4.13.

[Leo Famulari]

* gnu/packages/wm.scm (i3-wm): Update to 4.13.
[arguments]: Pass '-std=c11' to #:make-flags. Provide path to XML_CATALOG_FILES.
Pass '--disable-builddir' to #:configure-flags. Re-enable the 'configure' phase
to adjust to new Autotools build system.
[inputs]: Add xcb-util-xrm.
[native-inputs]: Add docbook-xsl.
---
 gnu/packages/wm.scm | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 999f78927..46a8c3f87 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -162,27 +162,49 @@ commands would.")
 (define-public i3-wm
   (package
     (name "i3-wm")
-    (version "4.12")
+    (version "4.13")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://i3wm.org/downloads/i3-"
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1"))))
+                "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))
-       #:tests? #f)) ; no test suite
+     `(#:make-flags
+       (let* ((docbook-xsl-name-version ,(string-append
+                                          (package-name docbook-xsl) "-"
+                                          (package-version  docbook-xsl)))
+              (docbook-xsl-catalog-file (string-append
+                                         (assoc-ref %build-inputs "docbook-xsl")
+                                         "/xml/xsl/"
+                                         docbook-xsl-name-version
+                                         "/catalog.xml"))
+              (docbook-xml-catalog-file (string-append
+                                         (assoc-ref %build-inputs "docbook-xml")
+                                         "/xml/dtd/docbook/catalog.xml")))
+         ;; Reference the catalog files required to build the manpages.
+         (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file " "
+                              docbook-xml-catalog-file)
+              "CC=gcc"
+              (string-append "PREFIX=" %output)
+              ;; This works around the following error:
+              ;; 'error: ‘for’ loop initial declarations are only allowed in C99
+              ;; or C11 mode'
+              "CFLAGS=-std=c11"))
+       ;; The build system tries to build in a separate directory, but that
+       ;; seems to be unnecessary.
+       #:configure-flags '("--disable-builddir")
+       ;; The test suite appears to require the unpackaged Perl module AnyEvent.
+       #:tests? #f))
     (inputs
      `(("libxcb" ,libxcb)
        ("xcb-util" ,xcb-util)
        ("xcb-util-cursor" ,xcb-util-cursor)
        ("xcb-util-keysyms" ,xcb-util-keysyms)
        ("xcb-util-wm" ,xcb-util-wm)
+       ("xcb-util-xrm" ,xcb-util-xrm)
        ("libxkbcommon" ,libxkbcommon)
        ("libev" ,libev)
        ("libyajl" ,libyajl)
@@ -198,7 +220,9 @@ commands would.")
     (native-inputs
      `(("which" ,which)
        ("perl" ,perl)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ;; For building the documentation.
+       ("docbook-xsl" ,docbook-xsl)))
     (home-page "https://i3wm.org/")
     (synopsis "Improved tiling window manager")
     (description "A tiling window manager, completely written
-- 
2.11.0

Re: [PATCH 0/2] i3 window manager update 4.13

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> These patches update i3 to the latest upstream version, 4.13.
>
> The first seems necessary since xcb-util-cursor's pkg-config file
> includes the propagated packages in its 'Requires.private' field. I
> noticed this issue when the i3 build failed because these packages
> weren't available.
>
> i3 itself has switched from a hand-made build system to Autotools.
>
> I haven't actually tested this package, since my GuixSD system is not
> currently using a graphical interface.


>
> Leo Famulari (2):
>   gnu: xcb-util-cursor: Propagate dependences from 'xcb-cursor.pc'.
>   gnu: i3-wm: Update to 4.13.
>
>  gnu/packages/wm.scm   | 37 +++++++++++++++++++++++++++++--------
>  gnu/packages/xorg.scm |  5 +++--
>  2 files changed, 32 insertions(+), 10 deletions(-)

Thanks for this! I'm using the new version right now.

The patches LGTM.

On a wholly-unrelated note, I found that
bf7ef1bb848db0977b54ea012789adc68751c68a made the early boot environment
unable to find fsck.ext4 after unlocking a cryptsetup partition (even
though it is present in the initrd).

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

Re: [PATCH 0/2] i3 window manager update 4.13

[Leo Famulari]

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

On Mon, Dec 05, 2016 at 12:47:56AM +0100, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > These patches update i3 to the latest upstream version, 4.13.
> >
> > The first seems necessary since xcb-util-cursor's pkg-config file
> > includes the propagated packages in its 'Requires.private' field. I
> > noticed this issue when the i3 build failed because these packages
> > weren't available.
> >
> > i3 itself has switched from a hand-made build system to Autotools.
> >
> > I haven't actually tested this package, since my GuixSD system is not
> > currently using a graphical interface.
> 
> 
> >
> > Leo Famulari (2):
> >   gnu: xcb-util-cursor: Propagate dependences from 'xcb-cursor.pc'.
> >   gnu: i3-wm: Update to 4.13.
> >
> >  gnu/packages/wm.scm   | 37 +++++++++++++++++++++++++++++--------
> >  gnu/packages/xorg.scm |  5 +++--
> >  2 files changed, 32 insertions(+), 10 deletions(-)
> 
> Thanks for this! I'm using the new version right now.
> 
> The patches LGTM.

Okay, pushed. Thanks for testing!

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