Remove python311.patch fixed upstream

4 files changed, 4 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86caeae4d729..18f66ba300b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cavalcade-git

 	pkgdesc = GUI wrapper for C.A.V.A. utility

-	pkgver = 0.8.r13.g5a41710

+	pkgver = 0.8.r15.gbdca381

 	pkgrel = 1

 	url = https://github.com/worron/cavalcade

 	arch = any

@@ -18,8 +18,6 @@ pkgbase = cavalcade-git
 	provides = cavalcade

 	conflicts = cavalcade

 	source = cavalcade-git::git+https://github.com/worron/cavalcade.git#branch=devel

-	source = python311.patch

 	b2sums = SKIP

-	b2sums = 81467e5db23914aa20c9a8f5cf0c0f284b46896c1958e0b27d7455f63c1b475388224fcb500b7878b4f342be63ef15b50306d6312108813bf49e08b2db1d076b

 

 pkgname = cavalcade-git

diff --git a/.gitignore b/.gitignore
index 2a09c800ca03..2f5661e0609c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,3 @@
 !/.gitignore
 !/.SRCINFO
 !/PKGBUILD
-
-!/python311.patch
diff --git a/PKGBUILD b/PKGBUILD
index c5fe8281c75d..548bf06bf2c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: tocic <tocic at protonmail dot ch>
 
 pkgname=cavalcade-git
-pkgver=0.8.r13.g5a41710
+pkgver=0.8.r15.gbdca381
 pkgrel=1
 pkgdesc="GUI wrapper for C.A.V.A. utility"
 arch=("any")
@@ -18,10 +18,8 @@ optdepends=("gstreamer>=1.0: audio player support"
             "python-pillow: auto color detection support")
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("${pkgname}::git+https://github.com/worron/cavalcade.git#branch=devel"
-        "python311.patch")
-b2sums=("SKIP"
-        "81467e5db23914aa20c9a8f5cf0c0f284b46896c1958e0b27d7455f63c1b475388224fcb500b7878b4f342be63ef15b50306d6312108813bf49e08b2db1d076b")
+source=("${pkgname}::git+https://github.com/worron/cavalcade.git#branch=devel")
+b2sums=("SKIP")
 
 pkgver() {
   printf "%s" \
@@ -29,12 +27,6 @@ pkgver() {
       | sed "s/\([^-]*-g\)/r\1/;s/-/./g")
 }
 
-prepare() {
-  patch --forward --strip=1 \
-    --directory="${pkgname}" \
-    --input="${srcdir}/python311.patch"
-}
-
 build() {
   cd "${pkgname}"
 
diff --git a/python311.patch b/python311.patch
deleted file mode 100644
index 92a91b15ff08..000000000000
--- a/python311.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--color=auto' --unified --recursive --text cavalcade-git.orig/cavalcade/version.py cavalcade-git.new/cavalcade/version.py
---- cavalcade-git.orig/cavalcade/version.py	2023-05-04 13:05:39.104644632 +0300
-+++ cavalcade-git.new/cavalcade/version.py	2023-05-04 13:11:48.847967829 +0300
-@@ -25,7 +25,7 @@
- 		elif branch == _DEVELOPMENT_BRANCH:
- 			version = "%.1f.dev%s-%s" % (float(v) + 0.1, n, commit)
- 		else:
--			version = "%s-%s-%s" % (v, branch, commit)
-+			version = "%s.dev%s+%s" % (v, n, commit)
- 	except Exception as e:
- 		# use plain print instead of logger to avoid potential error on setup
- 		print("Can't read git output:\n%s", e)