From 1ea7cddf506978037ba3d0d73173d61ed78e70e6 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Sun, 16 Nov 2025 10:24:40 +0200
Subject: [PATCH] Switch to new download format and remove /run directory

---
 pkg.info  | 38 +++++++++++++++++++++++++++++++++-----
 source.sh | 13 +++----------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/pkg.info b/pkg.info
index 533b266..10e72e7 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,16 +1,44 @@
 name: cups
 description: An open-source printing system
 version: 2.4.14
+revision: 2
 url: https://openprinting.github.io/cups/
 license: Apache2 with LLVM-exception and BSD-3-Clause and Zlib and BSD-2-Clause
 architecture: any
-optional_depends: ["libusb","xdg-utils"]
-make_depends: ["acl","dbus","gnutls","libusb","pam","udev"]
-keep: ["etc/cups/client.conf"]
 type: source
+keep:
+  - etc/cups/client.conf
+optional_depends:
+  - libusb
+  - xdg-utils
+make_depends:
+  - acl
+  - dbus
+  - gnutls
+  - libusb
+  - pam
+  - udev
+downloads:
+  - url: https://github.com/OpenPrinting/cups/releases/download/v${BPM_PKG_VERSION}/cups-${BPM_PKG_VERSION}-source.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 660288020dd6f79caf799811c4c1a3207a48689899ac2093959d70a3bdcb7699
 split_packages:
   - name: cups
-    depends: ["acl", "dbus", "gcc-libs", "glibc", "gnutls", "hicolor-icon-theme", "libcups", "sysusers", "pam", "udev"]
+    depends:
+      - acl
+      - dbus
+      - gcc-libs
+      - glibc
+      - gnutls
+      - hicolor-icon-theme
+      - libcups
+      - sysusers
+      - pam
+      - udev
   - name: libcups
     description: Library and header files for the CUPS printing system
-    depends: ["glibc","gnutls","zlib"]
+    depends:
+      - glibc
+      - gnutls
+      - zlib
diff --git a/source.sh b/source.sh
index bb60980..897f256 100644
--- a/source.sh
+++ b/source.sh
@@ -2,16 +2,6 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://github.com/OpenPrinting/cups/releases/download/v${BPM_PKG_VERSION}/cups-${BPM_PKG_VERSION}-source.tar.gz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
@@ -26,6 +16,9 @@ build() {
 package_cups() {
   make DESTDIR="$BPM_OUTPUT" install-data install-exec
 
+  # Remove /run directory
+  rm -rf "$BPM_OUTPUT"/run
+
   # Remove program that is installed by libcups
   rm "$BPM_OUTPUT"/usr/bin/cups-config