From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [v3 1/2] gnu: w3m: Update patch to use '-p1'. Date: Tue, 5 Jan 2016 21:04:59 -0500 Message-ID: <9d18197ecca4fe8509e9fa7588f93b9f41ad56e1.1452045889.git.leo@famulari.name> 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]:56326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGdTF-0005oX-5H for guix-devel@gnu.org; Tue, 05 Jan 2016 21:05:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGdTB-0000oB-1G for guix-devel@gnu.org; Tue, 05 Jan 2016 21:05:05 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:47111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGdTA-0000o7-Ti for guix-devel@gnu.org; Tue, 05 Jan 2016 21:05:00 -0500 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 1B934C013FE for ; Tue, 5 Jan 2016 21:05:00 -0500 (EST) 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 * gnu/packages/patches/w3m-fix-compile.patch: Update to work with -p1. * gnu/packages/w3m.scm (w3m): Drop patch flag -p0. --- gnu/packages/patches/w3m-fix-compile.patch | 24 ++++++++++++++++++------ gnu/packages/w3m.scm | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/patches/w3m-fix-compile.patch b/gnu/packages/patches/w3m-fix-compile.patch index 5604052..33e7486 100644 --- a/gnu/packages/patches/w3m-fix-compile.patch +++ b/gnu/packages/patches/w3m-fix-compile.patch @@ -1,15 +1,27 @@ +From 371f256f5f300b01be228a6fd95884ea475965fc Mon Sep 17 00:00:00 2001 +From: Leo Famulari +Date: Tue, 5 Jan 2016 16:57:29 -0500 +Subject: [PATCH 1/4] fix compile + https://bugs.archlinux.org/task/33397 +--- + main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -diff -aur old/main.c new/main.c ---- main.c 2013-01-14 18:16:14.216210053 -0600 -+++ main.c 2013-01-14 18:17:28.816220559 -0600 -@@ -833,7 +833,8 @@ +diff --git a/main.c b/main.c +index b421943..249eb1a 100644 +--- a/main.c ++++ b/main.c +@@ -833,7 +833,8 @@ main(int argc, char **argv, char **envp) mySignal(SIGPIPE, SigPipe); #endif - + - orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); + orig_GC_warn_proc = GC_get_warn_proc(); + GC_set_warn_proc(wrap_GC_warn_proc); err_msg = Strnew(); if (load_argc == 0) { - /* no URL specified */ + /* no URL specified */ +-- +2.6.4 + diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index d114d0a..627447b 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,7 +45,6 @@ ;; cf. https://bugs.archlinux.org/task/33397 (patches (list (search-patch "w3m-fix-compile.patch"))) - (patch-flags '("-p0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target #:phases (alist-cons-before -- 2.6.4