From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 2/2] gnu: i3-wm: Update to 4.13. Date: Sun, 4 Dec 2016 17:51:26 -0500 Message-ID: <1792757968b74df2d1d587e86a596c0354f2af59.1480891867.git.leo@famulari.name> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDfdQ-0001vx-Ng for guix-devel@gnu.org; Sun, 04 Dec 2016 17:51:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDfdN-0003rJ-OK for guix-devel@gnu.org; Sun, 04 Dec 2016 17:51:52 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:59763) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cDfdN-0003qz-IX for guix-devel@gnu.org; Sun, 04 Dec 2016 17:51:49 -0500 Received: from localhost.localdomain (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id B371A24E7B for ; Sun, 4 Dec 2016 17:51:48 -0500 (EST) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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