aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-01-06 10:43:18 -0500
committerLeo Famulari <leo@famulari.name>2016-01-07 02:35:38 -0500
commite6352001c444a82141ea4457e49e69a1c3f8b2bb (patch)
tree3793b354745f7c343318a5ef307f1d328534cf77 /gnu/packages/patches
parentd4aaf954011646413e7c2ca39a34030821e84910 (diff)
downloadguix-e6352001c444a82141ea4457e49e69a1c3f8b2bb.tar
guix-e6352001c444a82141ea4457e49e69a1c3f8b2bb.tar.gz
gnu: w3m: Update patch to use '-p1'.
* gnu/packages/patches/w3m-fix-compile.patch: Rename this file... * gnu/packages/patches/w3m-libgc.patch: ...to this, and adjust patch prefix level to '-p1'. * gnu-system.am (dist_patch_DATA): Update patch name. * gnu/packages/w3m.scm (w3m)[source]: Update patch name. [source]: Drop patch flag -p0.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/w3m-fix-compile.patch15
-rw-r--r--gnu/packages/patches/w3m-libgc.patch28
2 files changed, 28 insertions, 15 deletions
diff --git a/gnu/packages/patches/w3m-fix-compile.patch b/gnu/packages/patches/w3m-fix-compile.patch
deleted file mode 100644
index 5604052f67..0000000000
--- a/gnu/packages/patches/w3m-fix-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.archlinux.org/task/33397
-
-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 @@
- 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 */
diff --git a/gnu/packages/patches/w3m-libgc.patch b/gnu/packages/patches/w3m-libgc.patch
new file mode 100644
index 0000000000..0dc6a4027c
--- /dev/null
+++ b/gnu/packages/patches/w3m-libgc.patch
@@ -0,0 +1,28 @@
+This patch fixes w3m compilation with libgc > 7.2.
+
+Reported:
+https://bugs.archlinux.org/task/33397
+
+Patch with explanation:
+http://anonscm.debian.org/cgit/collab-maint/w3m.git/commit/?id=770eec8304bdbe458
+---
+ main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+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 */
+--
+2.6.4
+