summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgardenapple2022-01-28 12:33:11 +0200
committergardenapple2022-01-28 12:33:11 +0200
commitf69c568771e5f0119345c53d935d0fe1e9756a66 (patch)
treed47736662f4fdb545e2bc3700a89f30dd3782dd4
parent600b438af504374e1407ecfd4403820f6d786f83 (diff)
downloadaur-f69c568771e5f0119345c53d935d0fe1e9756a66.tar.gz
Patch no longer needed
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD13
-rw-r--r--fix-python-3.10.patch12
3 files changed, 3 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 733d8193ea8a..e9e4e5253cf4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,8 +15,6 @@ pkgbase = fahcontrol-gtk3-git
provides = fahcontrol
conflicts = fahcontrol
source = fahcontrol-gtk3-git::git+https://github.com/cdberkstresser/fah-control.git
- source = fix-python-3.10.patch
sha256sums = SKIP
- sha256sums = ca8c09a5b58582d7af8443be5e9653d6ebac2e0e9df387fc51c2e88c822f64db
pkgname = fahcontrol-gtk3-git
diff --git a/PKGBUILD b/PKGBUILD
index a87f9b1bdceb..511c715d5ff1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: merlock <mlmatlock@gmail.com>
pkgname=fahcontrol-gtk3-git
-pkgver=r183.f8cee6d
+pkgver=r185.2b57930
pkgrel=1
pkgdesc='Graphical monitor and control utility for the Folding@home client (python3/GTK3 fork)'
url='https://foldingathome.org'
@@ -15,15 +15,8 @@ optdepends=('fahviewer: 3D simulation viewer')
provides=('fahcontrol')
conflicts=('fahcontrol')
#changelog="src/${pkgname}/CHANGELOG.md"
-source=("${pkgname}::git+https://github.com/cdberkstresser/fah-control.git"
- 'fix-python-3.10.patch')
-sha256sums=('SKIP'
- 'ca8c09a5b58582d7af8443be5e9653d6ebac2e0e9df387fc51c2e88c822f64db')
-
-prepare() {
- cd "$pkgname"
- patch -p1 < "${srcdir}/fix-python-3.10.patch"
-}
+source=("${pkgname}::git+https://github.com/cdberkstresser/fah-control.git")
+sha256sums=('SKIP')
pkgver() {
cd "$pkgname"
diff --git a/fix-python-3.10.patch b/fix-python-3.10.patch
deleted file mode 100644
index 7c5f05fe74f9..000000000000
--- a/fix-python-3.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/fah/util/OrderedDict.py b/fah/util/OrderedDict.py
-index d19a916..edb9cbc 100644
---- a/fah/util/OrderedDict.py
-+++ b/fah/util/OrderedDict.py
-@@ -20,7 +20,7 @@
- ################################################################################
-
- from collections import UserDict
--from collections import MutableMapping as DictMixin
-+from collections.abc import MutableMapping as DictMixin
-
- class OrderedDict(dict, DictMixin):