From dd7b25ea2445f1c6e5bb9e673f086c43b3ae5e3d Mon Sep 17 00:00:00 2001 From: Dave Woodfall Date: Thu, 29 Nov 2018 11:03:39 +0000 Subject: [PATCH] network/w3m: Update to 0.5.3_34 --- network/w3m/README | 43 +++++++++++------ network/w3m/doinst.sh | 15 ++++++ network/w3m/w3m.SlackBuild | 98 +++++++++++++++++++++++++++++++------- network/w3m/w3m.info | 12 +++-- 4 files changed, 132 insertions(+), 36 deletions(-) create mode 100644 network/w3m/doinst.sh diff --git a/network/w3m/README b/network/w3m/README index 15ea4bb339..fc085609e8 100644 --- a/network/w3m/README +++ b/network/w3m/README @@ -1,26 +1,36 @@ w3m is a World Wide Web (WWW) text based client. -Help is avaliable in English, German and Japanese. There is an -option menu which can be configured for the chosen lanugage. +Help is avaliable in English, German and Japanese. There is +an option menu which can be configured for the chosen +lanugage. -It will display hypertext markup language (HTML) documents containing -links to files residing on the local system, as well as files -residing on remote systems. It can display HTML tables, frames, and -images, and supports tabbed browsing. In addition, it can be used as -a "pager" in much the same manner as "more" or "less". w3m can -display images in both the framebuffer, incertain consoles, and the X +It will display hypertext markup language (HTML) documents +containing links to files residing on the local system, as +well as files residing on remote systems. It can display +HTML tables, frames, and images, and supports tabbed +browsing. In addition, it can be used as a "pager" in much +the same manner as "more" or "less". w3m can display images +in both the framebuffer, in supported terminals, and the X server. -Supported consoles for image display are urxvt (rxvt-unicode) and -termite (via a patch), including inside screen (untested with tmux). +Supported consoles for image display are urxvt +(rxvt-unicode) and termite (via a patch), including inside +screen (untested with tmux). Optional dependency: compface +(Compface converts 48x48x1 images to and from a compressed +format. The purpose is to allow the inclusion of face +images within mail headers using the field name 'X-face:'.) + + + SlackBuild Options: -To disable mouse support pass NOMOUSE=1 to the slackbuild. -To disable w3mmailer pass NOMAILER=1 to the slackbuild. -To set the GUI browser pass the desired browser as GUIBROWSER. +NOMOUSE=1 to disable mouse support +NOMAILER=1 disable w3mmailer +GUIBROWSER=/path/to/browser set the GUI browser +EDITOR=/path/to/editor set external editor EG: @@ -28,5 +38,8 @@ NOMOUSE=1 ./w3m.SlackBuild NOMAILER=1 ./w3m.SlackBuild GUIBROWSER=/usr/bin/qutebrowser ./w3m.SlackBuild -Or combine any of them together. By default the GUI browser is set to -/usr/bin/firefox. +Or combine any of them together. By default GUIBROWSER +is set to /usr/bin/firefox. EDITOR will be picked up from +the environment if set. + +These are also settable via the options menu. diff --git a/network/w3m/doinst.sh b/network/w3m/doinst.sh new file mode 100644 index 0000000000..17f9dccd7e --- /dev/null +++ b/network/w3m/doinst.sh @@ -0,0 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/w3m/config.new +config etc/w3m/mailcap.new diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild index c6175eed32..97bc53612b 100644 --- a/network/w3m/w3m.SlackBuild +++ b/network/w3m/w3m.SlackBuild @@ -19,10 +19,14 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Now maintained by David Woodfall +# Now maintained by Dave Woodfall (2018) +# Much appreciation to the debian maintainers for keeping w3m alive and +# patched https://packages.debian.org/stretch/w3m PRGNAM=w3m -VERSION=${VERSION:-git20170104} +VERSION=${VERSION:-0.5.3_34} +SRCVERSION=${SRCVERSION:-0.5.3} +PATCHVERS=${PATCHVERS:-34+deb9u1.debian} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,16 +57,23 @@ else LIBDIRSUFFIX="" fi -DOCS="ChangeLog NEWS doc* ABOUT-NLS README TODO" - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRCVERSION +# source +tar xvf $CWD/${PRGNAM}_${SRCVERSION}.orig.tar.gz +cd $PRGNAM-$SRCVERSION +# patches +tar xvf $CWD/${PRGNAM}_$SRCVERSION-$PATCHVERS.tar.xz + +# patches from debian +while read patch; do + patch -p1 --verbose < debian/patches/$patch +done < debian/patches/series + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -73,25 +84,32 @@ find -L . \ [ -n "$NOMOUSE" ] && mouse="--disable-mouse" [ -n "$NOMAILER" ] && mailer="--disable-w3mmailer" [ -n "$GUIBROWSER" ] && browser="--with-browser=$GUIBROWSER" +[ -n "$EDITOR" ] && editor="--with-editor=$EDITOR" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ + --libexecdir=/usr/libexec \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-image=x11,fb \ + --with-gc \ + --with-ssl \ + --enable-image=x11,fb+s \ --enable-keymap=w3m \ --enable-gopher \ + --enable-unicode \ + --enable-nls \ + --enable-m17n \ --with-imagelib="gtk2 gdk-pixbuf imlib2" \ --with-termlib="terminfo ncurses" \ - $mouse \ - $mailer \ - $browser \ + $mouse \ + $mailer \ + $browser \ + $editor \ --build=$ARCH-slackware-linux make @@ -100,15 +118,63 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus +find Bonus -type f | while read f; do + install -m 644 $f $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus +done -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/etc/w3m +install -m 644 debian/w3mconfig $PKG/etc/w3m/config.new +install -m 644 debian/mailcap $PKG/etc/w3m/mailcap.new + +DOCS="ChangeLog NEWS doc* ABOUT-NLS README TODO" +DEBDOCS="changelog copyright mailcap w3mconfig" + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/debian cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +for doc in $DEBDOCS; do + cp -a debian/$doc $PKG/usr/doc/$PRGNAM-$VERSION/debian +done + +mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README \ + $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README.ja + +for f in \ + $PKG/usr/doc/$PRGNAM-$VERSION/examples/Bonus/README.ja \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/FAQ.html \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/HISTORY \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/MANUAL.html \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.SSL \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.cookie \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.dict \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.func \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.keymap \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.m17n \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.mailcap \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.menu \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.migemo \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.mouse \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/README.siteconf \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/STORY.html \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/menu.default \ + $PKG/usr/doc/$PRGNAM-$VERSION/doc-jp/menu.submenu \ + $PKG/usr/man/ja/man1/w3m.1; do \ + iconv -f euc-jp -t utf-8 "$f" > "$f".tmp \ + && mv -f "$f".tmp "$f" || rm -f "$f".tmp; \ + done + +find $PKG -name CVS -type d -exec rm -rf '{}' \+ + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz \ + rm $i ; done + +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/w3m/w3m.info b/network/w3m/w3m.info index 7623fe8dcb..814501337c 100644 --- a/network/w3m/w3m.info +++ b/network/w3m/w3m.info @@ -1,10 +1,12 @@ PRGNAM="w3m" -VERSION="git20170104" +VERSION="0.5.3_34" HOMEPAGE="http://w3m.sourceforge.net/" -DOWNLOAD="http://unrealize.co.uk/source/w3m-git20170104.tar.gz" -MD5SUM="c97079ea18a90919227a74cc465f9c9b" +DOWNLOAD="http://deb.debian.org/debian/pool/main/w/w3m/w3m_0.5.3.orig.tar.gz \ + http://deb.debian.org/debian/pool/main/w/w3m/w3m_0.5.3-34+deb9u1.debian.tar.xz" +MD5SUM="1b845a983a50b8dec0169ac48479eacc \ + 90be8b8cab3423677eb7e5a629d8539a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="imlib2" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +MAINTAINER="Dave Woodfall" +EMAIL="dave@tty1.uk"