* 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 <l...@famulari.name> +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 <nik...@karetnikov.org> +;;; Copyright © 2016 Leo Famulari <l...@famulari.name> ;;; ;;; 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
