upgpkg: apt-offline 1.8.4-2

Fix old threading API

3 files changed, 63 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11dfdb10167a..4f68f3b1fe26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = apt-offline
 	pkgdesc = Offline APT Package Manager
 	pkgver = 1.8.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://rickysarraf.github.io/apt-offline/
 	arch = any
 	license = GPL
 	depends = python3
 	depends = python-pyqt5
 	source = apt-offline-1.8.4.tar.gz::https://github.com/rickysarraf/apt-offline/releases/download/v1.8.4/apt-offline-1.8.4.tar.gz
+	source = 0001-Use-modern-threading-api.patch
 	sha256sums = c6f4afae6082d1eeada7791793ae29ec02a2444b95edfa46956a0299878c3882
+	sha256sums = 7974748142903b8d3968b87770995cd3a856eab18553f6044fb7ed4eaed3ceca
 
 pkgname = apt-offline
diff --git a/0001-Use-modern-threading-api.patch b/0001-Use-modern-threading-api.patch
new file mode 100644
index 000000000000..659e55830099
--- /dev/null
+++ b/0001-Use-modern-threading-api.patch
@@ -0,0 +1,50 @@
+From 9dff4ed97d8a7feb88714e59c4a477e7b98a11bb Mon Sep 17 00:00:00 2001
+From: Ritesh Raj Sarraf <rrs@debian.org>
+Date: Fri, 22 Apr 2022 12:33:57 +0530
+Subject: [PATCH] Use modern threading api
+
+Instead of the old camelCase api naming convention
+---
+ apt_offline_core/AptOfflineCoreLib.py | 2 +-
+ apt_offline_core/AptOfflineLib.py     | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/apt_offline_core/AptOfflineCoreLib.py b/apt_offline_core/AptOfflineCoreLib.py
+index 36663f1..99da343 100644
+--- a/apt_offline_core/AptOfflineCoreLib.py
++++ b/apt_offline_core/AptOfflineCoreLib.py
+@@ -1301,7 +1301,7 @@ def fetcher( args ):
+ 
+                 #INFO: Everything
+                 (url, pkgFile, download_size, checksum) = stripper(item)
+-                thread_name = threading.currentThread().getName()
++                thread_name = threading.current_thread().name
+                 log.verbose("Thread is %s\n" % (thread_name) )
+ 
+                 if url.endswith(".deb"):
+diff --git a/apt_offline_core/AptOfflineLib.py b/apt_offline_core/AptOfflineLib.py
+index 3595ee8..cb63a18 100644
+--- a/apt_offline_core/AptOfflineLib.py
++++ b/apt_offline_core/AptOfflineLib.py
+@@ -688,8 +688,7 @@ class MyThread( threading.Thread ):
+ 
+         def run( self, item=None):
+                 while True:
+-                        if threading.currentThread().guiTerminateSignal:
+-                                #print threading.currentThread().getName(), "has been stopped :D"
++                        if threading.current_thread().guiTerminateSignal:
+                                 break
+                         if self.requestQueue is not None:
+                                 item = self.requestQueue.get()
+@@ -697,7 +696,7 @@ class MyThread( threading.Thread ):
+                         if item is None:
+                                 break
+ 
+-                        thread_name = threading.currentThread().getName()
++                        thread_name = threading.current_thread().name
+ 
+                         if self.responseQueue is not None:
+                                 self.responseQueue.put( self.WorkerFunction( item, thread_name ) )
+-- 
+2.36.0
+
diff --git a/PKGBUILD b/PKGBUILD
index b4cd23b1dbba..58b87da2f644 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,21 @@
 # Maintainer: j.r <j.r@jugendhacker.de>
 pkgname=apt-offline
 pkgver=1.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Offline APT Package Manager"
 arch=('any')
 url="https://rickysarraf.github.io/apt-offline/"
 license=('GPL')
 depends=('python3' 'python-pyqt5')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/rickysarraf/apt-offline/releases/download/v$pkgver/apt-offline-$pkgver.tar.gz")
-sha256sums=('c6f4afae6082d1eeada7791793ae29ec02a2444b95edfa46956a0299878c3882')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/rickysarraf/apt-offline/releases/download/v$pkgver/apt-offline-$pkgver.tar.gz"
+	"0001-Use-modern-threading-api.patch")
+sha256sums=('c6f4afae6082d1eeada7791793ae29ec02a2444b95edfa46956a0299878c3882'
+            '7974748142903b8d3968b87770995cd3a856eab18553f6044fb7ed4eaed3ceca')
+
+prepare() {
+	cd "$pkgname"
+	patch -p1 -i"$srcdir/0001-Use-modern-threading-api.patch"
+}
 
 build() {
 	cd "$pkgname"