From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH 1/2] gnu: ratpoison: Update to 1.4.8. Date: Thu, 6 Aug 2015 18:59:32 +0200 Message-ID: <1438880373-19212-2-git-send-email-mthl@openmailbox.org> References: <1438880373-19212-1-git-send-email-mthl@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.1.4" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNOYw-00010s-Ra for guix-devel@gnu.org; Thu, 06 Aug 2015 13:02:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNOYq-0003lO-6l for guix-devel@gnu.org; Thu, 06 Aug 2015 13:02:38 -0400 Received: from smtp26.openmailbox.org ([62.4.1.60]:41791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNOYp-0003ke-VB for guix-devel@gnu.org; Thu, 06 Aug 2015 13:02:32 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.openmailbox.org (Postfix) with ESMTP id 246C02E030D for ; Thu, 6 Aug 2015 19:02:31 +0200 (CEST) In-Reply-To: <1438880373-19212-1-git-send-email-mthl@openmailbox.org> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.1.4 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * gnu/packages/ratpoison.scm (ratpoison): Update to 1.4.8. * gnu/packages/patches/ratpoison-shell.patch: Adapt to it. --- gnu/packages/patches/ratpoison-shell.patch | 38 ++++++++++++------------= ------ gnu/packages/ratpoison.scm | 5 ++-- 2 files changed, 18 insertions(+), 25 deletions(-) --------------2.1.4 Content-Type: text/x-patch; name="0001-gnu-ratpoison-Update-to-1.4.8.patch" Content-Disposition: inline; filename="0001-gnu-ratpoison-Update-to-1.4.8.patch" Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/patches/ratpoison-shell.patch b/gnu/packages/pa= tches/ratpoison-shell.patch index 63d265a..e4c200b 100644 --- a/gnu/packages/patches/ratpoison-shell.patch +++ b/gnu/packages/patches/ratpoison-shell.patch @@ -2,17 +2,9 @@ Use $SHELL instead of hardcoding /bin/sh in ratpoison. =20 Patch by Mark H Weaver . =20 ---- ratpoison/src/actions.c.orig 2013-04-06 21:37:43.000000000 -0400 -+++ ratpoison/src/actions.c 2014-02-13 00:34:10.992553710 -0500 -@@ -19,6 +19,7 @@ - */ - =0C - #include -+#include - #include /* for isspace */ - #include - #include -@@ -223,12 +223,12 @@ +--- ratpoison/src/actions.c.orig 2014-09-14 16:46:08.000000000 +0200 ++++ ratpoison/src/actions.c 2015-08-06 15:00:54.951575260 +0200 +@@ -228,12 +228,12 @@ add_command ("escape", cmd_escape, 1, 1, 1, "Key: ", arg_KEY); add_command ("exec", cmd_exec, 1, 1, 1, @@ -28,7 +20,7 @@ Patch by Mark H Weaver . add_command ("fdump", cmd_fdump, 1, 0, 0, "", arg_NUMBER); add_command ("focus", cmd_next_frame, 0, 0, 0); -@@ -359,7 +359,7 @@ +@@ -367,7 +367,7 @@ add_command ("unsetenv", cmd_unsetenv, 1, 1, 1, "Variable: ", arg_STRING); add_command ("verbexec", cmd_verbexec, 1, 1, 1, @@ -37,7 +29,7 @@ Patch by Mark H Weaver . add_command ("version", cmd_version, 0, 0, 0); add_command ("vsplit", cmd_v_split, 1, 0, 0, "Split: ", arg_STRING); -@@ -2627,6 +2627,9 @@ +@@ -2671,6 +2671,9 @@ pid =3D fork(); if (pid =3D=3D 0) { @@ -47,11 +39,11 @@ Patch by Mark H Weaver . /* Some process setup to make sure the spawned process runs in its own session. */ putenv(current_screen()->display_string); -@@ -2641,7 +2644,18 @@ +@@ -2700,7 +2703,18 @@ /* raw means don't run it through sh. */ if (raw) - execl (cmd, cmd, NULL); -- execl("/bin/sh", "sh", "-c", cmd, NULL); + execl (cmd, cmd, (char *)NULL); +- execl("/bin/sh", "sh", "-c", cmd, (char *)NULL); + + shell_path =3D getenv ("SHELL"); + if (shell_path =3D=3D NULL) @@ -63,13 +55,13 @@ Patch by Mark H Weaver . + else + shell_name++; + -+ execl(shell_path, shell_name, "-c", cmd, NULL); ++ execl(shell_path, shell_name, "-c", cmd, (char *)NULL); _exit(EXIT_FAILURE); } =20 ---- ratpoison/src/events.c.orig 2013-04-06 20:05:48.000000000 -0400 -+++ ratpoison/src/events.c 2014-02-13 00:34:39.327758789 -0500 -@@ -920,7 +920,7 @@ +--- ratpoison/src/events.c.orig 2014-09-14 16:46:23.000000000 +0200 ++++ ratpoison/src/events.c 2015-08-06 15:02:17.287578780 +0200 +@@ -919,7 +919,7 @@ { /* Report any child that didn't return 0. */ if (cur->status !=3D 0) @@ -78,9 +70,9 @@ Patch by Mark H Weaver . cur->cmd, cur->status); list_del (&cur->node); free (cur->cmd); ---- ratpoison/src/messages.h.orig 2012-07-20 20:25:33.000000000 -0400 -+++ ratpoison/src/messages.h 2014-02-13 00:34:28.608398437 -0500 -@@ -41,7 +41,7 @@ +--- ratpoison/src/messages.h.orig 2014-04-09 01:22:08.000000000 +0200 ++++ ratpoison/src/messages.h 2015-08-06 15:04:14.759583801 +0200 +@@ -39,7 +39,7 @@ =20 #define MESSAGE_PROMPT_SWITCH_TO_WINDOW "Switch to window: " #define MESSAGE_PROMPT_NEW_WINDOW_NAME "Set window's title to: " diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 3a93188..a73e6cf 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013, 2014 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2015 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,14 +43,14 @@ (define-public ratpoison (package (name "ratpoison") - (version "1.4.6") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/ratpoison/ratpoison-= " version ".tar.xz")) (sha256 (base32 - "0v4mh8d3vsh5xbbycfdl3g8zfygi1rkslh1x7k5hi1d05bfq3cdr")) + "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains")) (patches (list (search-patch "ratpoison-shell.patch"))))) (build-system gnu-build-system) (arguments --------------2.1.4--