Skip to content
Snippets Groups Projects
Commit cc2e19a1 authored by Celeste's avatar Celeste
Browse files

community/w3m: upgrade to 0.5.3_git20241203

switch to actively maintained fork: https://github.com/tats/w3m/issues/304

version scheme changed, please upgrade with --available
parent c3e90006
No related branches found
No related tags found
1 merge request!79570community/firefox-esr: upgrade to 128.7.0
......@@ -2,28 +2,27 @@
# Maintainer: Celeste <cielesti@protonmail.com>
maintainer="Celeste <cielesti@protonmail.com>"
pkgname=w3m
_pkgver=0.5.3+git20230718
pkgver=${_pkgver/+git/.}
_gitrev=ee66aabc3987000c2851bce6ade4dcbb0b037d81
pkgrel=2
pkgver=0.5.3_git20241203
_gitrev=ea4bc283b5b43a2a4cf5aa06badc6a9f755098ec
pkgrel=0
pkgdesc="text-based web & gopher browser, as well as pager"
url="https://github.com/tats/w3m"
license="MIT"
url="https://sr.ht/~rkta/w3m/"
arch="all"
license="MIT"
makedepends="
gc-dev
imlib2-dev
linux-headers
ncurses-dev
openssl-dev>3
openssl-dev
"
subpackages="
$pkgname-doc
$pkgname-perl::noarch
$pkgname-image
"
source="$pkgname-$pkgver.tar.gz::https://github.com/tats/w3m/archive/$_gitrev.tar.gz
cant-open-history.patch
source="$pkgname-$_gitrev.tar.gz::https://git.sr.ht/~rkta/w3m/archive/$_gitrev.tar.gz
conflicting-types.patch
"
builddir="$srcdir/$pkgname-$_gitrev"
......@@ -56,8 +55,7 @@ build() {
}
check() {
cd tests
sh run_tests
./w3m -version
}
package() {
......@@ -85,27 +83,28 @@ package() {
# external program (default: /usr/bin/mail) to handle mailto: links
rm "$pkgdir"/usr/lib/w3m/cgi-bin/w3mmail.cgi
install -Dm644 doc/* -t "$pkgdir"/usr/share/doc/$pkgname
install -d "$pkgdir"/usr/share/licenses/$pkgname
ln -s /usr/share/doc/$pkgname/README \
"$pkgdir"/usr/share/licenses/$pkgname
install -Dvm644 doc/* -t "$pkgdir"/usr/share/doc/$pkgname/
install -Dvm644 COPYING -t "$pkgdir"/usr/share/licenses/$pkgname/
}
perl() {
pkgdesc="$pkgdesc (perl helper scripts)"
depends="perl cmd:man" # w3mman needs cmd:man
amove usr/bin/w3mman
amove usr/lib/w3m/cgi-bin/*.cgi
amove usr/share/w3m/*.pl
amove \
usr/bin/w3mman \
usr/lib/w3m/cgi-bin/*.cgi \
usr/share/w3m/*.pl
}
image() {
pkgdesc="$pkgdesc (inline image support)"
install_if="$pkgname=$pkgver-r$pkgrel imlib2"
amove usr/lib/w3m/w3mimgdisplay
}
sha512sums="
cb023fe0b7ac4f009b7ecdee0134d4bf727b9f58e61b23b832979c27d90dbf7104bafd13d2aea5ecd1190262b103bcc30a1945a7845beb6aeee48751666778d3 w3m-0.5.3.20230718.tar.gz
fdd715d8502476a96d022870d7908ae58ddea48cb1b9666447bfcbc9dc45b7fe5abcf8bce15f76b80c6d97ee10874c4cb1b5b3360e216494ed3a64a0e5aac1ae cant-open-history.patch
a421d613996d5285b07f0a9af94e5d6c09a8453df7f6c91a2088c0ee5a9b8c58b77ee684d2bca6bc3ee2417c8b2c0b75fba35ade2158566d587eef1f09384872 w3m-ea4bc283b5b43a2a4cf5aa06badc6a9f755098ec.tar.gz
34b36199409535a794f8b1d181acea59446df9a657d88fe497bc8e13348a6707b01db3db867078108373efe2476fb746204fd312c005aa15bc038863cc5032c5 conflicting-types.patch
"
Patch-Source: https://github.com/tats/w3m/pull/276.patch
--
From 855e956d0c64125336dbff1651734411555b29f7 Mon Sep 17 00:00:00 2001
From: fcd <git@fcd.dev>
Date: Sun, 30 Jul 2023 15:54:07 +0300
Subject: [PATCH] create history file if it doesn't exist
When history is enabled but there is no history file, w3m logs an error
message. Change that behavior to create a history file if it doesn't
exists.
---
history.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/history.c b/history.c
index 0c427ff32..d0ec5e238 100644
--- a/history.c
+++ b/history.c
@@ -90,9 +90,7 @@ saveHistory(Hist *hist, size_t size)
return;
histf = rcFile(HISTORY_FILE);
- if (stat(histf, &st) == -1)
- goto fail;
- if (hist->mtime != (long long)st.st_mtime) {
+ if (!stat(histf, &st) && hist->mtime != (long long)st.st_mtime) {
fhist = newHist();
if (loadHistory(fhist) || mergeHistory(fhist, hist))
disp_err_message("Can't merge history", FALSE);
--- a/proto.h
+++ b/proto.h
@@ -613,7 +613,7 @@
extern char *etcFile(const char *base);
extern char *confFile(const char *base);
extern char *auxbinFile(const char *base);
-extern char *helpFile(char *base);
+extern char *helpFile(const char *base);
extern void *querySiteconf(ParsedURL *query_pu, int field);
extern Str localCookie(void);
extern Str loadLocalDir(char *dirname);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment