From ff73fa2a6324c3e55889af21b992f0ecc334afb3 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Fri, 22 Dec 2023 22:14:30 +0100
Subject: [PATCH] backintime: update to 1.4.1.

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 ...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
 srcpkgs/backintime/template                   | 32 ++++++++----
 2 files changed, 21 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch

diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d39..0000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES         | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
- 
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing 
-+* bump version, forgot to push branch to Github before releasing
- 
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+    from collections.abc import MutableSet
-+except ImportError:
-+    from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
-         self.history = [path,]
-         self.index = 0
- 
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
-     """
-     OrderedSet from Python recipe
-     http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08..8d2bf2e3efc9f 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,17 @@
 # Template file for 'backintime'
 pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.1
+revision=1
 configure_args="--python3"
 pycompile_dirs="/usr/share/backintime"
 hostmakedepends="gettext python3"
-depends="python3 rsync python3-dbus python3-keyring"
+depends="python3 rsync python3-dbus python3-keyring python3-packaging libnotify xdpyinfo"
 short_desc="Simple backup tool for Linux"
 maintainer="Alpicoid <alpicoid@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=bc758022fbb3ef14177a258c1292adc60ff4efee93129d147eab724faed9e21e
 python_version=3
 
 do_configure() {
@@ -35,10 +35,24 @@ do_install() {
 	make install DESTDIR=$DESTDIR
 }
 
+backintime_package() {
+	pkg_install() {
+		vmove etc/xdg/autostart
+		vmove "usr/bin/backintime*"
+		vmove usr/share/backintime
+		vmove usr/share/bash-completion/completions/backintime
+		vmove usr/share/doc/backintime-common
+		vmove usr/share/doc/qt
+		vmove usr/share/icons
+		vmove usr/share/locale
+		vmove "usr/share/man/man1/backintime*"
+		vmove usr/share/polkit-1
+	}
+}
+
 backintime-qt_package() {
 	short_desc+=" - Qt GUI"
-	depends="backintime-${version}_${revision}
-	 python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+	depends="backintime-${version}_${revision} python3-PyQt5 python3-PyQt5-dbus"
 	pkg_install() {
 		vmove etc/dbus-1
 		vmove "usr/bin/backintime-qt*"
@@ -47,9 +61,5 @@ backintime-qt_package() {
 		vmove usr/share/bash-completion/completions/backintime-qt
 		vmove usr/share/dbus-1
 		vmove usr/share/doc/backintime-qt
-		vmove usr/share/doc/qt
-		vmove usr/share/icons
-		vmove "usr/share/man/man1/backintime-qt*"
-		vmove usr/share/polkit-1
 	}
 }