Re: [PR PATCH] [Updated] [WIP] cups: update to 2.4rc1.

[oynqr <oynqr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 2003 bytes --]

There is an updated pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages cups-fresh
https://github.com/void-linux/void-packages/pull/33939

[WIP] cups: update to 2.4rc1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is in preparation for the upcoming cups 2.4 release. Lots of configure flags became redundant, got sane defaults or just straight up changed, so I cleaned those up quite a bit. Some of the post_install actions are also no longer required.
Compression support is now enabled with the zlib-devel makedepend, which should speed things up with IPP printers that support it.

Testing is very much welcome.

A patch file from https://github.com/void-linux/void-packages/pull/33939.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-fresh-33939.patch --]
[-- Type: text/x-diff, Size: 4628 bytes --]

From c0d9dd71d7d26fa404175dbb8f264a1e7c73ef1c Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 6 Nov 2021 15:51:38 +0100
Subject: [PATCH] cups: update to 2.4.0.

---
 .../cups/patches/cups-no-export-ssllibs.patch | 11 -----
 srcpkgs/cups/template                         | 47 ++++++-------------
 2 files changed, 15 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/cups/patches/cups-no-export-ssllibs.patch

diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
deleted file mode 100644
index bf618ce330bd..000000000000
--- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ b/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- dnl
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 66204733fa86..b18949b334f2 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,14 +1,13 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3op2
+version=2.4.0
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
-hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
- gnutls-devel perl pkg-config poppler-utils"
-makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
- libusb-devel pam-devel poppler-devel tiff-devel
- $(vopt_if avahi avahi-libs-devel)
+hostmakedepends="$(vopt_if avahi avahi-libs-devel)
+ gnutls-devel pkg-config"
+makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
+ zlib-devel $(vopt_if avahi avahi-libs-devel)
  $(vopt_if gssapi 'mit-krb5-devel')"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
@@ -16,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
+checksum=9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
@@ -34,40 +33,24 @@ system_groups=lpadmin
 cups_pgroup=lp
 cups_homedir=/var/spool/cups
 
-pre_configure() {
-	aclocal -I config-scripts
-	autoconf -I config-scripts
-}
-
 do_configure() {
 	./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
-		--enable-acl --enable-dbus --enable-raw-printing \
-		--enable-threads --with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \
-		--with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \
-		--enable-libpaper --enable-pam --enable-ssl \
-		--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
-		--with-optim="${CFLAGS}" --disable-systemd --disable-launchd \
-		--without-rcdir --without-java --without-perl --without-php \
-		--without-python \
-		$(vopt_enable avahi) $(vopt_enable gssapi)
+		--enable-acl --with-logdir=/var/log/cups \
+		--docdir=/usr/share/cups/doc --with-rundir=/run/cups \
+		--with-cups-user=cups --with-cups-group=lp \
+		--with-system-groups="lpadmin sys root" --enable-relro \
+		--enable-libpaper --with-menudir=/usr/share/applications \
+		--with-xinetd=/etc/xinetd.d --with-optim="${CFLAGS}" \
+		--with-rcdir=no \
+		$(vopt_if avahi '--with-dnssd=avahi') $(vopt_enable gssapi)
 }
 
 post_install() {
-	# compress some driver files, adopted from Fedora
-	find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
 	# install some more configuration files that will get filled by cupsd
 	for f in printers classes client subscriptions; do
 		touch ${DESTDIR}/etc/cups/${f}.conf
 	done
 
-	# Remove files provided by cups-filters.
-	rm -f ${DESTDIR}/usr/share/cups/banners/*
-	rm -f ${DESTDIR}/usr/share/cups/data/testprint
-	# comment out all conversion rules which use any of the removed filters
-	perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \
-		${DESTDIR}/usr/share/cups/mime/mime.convs
-
 	# remove unnecessary PageLogFormat entry
 	vsed -i -e 's:PageLogFormat:#PageLogFormat:' ${DESTDIR}/etc/cups/cupsd.conf*
 
@@ -92,7 +75,7 @@ libcups_package() {
 }
 
 cups-devel_package() {
-	depends="zlib-devel libcups>=${version}_${revision}"
+	depends="libcups>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include