From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [v3 1/2] gnu: w3m: Update patch to use '-p1'.
Date: Tue, 5 Jan 2016 21:04:59 -0500 [thread overview]
Message-ID: <9d18197ecca4fe8509e9fa7588f93b9f41ad56e1.1452045889.git.leo@famulari.name> (raw)
* 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 <leo@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 <nikita@karetnikov.org>
+;;; Copyright © 2016 Leo Famulari <leo@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
next reply other threads:[~2016-01-06 2:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 2:04 Leo Famulari [this message]
2016-01-06 2:05 ` [v3 2/2] gnu: w3m: Enable SSL, disable broken protocols and ciphers Leo Famulari
2016-01-06 10:52 ` Ludovic Courtès
2016-01-07 7:37 ` Leo Famulari
2016-01-06 10:33 ` [v3 1/2] gnu: w3m: Update patch to use '-p1' Ludovic Courtès
2016-01-07 7:30 ` Leo Famulari
2016-01-10 20:36 ` Ludovic Courtès
2016-01-06 10:33 ` Ludovic Courtès
2016-01-07 7:30 ` Leo Famulari
2016-01-10 20:34 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9d18197ecca4fe8509e9fa7588f93b9f41ad56e1.1452045889.git.leo@famulari.name \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.