Bump to version 20220613

While at it, remove the python2 dependency using a small patch generated
by the 2to3 tool and fill in package descriptions.

3 files changed, 58 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24b525247aa8..9cff6a967078 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,6 @@
 pkgbase = xcursor-cz-viator
-	pkgver = 20210407
+	pkgdesc = Understated cursor theme
+	pkgver = 20220613
 	pkgrel = 1
 	url = https://github.com/charakterziffer/cursor-toolbox
 	arch = any
@@ -7,28 +8,38 @@ pkgbase = xcursor-cz-viator
 	makedepends = git
 	makedepends = inkscape
 	makedepends = xorg-xcursorgen
-	makedepends = python2
+	makedepends = python
 	makedepends = patch
-	source = xcursor-cz-viator-20210407::git+https://github.com/charakterziffer/cursor-toolbox#commit=4777dfc09de1720528170dcfbf217c28681df83b
+	source = xcursor-cz-viator::git+https://github.com/charakterziffer/cursor-toolbox#commit=99ddf571428b51b6985c364e0b17e9d94263c746
 	source = build.patch
+	source = py3.patch
 	sha512sums = SKIP
 	sha512sums = c2b8792e0a9afd639864608dc674acbc1a368d9a83cd46dd3422403961af2b001c3eb004269eb701fcd34f4cfceaca5912a751a6ecd68ad08901ec94e0afb972
+	sha512sums = e61eedf83f08534eec71a2418aedc58e887069aa6c532d90b39409da7ef8bb60492616a919dddfc10aac901edf4fb6d7a816c14b621ee566e6f056b6fbb7776c
 
 pkgname = xcursor-cz-viator-hourglass-white
+	pkgdesc = Understated cursor theme - white, hourglass wait icon
 
 pkgname = xcursor-cz-viator-hourglass-black
+	pkgdesc = Understated cursor theme - black, hourglass wait icon
 
 pkgname = xcursor-cz-viator-ring-white
+	pkgdesc = Understated cursor theme - white, ring wait icon
 
 pkgname = xcursor-cz-viator-ring-black
+	pkgdesc = Understated cursor theme - black, ring wait icon
 
 pkgname = xcursor-cz-viator-rotor-white
+	pkgdesc = Understated cursor theme - white, rotor wait icon
 
 pkgname = xcursor-cz-viator-rotor-black
+	pkgdesc = Understated cursor theme - black, rotor wait icon
 
 pkgname = xcursor-cz-viator-windmill-white
+	pkgdesc = Understated cursor theme - white, windmill wait icon
 
 pkgname = xcursor-cz-viator-windmill-black
+	pkgdesc = Understated cursor theme - black, windmill wait icon
 
 pkgname = xcursor-cz-hickson
-
+	pkgdesc = Understated cursor theme - brownish
diff --git a/PKGBUILD b/PKGBUILD
index 83002083433b..d2bd35c0d6af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,28 @@
 # Maintainer: Adrian Perez de Castro <aperez@igalia.com>
-pkgdesc=''
+pkgdesc='Understated cursor theme'
 pkgbase=xcursor-cz-viator
 pkgname=(xcursor-cz-viator-{hourglass,ring,rotor,windmill}-{white,black} xcursor-cz-hickson)
-pkgver=20210407
+pkgver=20220613
 pkgrel=1
-_commit=4777dfc09de1720528170dcfbf217c28681df83b
+_commit=99ddf571428b51b6985c364e0b17e9d94263c746
 license=(GPL3)
 url=https://github.com/charakterziffer/cursor-toolbox
 arch=(any)
-makedepends=(git inkscape xorg-xcursorgen python2 patch)
+makedepends=(git inkscape xorg-xcursorgen python patch)
 depends=()
-source=("${pkgbase}-${pkgver}::git+${url}#commit=${_commit}" build.patch)
+source=("${pkgbase}::git+${url}#commit=${_commit}" build.patch py3.patch)
 sha512sums=('SKIP'
-            'c2b8792e0a9afd639864608dc674acbc1a368d9a83cd46dd3422403961af2b001c3eb004269eb701fcd34f4cfceaca5912a751a6ecd68ad08901ec94e0afb972')
+            'c2b8792e0a9afd639864608dc674acbc1a368d9a83cd46dd3422403961af2b001c3eb004269eb701fcd34f4cfceaca5912a751a6ecd68ad08901ec94e0afb972'
+            'e61eedf83f08534eec71a2418aedc58e887069aa6c532d90b39409da7ef8bb60492616a919dddfc10aac901edf4fb6d7a816c14b621ee566e6f056b6fbb7776c')
 
 prepare () {
-	cd "${pkgbase}-${pkgver}"
+	cd "${pkgbase}"
 	patch -p1 < "${srcdir}/build.patch"
+	patch -p0 < "${srcdir}/py3.patch"
 }
 
 build () {
-	cd "${pkgbase}-${pkgver}"
+	cd "${pkgbase}"
 	local spinner color suffix
 
 	for color in white black ; do
@@ -31,24 +33,24 @@ build () {
 		fi
 
 		msg2 "Rendering color variant: ${color}"
-		python2 render-pngs.py "svgs/template${suffix}.svg"
+		python render-pngs.py "svgs/template${suffix}.svg"
 
 		for spinner in hourglass ring rotor windmill ; do
 			msg2 "Rendering variant: ${spinner} ${color}"
-			python2 render-pngs.py "svgs/spinner-${spinner}${suffix}.svg"
+			python render-pngs.py "svgs/spinner-${spinner}${suffix}.svg"
 
 			themetitle="cz-Viator-${spinner}-${color}" ./make.sh
 		done
 	done
 
 	msg2 "Rendering variant: Hickson"
-	python2 render-pngs.py "more-themes/cz-Hickson/cz-Hickson.svg"
+	python render-pngs.py "more-themes/cz-Hickson/cz-Hickson.svg"
 	themetitle="cz-Hickson" ./make.sh
 }
 
 _package () {
 	install -dm755 "${pkgdir}/usr/share/icons"
-	cp -a "${pkgbase}-${pkgver}/$1" "${pkgdir}/usr/share/icons/"
+	cp -a "${pkgbase}/$1" "${pkgdir}/usr/share/icons/"
 }
 
 _package_viator_variant () {
@@ -56,37 +58,46 @@ _package_viator_variant () {
 }
 
 package_xcursor-cz-viator-hourglass-white () {
+	pkgdesc="${pkgdesc} - white, hourglass wait icon"
 	_package_viator_variant hourglass white
 }
 
 package_xcursor-cz-viator-hourglass-black () {
+	pkgdesc="${pkgdesc} - black, hourglass wait icon"
 	_package_viator_variant hourglass black
 }
 
 package_xcursor-cz-viator-ring-white () {
+	pkgdesc="${pkgdesc} - white, ring wait icon"
 	_package_viator_variant ring white
 }
 
 package_xcursor-cz-viator-ring-black () {
+	pkgdesc="${pkgdesc} - black, ring wait icon"
 	_package_viator_variant ring black
 }
 
 package_xcursor-cz-viator-rotor-white () {
+	pkgdesc="${pkgdesc} - white, rotor wait icon"
 	_package_viator_variant rotor white
 }
 
 package_xcursor-cz-viator-rotor-black () {
+	pkgdesc="${pkgdesc} - black, rotor wait icon"
 	_package_viator_variant rotor black
 }
 
 package_xcursor-cz-viator-windmill-white () {
+	pkgdesc="${pkgdesc} - white, windmill wait icon"
 	_package_viator_variant windmill white
 }
 
 package_xcursor-cz-viator-windmill-black () {
+	pkgdesc="${pkgdesc} - black, windmill wait icon"
 	_package_viator_variant windmill black
 }
 
 package_xcursor-cz-hickson () {
+	pkgdesc="${pkgdesc} - brownish"
 	_package cz-Hickson
 }
diff --git a/py3.patch b/py3.patch
new file mode 100644
index 000000000000..f9f171fa2f8d
--- /dev/null
+++ b/py3.patch
@@ -0,0 +1,20 @@
+--- render-pngs.py	(original)
++++ render-pngs.py	(refactored)
+@@ -82,7 +82,7 @@
+ 	def isFloat(self, stringVal):
+ 		try:
+ 			return (float(stringVal), True)[1]
+-		except (ValueError, TypeError), e:
++		except (ValueError, TypeError) as e:
+ 			return False
+ 
+ 	def parseCoordinates(self, val):
+@@ -236,7 +236,7 @@
+ 	xmlParser.setContentHandler(svgLayerHandler)
+ 	try:
+ 		xmlParser.parse(svgFilename)
+-	except SAXParseException, e:
++	except SAXParseException as e:
+ 		fatalError("Error parsing SVG file '%s': line %d,col %d: %s.  If you're seeing this within inkscape, it probably indicates a bug that should be reported." % (svgfile, e.getLineNumber(), e.getColumnNumber(), e.getMessage()))
+ 
+ 	# verify that the svg file actually contained some rectangles.