> Done and done! New patches attached. Oops, forgot to refresh my local branch. Here are the actual new patches.
>From e1606ba7814ff218a5670aab22b57686b71f2922 Mon Sep 17 00:00:00 2001 From: Marius Bakke <mba...@fastmail.com> Date: Wed, 31 Aug 2016 15:37:18 +0100 Subject: [PATCH 1/2] gnu: Add xcb-util-xrm. * gnu/packages/xdisorg.scm (xcb-util-xrm): New variable. --- gnu/packages/xdisorg.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cc83a04..06ed052 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2016 Leo Famulari <l...@famulari.name> ;;; Copyright © 2016 Alex Kost <alez...@gmail.com> +;;; Copyright © 2016 Marius Bakke <mba...@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -1021,3 +1023,42 @@ The taskbar includes transparency and color settings for the font, icons, border, and background. It also supports multihead setups, customized mouse actions, a built-in clock, a battery monitor and a system tray.") (license license:gpl2))) + +(define-public xcb-util-xrm + (package + (name "xcb-util-xrm") + (version "1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/Airblader/xcb-util-xrm/releases" + "/download/v" version "/xcb-util-xrm-" version ".tar.bz2")) + (sha256 + (base32 + "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l")) + (modules '((guix build utils))) + (snippet + ;; Drop bundled m4. + '(delete-file-recursively "m4")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("m4" ,m4) + ("libx11" ,libx11))) ; for tests + (inputs + `(("libxcb" ,libxcb) + ("xcb-util" ,xcb-util))) + (home-page "https://github.com/Airblader/xcb-util-xrm") + (synopsis "XCB utility functions for the X resource manager") + (description + "The XCB util module provides a number of libraries which sit on +top of libxcb, the core X protocol library, and some of the extension +libraries. These experimental libraries provide convenience functions +and interfaces which make the raw X protocol more usable. Some of the +libraries also provide client-side code which is not strictly part of +the X protocol but which has traditionally been provided by Xlib. + +XCB util-xrm module provides the following libraries: + +- xrm: utility functions for the X resource manager.") + (license license:x11))) -- 2.9.3
>From cb5d1f27388ab748afa96b86cc146545192f1b79 Mon Sep 17 00:00:00 2001 From: Marius Bakke <mba...@fastmail.com> Date: Wed, 31 Aug 2016 15:45:06 +0100 Subject: [PATCH 2/2] gnu: rofi: Update to 1.2.0. * gnu/packages/xdisorg.scm (rofi): Update to 1.2.0. [inputs]: Drop libx11 and add xcb-util-xrm. --- gnu/packages/xdisorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 06ed052..323ff11 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -940,7 +940,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (define-public rofi (package (name "rofi") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/DaveDavenport/rofi/" @@ -948,17 +948,17 @@ connectivity of the X server running on a particular @code{DISPLAY}.") version "/rofi-" version ".tar.xz")) (sha256 (base32 - "1l8vl0mh7i0b1ycifqpg6392f5i4qxlv003m126skfk6fnlfq8hn")))) + "0xxx0xpxhrhlhi2axq9867zqrhwqavc1qrr833k1xr0pvm5m0aqc")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) - ("pango" ,pango) + `(("pango" ,pango) ("cairo" ,cairo) ("glib" ,glib) ("startup-notification" ,startup-notification) ("libxkbcommon" ,libxkbcommon) ("libxcb" ,libxcb) ("xcb-util" ,xcb-util) + ("xcb-util-xrm" ,xcb-util-xrm) ("xcb-util-wm" ,xcb-util-wm))) (native-inputs `(("pkg-config" ,pkg-config))) -- 2.9.3