From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: rofi: Update to 1.2.0. Date: Wed, 31 Aug 2016 20:04:49 +0100 Message-ID: <8760qgsqsu.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> References: <87zintx9u1.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> <20160831184733.GA12396@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfAot-0001bh-Vv for guix-devel@gnu.org; Wed, 31 Aug 2016 15:05:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bfAoo-00078n-Qu for guix-devel@gnu.org; Wed, 31 Aug 2016 15:05:06 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfAom-00076v-DV for guix-devel@gnu.org; Wed, 31 Aug 2016 15:05:02 -0400 In-Reply-To: <20160831184733.GA12396@jasmine> 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: Leo Famulari Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Leo Famulari writes: >> * gnu/packages/xdisorg.scm (xcb-util-xrm): New variable. > > This actually bundles m4, even if it doesn't use it. Can you delete that > 'm4' directory in an origin snippet? There's an example in the calibre > package definition. Good catch! >> + (uri (string-append >> + "https://github.com/Airblader/xcb-util-xrm/releases/download" > > Also this line a bit too long :) Done and done! New patches attached. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-xcb-util-xrm.patch Content-Transfer-Encoding: quoted-printable >From 002e487185df0f6c5ad38c297ee77c9d1150841a Mon Sep 17 00:00:00 2001 From: Marius Bakke 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 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cc83a04..b2cdde8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2016 Alex Kost +;;; Copyright =C2=A9 2016 Marius Bakke ;;; ;;; 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,38 @@ The taskbar includes transparency and color settings= for the font, icons, border, and background. It also supports multihead setups, customized mou= se 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/do= wnload" + "/v" version "/xcb-util-xrm-" version ".tar.bz2")) + (sha256 + (base32 + "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l")))) + (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))) --=20 2.9.3 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-rofi-Update-to-1.2.0.patch >From 2daec13c728424a3e3b7695b30f873da47c22172 Mon Sep 17 00:00:00 2001 From: Marius Bakke 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 b2cdde8..b294a79 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 --=-=-=--