Add python 3.10 and wxpython 4.0.x (instead of 4.1.x) patch

4 files changed, 44 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc35440126af..14577f9eb1b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = superpaper-git
 	pkgdesc = Cross-platform multi monitor wallpaper manager
-	pkgver = 2.1.0+23+gc8773ca
+	pkgver = 2.1.0+25+gfaba0e6
 	pkgrel = 1
 	url = https://github.com/hhannine/Superpaper
 	arch = any
@@ -13,9 +13,13 @@ pkgbase = superpaper-git
 	depends = python-system_hotkey>=1.0.2+10+9541587
 	depends = python-xpybutil
 	depends = python-numpy
-	provides = superpaper=2.1.0+23+gc8773ca
+	provides = superpaper=2.1.0+25+gfaba0e6
 	conflicts = superpaper
 	source = superpaper::git+https://github.com/hhannine/Superpaper
+	source = python3.10_List_fix.patch
+	source = wxpython_4.0.x_wx_no_attribute_PU_CONTAINS_CONTROLS.patch
 	sha256sums = SKIP
+	sha256sums = ed1be7af574a50912dfd9abe69150d386c40ef3ecc44ec4d143480e49958c19d
+	sha256sums = d37d70bcd024a43a5e9b2215bedd9545c4fc64025906b70bd084ee7071db11d7
 
 pkgname = superpaper-git
diff --git a/PKGBUILD b/PKGBUILD
index d5ffd11d34f3..18665ef21834 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=superpaper
 pkgname=${_pkgname}-git
-pkgver=2.1.0+23+gc8773ca
+pkgver=2.1.0+25+gfaba0e6
 pkgrel=1
 pkgdesc="Cross-platform multi monitor wallpaper manager"
 arch=('any')
@@ -13,14 +13,25 @@ depends=('python-pillow>=7.0' 'python-screeninfo>=0.6.1' 'python-wxpython'
 makedepends=('python-setuptools' 'git')
 provides=("${_pkgname}=${pkgver%%+}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git+https://github.com/hhannine/${_pkgname^}")
-sha256sums=('SKIP')
+source=("${_pkgname}::git+https://github.com/hhannine/${_pkgname^}"
+        'python3.10_List_fix.patch'
+        # Get rid of this when wxpython 4.1.x is introduced
+        'wxpython_4.0.x_wx_no_attribute_PU_CONTAINS_CONTROLS.patch')
+sha256sums=('SKIP'
+            'ed1be7af574a50912dfd9abe69150d386c40ef3ecc44ec4d143480e49958c19d'
+            'd37d70bcd024a43a5e9b2215bedd9545c4fc64025906b70bd084ee7071db11d7')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
   git describe --long --tags | sed -r "s/^v//;s/-/+/g"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  patch -uNp2 -r- -i ../python3.10_List_fix.patch
+  patch -uNp2 -r- -i ../wxpython_4.0.x_wx_no_attribute_PU_CONTAINS_CONTROLS.patch
+}
+
 package() {
   cd "${srcdir}/${_pkgname}"
   python setup.py install --root "${pkgdir}" --optimize=1
diff --git a/python3.10_List_fix.patch b/python3.10_List_fix.patch
new file mode 100644
index 000000000000..33da86633c74
--- /dev/null
+++ b/python3.10_List_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur ./superpaper.orig/superpaper/wallpaper_processing.py ./superpaper/superpaper/wallpaper_processing.py
+--- ./superpaper.orig/superpaper/wallpaper_processing.py	2022-02-18 19:21:23.816609240 -0500
++++ ./superpaper/superpaper/wallpaper_processing.py	2022-02-18 19:22:10.274255190 -0500
+@@ -16,6 +16,8 @@
+ from operator import itemgetter
+ from threading import Lock, Thread, Timer
+ 
++from typing import List
++
+ from PIL import Image, ImageOps, UnidentifiedImageError
+ from screeninfo import get_monitors
+ 
diff --git a/wxpython_4.0.x_wx_no_attribute_PU_CONTAINS_CONTROLS.patch b/wxpython_4.0.x_wx_no_attribute_PU_CONTAINS_CONTROLS.patch
new file mode 100644
index 000000000000..a49021891e20
--- /dev/null
+++ b/wxpython_4.0.x_wx_no_attribute_PU_CONTAINS_CONTROLS.patch
@@ -0,0 +1,12 @@
+diff -Naur ./superpaper.orig/superpaper/gui.py ./superpaper/superpaper/gui.py
+--- ./superpaper.orig/superpaper/gui.py	2022-02-18 19:26:41.396189018 -0500
++++ ./superpaper/superpaper/gui.py	2022-02-18 19:27:24.011864253 -0500
+@@ -2347,7 +2347,7 @@
+ 
+     def popup_at_button(self, button):
+         """Initialize a popup at button position."""
+-        pop = self.BezelEntryPopup(self, wx.SIMPLE_BORDER|wx.PU_CONTAINS_CONTROLS)
++        pop = self.BezelEntryPopup(self, wx.SIMPLE_BORDER) #|wx.PU_CONTAINS_CONTROLS)
+         return pop
+ 
+     def move_popup_to_button(self, pop, button):