Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

systemd/cups: upgrade to 2.4.18

Browse source 
Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8430>
This commit is contained in:
Aster Boese 2026-04-26 10:50:20 +02:00 • committed by The Friendly Meow (merge) Bot
parent 632197dd74
commit 430a3f0f85
No known key found for this signature in database
2 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
extra-repos/systemd/cups/APKBUILD
View file

@ -1,7 +1,7 @@
# Forked from alpine for ondemand and sd-journald
maintainer="Jane Rachinger <jane400+pmaports@postmarketos.org>"
pkgname=cups
_pkgver=2.4.16
_pkgver=2.4.18
pkgver=9999$_pkgver
pkgrel=0
pkgdesc="The CUPS Printing System"
@ -29,6 +29,10 @@ subpackages="
$pkgname-dev
$pkgname-doc
$pkgname-libs
ipptool
$pkgname-client
$pkgname-lang
$pkgname-systemd
"
source="$pkgname-$_pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v$_pkgver.tar.gz
$pkgname.logrotate
@ -39,15 +43,6 @@ source="$pkgname-$_pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v
options="!check"
builddir="$srcdir/cups-$_pkgver"
# NOTE: pkgname-client MUST come after ipptool or else it'll grab
# /usr/bin/ipptool first...
subpackages="
$subpackages
$pkgname-client
$pkgname-lang
$pkgname-systemd
"
build() {
# examples fail when building in qemu, with:
# 'error relocating fakeroot'
@ -91,7 +86,7 @@ build() {
}
package() {
make DESTDIR="$pkgdir" install
make BUILDROOT="$pkgdir" install
cd "$pkgdir"
@ -130,8 +125,7 @@ ipptool() {
pkgdesc="Perform internet printing protocol requests"
depends=""
amove usr/bin/ipptool \
usr/share/cups/ipptool
amove usr/bin/ipptool
}
client() {
@ -162,9 +156,9 @@ systemd() {
}
sha512sums="
522a96b2023c0d72be1aa6f35e7bd677f15ead479a0b83653b6e579e8169a1675982ebfac80721a16b887701d3c9050c35109c893a9f8dc1983a74d0fdf30e93 cups-2.4.16.tar.gz
89f631b38cc5193d63ce253066784b766abd577b3406a16cf60547f0585a57aed937fe2fc0c4995a396ec856ba32b02e8026377af8d162c6428bfc00c2767c14 cups-2.4.18.tar.gz
bc2e9985b248bdf552306dcaad6ac86ada0053da97a742e57e7d65f0c2373a88edd622b326a39bb536c7aaabc449255d5597001297c9430d237379547c95caf3 cups.logrotate
148eb01f0861e1cd0861a174a5c5262c49b079b27b972b4e90656b9b9357ec710e861604c30e897818f550e9c1cdcefcd8c8bc955ba4a333902a74cdd8dfb5a6 cups-no-export-ssllibs.patch
7b2f1212b009d4e005eaf4fc288413bde57aff4ca664173202163e8f18be1ddc72c26ec84576a4850d63b08c6ce5948d57c77e81c4f4c85032d7ef7530b1eb81 cups-nostrip.patch
ca93cd1490e1f17d1ce3a8a5bcf7b9d46a3efaf0cb16c53fc2da779b4ac2eec46fa2a43d1e14d320d410e27618b34744c705a12ca7e7e91fcaee4196a28ac0f6 cups-nostrip.patch
c492f5e20a1bb73cf6bed86d0343659e839df4003aa1409bf608dd3ff05694d1e06ba26fd3786385d2c96dd668485dcef6cfee7f908416a2b125a8e30e82e670 default-config-no-gssapi.patch
"

31
extra-repos/systemd/cups/cups-nostrip.patch
View file

@ -22,7 +22,7 @@ diff -ru a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
diff -ru a/configure b/configure
--- a/configure 2020-04-27 14:04:29.000000000 -0400
+++ b/configure 2021-08-06 20:54:01.585892266 -0400
@@ -726,7 +726,6 @@
@@ -717,7 +717,6 @@
ARCHFLAGS
UNITTESTS
OPTIM
@ -30,24 +30,25 @@ diff -ru a/configure b/configure
LIBTOOL_INSTALL
LIBTOOL_CXX
LIBTOOL_CC
@@ -7902,7 +7901,6 @@
@@ -8173,7 +8174,6 @@
-INSTALL_STRIP=""
@@ -7956,10 +7954,6 @@
@@ -8226,11 +8228,6 @@
OPTIM="-g"
-else $as_nop
-
-else case e in #(
- e)
- INSTALL_STRIP="-s"
-
- ;;
-esac
fi
if test x$enable_debug_printfs = xyes
diff -ru a/Makedefs.in b/Makedefs.in
--- a/Makedefs.in 2020-04-27 14:04:29.000000000 -0400