aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-03 10:21:54 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2012-05-03 10:21:54 +0000
commit838764eb75b52f799555192fba7ec7902efa8340 (patch)
tree55d0ced25273d7f95b526ec99d056ab234d70143 /debian/patches
parentFix that struct file_handle conflicts with glibc 2.14 (diff)
downloadw3m-838764eb75b52f799555192fba7ec7902efa8340.tar.gz
w3m-838764eb75b52f799555192fba7ec7902efa8340.zip
Support Boehm GC 7.2
debian/patches/080_gc72.patch: Patch from Gentoo to support Boehm GC 7.2.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/080_gc72.patch30
-rw-r--r--debian/patches/series1
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/080_gc72.patch b/debian/patches/080_gc72.patch
new file mode 100644
index 0000000..938a5da
--- /dev/null
+++ b/debian/patches/080_gc72.patch
@@ -0,0 +1,30 @@
+Description: Patch from Gentoo to support Boehm GC 7.2
+Origin: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.2-gc72.patch?revision=1.1&view=markup
+
+diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
+--- w3m-0.5.2.orig/main.c 2007-05-31 10:19:50.000000000 +0900
++++ w3m-0.5.2/main.c 2009-11-09 08:20:02.184953443 +0900
+@@ -312,7 +312,11 @@
+ lock = 0;
+ }
+ }
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++ else if (orig_GC_warn_proc = GC_get_warn_proc())
++#else
+ else if (orig_GC_warn_proc)
++#endif
+ orig_GC_warn_proc(msg, arg);
+ else
+ fprintf(stderr, msg, (unsigned long)arg);
+@@ -842,7 +846,11 @@
+ mySignal(SIGPIPE, SigPipe);
+ #endif
+
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++ GC_set_warn_proc(wrap_GC_warn_proc);
++#else
+ orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++#endif
+ err_msg = Strnew();
+ if (load_argc == 0) {
+ /* no URL specified */
diff --git a/debian/patches/series b/debian/patches/series
index b247235..b4e1627 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
050_entity-h-clean.patch
060_format-security.patch
070_glibc2.14.patch
+080_gc72.patch