From cd0258dad2799fae2e19560d0f778ad2887acc90 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Tue, 25 Nov 2025 17:28:19 +0200
Subject: [PATCH] Switch to new download format and remove systemd directory

---
 pkg.info  | 30 ++++++++++++++++++++++++++----
 source.sh | 12 +++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkg.info b/pkg.info
index 1332200..424f32a 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,11 +1,33 @@
 name: thunar
 description: A modern file manager for the Xfce Desktop Environment
 version: 4.20.4
-revision: 2
+revision: 3
 url: https://docs.xfce.org/xfce/thunar/start
 license: GPL2-or-later,LGPL2.1-only
 architecture: any
-depends: ["desktop-file-utils","exo","hicolor-icon-theme","libgudev","libnotify","libpng","libxfce4ui","libxfce4util","pcre2"]
-optional_depends: ["gvfs","thunar-volman","tumbler"]
-make_depends: ["glib","gobject-introspection","gtk-doc","xfce4-panel","xfce4-dev-tools"]
 type: source
+depends:
+  - desktop-file-utils
+  - exo
+  - hicolor-icon-theme
+  - libgudev
+  - libnotify
+  - libpng
+  - libxfce4ui
+  - libxfce4util
+  - pcre2
+optional_depends:
+  - gvfs
+  - thunar-volman
+  - tumbler
+make_depends:
+  - glib
+  - gobject-introspection
+  - gtk-doc
+  - xfce4-panel
+  - xfce4-dev-tools
+downloads:
+  - url: https://gitlab.xfce.org/xfce/thunar/-/archive/thunar-${BPM_PKG_VERSION}/thunar-thunar-${BPM_PKG_VERSION}.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 951a4da7b0861a8363699c31850334e8abd355ea52559c10fc1df512ea543df0
diff --git a/source.sh b/source.sh
index 428ede3..01862c3 100644
--- a/source.sh
+++ b/source.sh
@@ -2,15 +2,9 @@
 # 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://gitlab.xfce.org/xfce/thunar/-/archive/thunar-${BPM_PKG_VERSION}/thunar-thunar-${BPM_PKG_VERSION}.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
+# This function is used for putting downloaded files to the correct location or applying patches
 prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-
   cd "$BPM_SOURCE"
   NOCONFIGURE=1 ./autogen.sh
 }
@@ -27,5 +21,9 @@ build() {
 package() {
   make DESTDIR="$BPM_OUTPUT" install
 
+  # Remove systemd directory
+  rm -r "$BPM_OUTPUT"/usr/lib/systemd
+
+  # Install package licenses
   install -Dm644 "$BPM_SOURCE"/COPYING{,.LIB} -t "$BPM_OUTPUT"/usr/share/licenses/thunar/thunar
 }