[arch-commits] Commit in w3m/trunk (5 files)
Gaetan Bisson
bisson at archlinux.org
Wed Jul 4 11:56:22 UTC 2012
Date: Wednesday, July 4, 2012 @ 07:56:21
Author: bisson
Revision: 162965
fix FS#30533
Added:
w3m/trunk/file_handle.patch
w3m/trunk/gc72.patch
w3m/trunk/https.patch
(from rev 162964, w3m/trunk/https-segfault.patch)
Modified:
w3m/trunk/PKGBUILD
Deleted:
w3m/trunk/https-segfault.patch
----------------------+
PKGBUILD | 13 +++++++---
file_handle.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
gc72.patch | 13 ++++++++++
https-segfault.patch | 19 ---------------
https.patch | 19 +++++++++++++++
5 files changed, 101 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-04 04:22:17 UTC (rev 162964)
+++ PKGBUILD 2012-07-04 11:56:21 UTC (rev 162965)
@@ -13,15 +13,20 @@
optdepends=('imlib2: for graphics support')
depends=('openssl' 'gc' 'ncurses')
source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz"
- 'https-segfault.patch')
+ 'file_handle.patch'
+ 'https.patch'
+ 'gc72.patch')
sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237'
- '66affb2f695fe0bdde25cf774642bfd6a9404e88')
+ '457de43be7eabc652614461a7ab25e3ba76b2aff'
+ '66affb2f695fe0bdde25cf774642bfd6a9404e88'
+ '7baa06ca684fd140503a2adc65e2d606970c4662')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's/file_handle/file_handle_rofl/g' -i istream.*
- patch -p1 -i ../https-segfault.patch
+ patch -p1 -i ../file_handle.patch
+ patch -p1 -i ../https.patch
+ patch -p1 -i ../gc72.patch
./configure \
--prefix=/usr \
Added: file_handle.patch
===================================================================
--- file_handle.patch (rev 0)
+++ file_handle.patch 2012-07-04 11:56:21 UTC (rev 162965)
@@ -0,0 +1,60 @@
+diff -Naur old/istream.c new/istream.c
+--- old/istream.c 2011-01-04 20:22:22.000000000 +1100
++++ new/istream.c 2012-07-04 21:50:51.529661517 +1000
+@@ -22,8 +22,8 @@
+ static void basic_close(int *handle);
+ static int basic_read(int *handle, char *buf, int len);
+
+-static void file_close(struct file_handle *handle);
+-static int file_read(struct file_handle *handle, char *buf, int len);
++static void file_close(struct file_handle_rofl *handle);
++static int file_read(struct file_handle_rofl *handle, char *buf, int len);
+
+ static int str_read(Str handle, char *buf, int len);
+
+@@ -114,7 +114,7 @@
+ stream = New(union input_stream);
+ init_base_stream(&stream->base, STREAM_BUF_SIZE);
+ stream->file.type = IST_FILE;
+- stream->file.handle = New(struct file_handle);
++ stream->file.handle = New(struct file_handle_rofl);
+ stream->file.handle->f = f;
+ if (closep)
+ stream->file.handle->close = closep;
+@@ -658,13 +658,13 @@
+ }
+
+ static void
+-file_close(struct file_handle *handle)
++file_close(struct file_handle_rofl *handle)
+ {
+ handle->close(handle->f);
+ }
+
+ static int
+-file_read(struct file_handle *handle, char *buf, int len)
++file_read(struct file_handle_rofl *handle, char *buf, int len)
+ {
+ return fread(buf, 1, len, handle->f);
+ }
+diff -Naur old/istream.h new/istream.h
+--- old/istream.h 2003-10-21 02:41:56.000000000 +1000
++++ new/istream.h 2012-07-04 21:50:51.529661517 +1000
+@@ -20,7 +20,7 @@
+
+ typedef struct stream_buffer *StreamBuffer;
+
+-struct file_handle {
++struct file_handle_rofl {
+ FILE *f;
+ void (*close) ();
+ };
+@@ -53,7 +53,7 @@
+
+ struct file_stream {
+ struct stream_buffer stream;
+- struct file_handle *handle;
++ struct file_handle_rofl *handle;
+ char type;
+ char iseos;
+ int (*read) ();
Added: gc72.patch
===================================================================
--- gc72.patch (rev 0)
+++ gc72.patch 2012-07-04 11:56:21 UTC (rev 162965)
@@ -0,0 +1,13 @@
+diff -Naur old/main.c new/main.c
+--- old/main.c 2011-01-04 20:42:19.000000000 +1100
++++ new/main.c 2012-07-04 21:49:10.136212236 +1000
+@@ -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 */
Deleted: https-segfault.patch
===================================================================
--- https-segfault.patch 2012-07-04 04:22:17 UTC (rev 162964)
+++ https-segfault.patch 2012-07-04 11:56:21 UTC (rev 162965)
@@ -1,19 +0,0 @@
-Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
-
---- old/url.c 2011-01-04 14:52:24.000000000 +0530
-+++ new/url.c 2011-09-02 18:25:43.305652690 +0530
-@@ -82,11 +82,11 @@
- {"ftp", SCM_FTP},
- {"local", SCM_LOCAL},
- {"file", SCM_LOCAL},
-- /* {"exec", SCM_EXEC}, */
-+ {"exec", SCM_EXEC},
- {"nntp", SCM_NNTP},
-- /* {"nntp", SCM_NNTP_GROUP}, */
-+ {"nntp", SCM_NNTP_GROUP},
- {"news", SCM_NEWS},
-- /* {"news", SCM_NEWS_GROUP}, */
-+ {"news", SCM_NEWS_GROUP},
- {"data", SCM_DATA},
- #ifndef USE_W3MMAILER
- {"mailto", SCM_MAILTO},
Copied: w3m/trunk/https.patch (from rev 162964, w3m/trunk/https-segfault.patch)
===================================================================
--- https.patch (rev 0)
+++ https.patch 2012-07-04 11:56:21 UTC (rev 162965)
@@ -0,0 +1,19 @@
+Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
+
+--- old/url.c 2011-01-04 14:52:24.000000000 +0530
++++ new/url.c 2011-09-02 18:25:43.305652690 +0530
+@@ -82,11 +82,11 @@
+ {"ftp", SCM_FTP},
+ {"local", SCM_LOCAL},
+ {"file", SCM_LOCAL},
+- /* {"exec", SCM_EXEC}, */
++ {"exec", SCM_EXEC},
+ {"nntp", SCM_NNTP},
+- /* {"nntp", SCM_NNTP_GROUP}, */
++ {"nntp", SCM_NNTP_GROUP},
+ {"news", SCM_NEWS},
+- /* {"news", SCM_NEWS_GROUP}, */
++ {"news", SCM_NEWS_GROUP},
+ {"data", SCM_DATA},
+ #ifndef USE_W3MMAILER
+ {"mailto", SCM_MAILTO},
More information about the arch-commits
mailing list