From 51b38ed4d45359ccfdcbad6174e354dade4a5d75 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 20 Apr 2023 07:34:03 -0500 Subject: [PATCH] sxiv: deprecate in favor of nsxiv sxiv has fallen out of maintenance and has recently been archived. [1] We already have nsxiv, which should be a drop-in replacement. 1: https://github.com/xyb3rt/sxiv --- srcpkgs/nsxiv/template | 14 ++++++++ srcpkgs/sxiv | 1 + srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch | 35 -------------------- srcpkgs/sxiv/template | 25 -------------- 4 files changed, 15 insertions(+), 60 deletions(-) create mode 120000 srcpkgs/sxiv delete mode 100644 srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch delete mode 100644 srcpkgs/sxiv/template diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template index 6ad190411c7f..f196f0068dcf 100644 --- a/srcpkgs/nsxiv/template +++ b/srcpkgs/nsxiv/template @@ -18,3 +18,17 @@ CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" pre_build() { [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||: } + +post_install() { + ln -sf nsxiv "${DESTDIR}/usr/bin/sxiv" + ln -sf nsxiv.1 "${DESTDIR}/usr/share/man/man1/sxiv.1" +} + +sxiv_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - (transitional package)" + pkg_install() { + vmove usr/bin/sxiv + vmove usr/share/man/man1/sxiv.1 + } +} diff --git a/srcpkgs/sxiv b/srcpkgs/sxiv new file mode 120000 index 000000000000..425296499b1a --- /dev/null +++ b/srcpkgs/sxiv @@ -0,0 +1 @@ +nsxiv \ No newline at end of file diff --git a/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch b/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch deleted file mode 100644 index 86fc8e1b302f..000000000000 --- a/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/Makefile 2014-10-24 12:25:18.000000000 +0200 -+++ b/Makefile 2014-10-26 01:19:33.040945097 +0200 -@@ -43,9 +43,9 @@ - sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 - @echo "INSTALL share/sxiv/" -- mkdir -p $(DESTDIR)$(PREFIX)/share/sxiv/exec -- cp exec/* $(DESTDIR)$(PREFIX)/share/sxiv/exec/ -- chmod 755 $(DESTDIR)$(PREFIX)/share/sxiv/exec/* -+ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/sxiv -+ cp exec/* $(DESTDIR)$(PREFIX)/share/examples/sxiv/ -+ chmod 755 $(DESTDIR)$(PREFIX)/share/examples/sxiv/* - - uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/sxiv ---- a/sxiv.1 2014-10-24 12:25:18.000000000 +0200 -+++ b/sxiv.1 2014-10-26 01:18:00.053107605 +0200 -@@ -351,7 +351,7 @@ - and the first argument to this script is the path of the loaded image. - .P - There is also an example script installed together with sxiv as --.IR PREFIX/share/sxiv/exec/image-info . -+.IR PREFIX/share/examples/sxiv/image-info . - .SH EXTERNAL KEY HANDLER - Additional external keyboard commands can be defined using a handler program - located in -@@ -368,7 +368,7 @@ - keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix. - - There is also an example script installed together with sxiv as --.IR PREFIX/share/sxiv/exec/key-handler . -+.IR PREFIX/share/examples/sxiv/key-handler . - .SH THUMBNAIL CACHING - sxiv stores all thumbnails under - .IR $XDG_CACHE_HOME/sxiv/ . diff --git a/srcpkgs/sxiv/template b/srcpkgs/sxiv/template deleted file mode 100644 index a9a7d612e4b7..000000000000 --- a/srcpkgs/sxiv/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'sxiv' -pkgname=sxiv -version=26 -revision=1 -build_style=gnu-makefile -makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel" -short_desc="Simple X Image Viewer" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="https://github.com/muennich/sxiv" -distfiles="https://github.com/muennich/sxiv/archive/v${version}.tar.gz" -checksum=a382ad57734243818e828ba161fc0357b48d8f3a7f8c29cac183492b46b58949 - -pre_build() { - [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||: -} - -post_install() { - vinstall sxiv.desktop 644 usr/share/applications -} - -if [ "$CROSS_BUILD" ]; then - # otherwise ft2build.h is not found - hostmakedepends+=" freetype-devel" -fi