Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / netpbm
Commits: 33f992f2 by Luke T. Shumaker at 2026-07-13T16:35:55-06:00 Install the HTML docs too To support this, build the man-pages "out of tree" from the docs source directory. - - - - - fb2979f7 by Luke T. Shumaker at 2026-07-13T16:37:25-06:00 Fetch the docs from svn rather than a `wget --recursive` tarball I found the svn revision that exactly matches the contents of https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz with the exception that it has pcdindex.html, ppmcolors.html, and svgtopam.html; which are missing in the tarball, which makes sense, because they are not linked to by any other page. Interestingly, that revision timestamp is 2014-06-10, not the 2014-01-31 implied by the name of the tarball. - - - - - 0022da11 by Luke T. Shumaker at 2026-07-13T16:41:02-06:00 Update docs _rev to match the version Notably, the 'super_stable' tree at that rev exactly matches the tarball. Should we just use svn for everything so we don't have to worry about skew between the two? - - - - - 1 changed file: - PKGBUILD Changes: ===================================== PKGBUILD ===================================== @@ -2,6 +2,7 @@ pkgname=netpbm pkgver=10.86.50 +_rev=5219 # "Release 10.86.50", 2026-06-27 pkgrel=1 pkgdesc='A toolkit for manipulation of graphic images' arch=(x86_64) @@ -17,24 +18,21 @@ depends=(bash libxml2 perl zlib) -makedepends=(python) -# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ +makedepends=(python subversion) source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz - https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig} + "netpbm-userguide::svn+http://svn.code.sf.net/p/netpbm/code/userguide#revision=$_rev"; netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch netpbm-build-manpages.patch reproducible-man-gzip.patch) sha256sums=('9d9f0b08505961e7bff43b93bf7b00310f1b0e7315bc32a0321116e6bedd95c8' - '74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3' 'SKIP' '7348274b72b8285add042d0f45d124c9833206ee3440bd1846cfc792b9b4d5e5' '698645215d46bcee515d75847fc550ce99c5fcb6fae63dacdba1d773f327c80e' '5ee27b4187577cbb9e85f6b36c5e5a421e03927f9195f888be7be2b647a5ac9d' 'c289ec584097e2fdd7a975299d5a51e8266a706832c3d39105e4dd99e57ee94b' 'b0be94fbfbf247552c5cc3f1cdd93e2d549f59c3d218350ccc1bea44e9bebc9b') -validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90') prepare() { cd $pkgname-$pkgver @@ -47,7 +45,7 @@ prepare() { cp config.mk.in config.mk echo 'CFLAGS_SHLIB = -fPIC' >> config.mk - echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk + echo "NETPBM_DOCURL = file:///usr/share/doc/${pkgname}/html" >> config.mk echo 'TIFFLIB = libtiff.so' >> config.mk echo 'JPEGLIB = libjpeg.so' >> config.mk echo 'PNGLIB = libpng.so' >> config.mk @@ -63,9 +61,10 @@ build() { cd $pkgname-$pkgver CFLAGS+=' -std=gnu17' make + # Generating useful man pages with html doc - make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" USERGUIDE=. \ - -C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" manpages + mkdir -p man + make -C man USERGUIDE=../../netpbm-userguide -f ../buildtools/manpage.mk manpages } package() { @@ -76,8 +75,9 @@ package() { install -m755 -d "${pkgdir}/usr/share/man/man3" install -m755 -d "${pkgdir}/usr/share/man/man5" - make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" USERGUIDE=. \ - -C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" installman + make -C man MANDIR="${pkgdir}/usr/share/man" USERGUIDE=../../netpbm-userguide -f ../buildtools/manpage.mk installman + + install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}/html" ../netpbm-userguide/* # Replace obsolete utility echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm" View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/netpbm/-/compare/0bda73a383ce94f4be23cf82bffce19fa75f4249...0022da110c5d7c05fee486f66d1b0cd1314dad38 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/netpbm/-/compare/0bda73a383ce94f4be23cf82bffce19fa75f4249...0022da110c5d7c05fee486f66d1b0cd1314dad38 You're receiving this email because of your account on gitlab.archlinux.org. Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications | Help: https://gitlab.archlinux.org/help
