wok-current rev 25497
Up w3m (0.5.3+git20220429)
| author | Richard Dunbar <mojo@slitaz.org> |
|---|---|
| date | Fri Dec 09 14:24:30 2022 -0500 (2022-12-09) |
| parents | dd880df75ff5 |
| children | 48dff2952881 |
| files | w3m/receipt w3m/stuff/file_handle.patch w3m/stuff/https.patch w3m/stuff/w3m-0.5.2-gc72.patch |
line diff
1.1 --- a/w3m/receipt Fri Dec 02 10:26:08 2022 +0000 1.2 +++ b/w3m/receipt Fri Dec 09 14:24:30 2022 -0500 1.3 @@ -7,12 +7,12 @@ 1.4 MAINTAINER="mojo@slitaz.org" 1.5 LICENSE="MIT" 1.6 WEB_SITE="https://w3m.sourceforge.net/index.en.html" 1.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 1.8 -WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$TARBALL" 1.9 +TARBALL="w3m_0.5.3+git20220429.orig.tar.xz" 1.10 +WGET_URL="https://deb.debian.org/debian/pool/main/w/$PACKAGE/$TARBALL" 1.11 TAGS="web-browser" 1.12 1.13 DEPENDS="gc libcrypto libssl ncurses imlib2" 1.14 -BUILD_DEPENDS="gc gc-dev libcrypto-dev openssl-dev imlib2-dev" 1.15 +BUILD_DEPENDS="gc gc-dev libcrypto-dev openssl-dev imlib2-dev gcc83" 1.16 1.17 current_version() 1.18 { 1.19 @@ -23,17 +23,13 @@ 1.20 # Rules to configure and make the package. 1.21 compile_rules() 1.22 { 1.23 - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" 1.24 - for i in $stuff/*.patch 1.25 - do 1.26 - if [ -f done.$(basename $i) ]; then 1.27 - continue 1.28 - else 1.29 - patch -p0 < $i && touch done.$(basename $i) || return 1 1.30 - fi 1.31 - done 1.32 - ./configure --enable-image=x11,fb --with-imagelib=imlib2 $CONFIGURE_ARGS 1.33 - make && make install 1.34 + ./configure \ 1.35 + CC=gcc-83 \ 1.36 + CXX=g++-83 \ 1.37 + --enable-image=x11,fb \ 1.38 + --with-imagelib=imlib2 \ 1.39 + $CONFIGURE_ARGS && 1.40 + make && make install 1.41 } 1.42 1.43 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- a/w3m/stuff/file_handle.patch Fri Dec 02 10:26:08 2022 +0000 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,60 +0,0 @@ 2.4 -diff -Naur old/istream.c new/istream.c 2.5 ---- istream.c 2011-01-04 20:22:22.000000000 +1100 2.6 -+++ istream.c 2012-07-04 21:50:51.529661517 +1000 2.7 -@@ -22,8 +22,8 @@ 2.8 - static void basic_close(int *handle); 2.9 - static int basic_read(int *handle, char *buf, int len); 2.10 - 2.11 --static void file_close(struct file_handle *handle); 2.12 --static int file_read(struct file_handle *handle, char *buf, int len); 2.13 -+static void file_close(struct file_handle_rofl *handle); 2.14 -+static int file_read(struct file_handle_rofl *handle, char *buf, int len); 2.15 - 2.16 - static int str_read(Str handle, char *buf, int len); 2.17 - 2.18 -@@ -114,7 +114,7 @@ 2.19 - stream = New(union input_stream); 2.20 - init_base_stream(&stream->base, STREAM_BUF_SIZE); 2.21 - stream->file.type = IST_FILE; 2.22 -- stream->file.handle = New(struct file_handle); 2.23 -+ stream->file.handle = New(struct file_handle_rofl); 2.24 - stream->file.handle->f = f; 2.25 - if (closep) 2.26 - stream->file.handle->close = closep; 2.27 -@@ -658,13 +658,13 @@ 2.28 - } 2.29 - 2.30 - static void 2.31 --file_close(struct file_handle *handle) 2.32 -+file_close(struct file_handle_rofl *handle) 2.33 - { 2.34 - handle->close(handle->f); 2.35 - } 2.36 - 2.37 - static int 2.38 --file_read(struct file_handle *handle, char *buf, int len) 2.39 -+file_read(struct file_handle_rofl *handle, char *buf, int len) 2.40 - { 2.41 - return fread(buf, 1, len, handle->f); 2.42 - } 2.43 -diff -Naur old/istream.h new/istream.h 2.44 ---- istream.h 2003-10-21 02:41:56.000000000 +1000 2.45 -+++ istream.h 2012-07-04 21:50:51.529661517 +1000 2.46 -@@ -20,7 +20,7 @@ 2.47 - 2.48 - typedef struct stream_buffer *StreamBuffer; 2.49 - 2.50 --struct file_handle { 2.51 -+struct file_handle_rofl { 2.52 - FILE *f; 2.53 - void (*close) (); 2.54 - }; 2.55 -@@ -53,7 +53,7 @@ 2.56 - 2.57 - struct file_stream { 2.58 - struct stream_buffer stream; 2.59 -- struct file_handle *handle; 2.60 -+ struct file_handle_rofl *handle; 2.61 - char type; 2.62 - char iseos; 2.63 - int (*read) ();
3.1 --- a/w3m/stuff/https.patch Fri Dec 02 10:26:08 2022 +0000 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,19 +0,0 @@ 3.4 -Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 3.5 - 3.6 ---- url.c 2011-01-04 14:52:24.000000000 +0530 3.7 -+++ url.c 2011-09-02 18:25:43.305652690 +0530 3.8 -@@ -82,11 +82,11 @@ 3.9 - {"ftp", SCM_FTP}, 3.10 - {"local", SCM_LOCAL}, 3.11 - {"file", SCM_LOCAL}, 3.12 -- /* {"exec", SCM_EXEC}, */ 3.13 -+ {"exec", SCM_EXEC}, 3.14 - {"nntp", SCM_NNTP}, 3.15 -- /* {"nntp", SCM_NNTP_GROUP}, */ 3.16 -+ {"nntp", SCM_NNTP_GROUP}, 3.17 - {"news", SCM_NEWS}, 3.18 -- /* {"news", SCM_NEWS_GROUP}, */ 3.19 -+ {"news", SCM_NEWS_GROUP}, 3.20 - {"data", SCM_DATA}, 3.21 - #ifndef USE_W3MMAILER 3.22 - {"mailto", SCM_MAILTO},
4.1 --- a/w3m/stuff/w3m-0.5.2-gc72.patch Fri Dec 02 10:26:08 2022 +0000 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,27 +0,0 @@ 4.4 -diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c 4.5 ---- main.c 2007-05-31 10:19:50.000000000 +0900 4.6 -+++ main.c 2009-11-09 08:20:02.184953443 +0900 4.7 -@@ -312,7 +312,11 @@ 4.8 - lock = 0; 4.9 - } 4.10 - } 4.11 -+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2 4.12 -+ else if (orig_GC_warn_proc = GC_get_warn_proc()) 4.13 -+#else 4.14 - else if (orig_GC_warn_proc) 4.15 -+#endif 4.16 - orig_GC_warn_proc(msg, arg); 4.17 - else 4.18 - fprintf(stderr, msg, (unsigned long)arg); 4.19 -@@ -842,7 +846,11 @@ 4.20 - mySignal(SIGPIPE, SigPipe); 4.21 - #endif 4.22 - 4.23 -+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2 4.24 -+ GC_set_warn_proc(wrap_GC_warn_proc); 4.25 -+#else 4.26 - orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); 4.27 -+#endif 4.28 - err_msg = Strnew(); 4.29 - if (load_argc == 0) { 4.30 - /* no URL specified */