Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ca5210f588cd9ec8bc8311c58abe20dc1c089d74)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ca5210f588cd9ec8bc8311c58abe20dc1c089d74)
  • Date: Fri, 24 Feb 2023 18:04:44 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

http/w3m/DETAILS | 11 +++++------
http/w3m/HISTORY | 5 +++++
http/w3m/PRE_BUILD | 20 ++++++--------------
http/w3m/fb_imlib2.c.patch | 10 ----------
http/w3m/gc72.patch | 13 -------------
5 files changed, 16 insertions(+), 43 deletions(-)

New commits:
commit ca5210f588cd9ec8bc8311c58abe20dc1c089d74
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

w3m 0.5.3+git20230121

Since upstream is unmaintained and there's a lot of fixes by Debian,
switch to Debian's fork.

diff --git a/http/w3m/DETAILS b/http/w3m/DETAILS
index e6d868e..51719a5 100755
--- a/http/w3m/DETAILS
+++ b/http/w3m/DETAILS
@@ -1,10 +1,9 @@
SPELL=w3m
- VERSION=0.5.3
- PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/w3m/$SOURCE
-
SOURCE_HASH=sha512:43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14
+ VERSION=0.5.3+git20230121
+ SOURCE=$SPELL-${VERSION/+/-}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.gz}
+
SOURCE_URL[0]=https://github.com/tats/w3m/archive/refs/tags/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c
LICENSE[0]=MIT
WEB_SITE=http://w3m.sourceforge.net/
ENTERED=20011217
diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index 7d64916..fcf09ed 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,8 @@
+2023-02-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PRE_BUILD: switched to debian's fork,
+ version 0.5.3+git20230121
+ * fb_imlib2.c.patch, gc72.patch: removed, no longer needed
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Fix build against musl

diff --git a/http/w3m/PRE_BUILD b/http/w3m/PRE_BUILD
index c4f02c5..5e4dc29 100755
--- a/http/w3m/PRE_BUILD
+++ b/http/w3m/PRE_BUILD
@@ -1,16 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit '/^#define USE_EGD$/s/[^ ]*/#undef/' config.h.in &&
-sedit "s:CFLAGS = \$(OPTS):CFLAGS =:g" Makefile.in &&
-sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/fb/Makefile.in &&
-sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/Makefile.in &&
-sedit "s:CFLAGS = \$(OPTS):CFLAGS =:g" libwc/Makefile.in &&
-sedit "s:CFLAGS=\$(OPTS):CFLAGS =:g" w3mimg/x11/Makefile.in &&
-
-sedit 's/file_handle/&_w3m/' istream.h &&
-sedit 's/file_handle/&_w3m/' istream.c &&
-
-sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub &&
-
-patch -p0 < "$SPELL_DIRECTORY/fb_imlib2.c.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gc72.patch"
+sed -i "/^CFLAGS *=/{s/ *\$(OPTS)//g}" \
+ Makefile.in \
+ libwc/Makefile.in \
+ w3mimg/Makefile.in \
+ w3mimg/fb/Makefile.in \
+ w3mimg/x11/Makefile.in
diff --git a/http/w3m/fb_imlib2.c.patch b/http/w3m/fb_imlib2.c.patch
deleted file mode 100644
index 6ee2464..0000000
--- a/http/w3m/fb_imlib2.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./w3mimg/fb/fb_imlib2.c 2004-08-04 13:32:28.000000000 -0400
-+++ ./w3mimg/fb/fb_imlib2.c 2009-05-21 19:34:17.000000000 -0400
-@@ -3,7 +3,6 @@
- fb_imlib2.c 0.3 Copyright (C) 2002, hito
- **************************************************************************/
-
--#include <X11/Xlib.h>
- #include <Imlib2.h>
- #include "fb.h"
- #include "fb_img.h"
diff --git a/http/w3m/gc72.patch b/http/w3m/gc72.patch
deleted file mode 100644
index 47bd4c8..0000000
--- a/http/w3m/gc72.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 */



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ca5210f588cd9ec8bc8311c58abe20dc1c089d74), Ismael Luceno, 02/24/2023

Archive powered by MHonArc 2.6.24.

Top of Page