[arch-commits] Commit in pysolfc/trunk (PKGBUILD time-attribute-clock-fix.diff)

[Jaroslav Lichtblau]

    Date: Thursday, March 5, 2020 @ 20:36:28
  Author: jlichtblau
Revision: 590873

upgpkg: pysolfc 2.8.0-1 - new upstream release

Modified:
  pysolfc/trunk/PKGBUILD
Deleted:
  pysolfc/trunk/time-attribute-clock-fix.diff

-------------------------------+
 PKGBUILD                      |   15 ++++++---------
 time-attribute-clock-fix.diff |   17 -----------------
 2 files changed, 6 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-05 19:37:05 UTC (rev 590872)
+++ PKGBUILD	2020-03-05 20:36:28 UTC (rev 590873)
@@ -2,23 +2,20 @@
 # Contributor: Eric Bélanger <eric at archlinux.org>
 
 pkgname=pysolfc
-pkgver=2.6.4
-pkgrel=3
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="PySol (Fan Club edition) is an exciting collection of more than 1000 solitaire games"
 arch=('any')
 url="http://pysolfc.sourceforge.net/"
 license=('GPL3')
-depends=('tk' 'python-pillow' 'python-random2' 'python-six' 'pysolfc-cardsets')
-makedepends=('patch')
-source=(https://downloads.sourceforge.net/$pkgname/PySolFC-$pkgver.tar.xz
-        time-attribute-clock-fix.diff)
-sha256sums=('4dab3579531530136fb629c045d4b8389f410962e6cf77494f18c61c9de6ea78'
-            '28f593d28d71e01a5f07c51aacedd98b7222c03ce96888ce685e4292cddb4676')
+depends=('tk' 'python-pillow' 'python-random2' 'python-six' 'pysolfc-cardsets' 'python-pysol_cards')
+makedepends=('python-setuptools')
+source=(https://downloads.sourceforge.net/$pkgname/PySolFC-$pkgver.tar.xz)
+sha256sums=('2b09a076f544f299155cbb8d0d455bfbf9be082bff76a6f9758959697cc07844')
 
 prepare() {
   cd PySolFC-$pkgver
 
-  patch -Np1 -i "${srcdir}"/time-attribute-clock-fix.diff
   sed -i 's/pysol.py/pysol/' data/pysol.desktop
 }
 

Deleted: time-attribute-clock-fix.diff
===================================================================
--- time-attribute-clock-fix.diff	2020-03-05 19:37:05 UTC (rev 590872)
+++ time-attribute-clock-fix.diff	2020-03-05 20:36:28 UTC (rev 590873)
@@ -1,17 +0,0 @@
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
-index f461ed1..101b3e1 100644
---- a/pysollib/mfxutil.py
-+++ b/pysollib/mfxutil.py
-@@ -143,7 +143,11 @@ def getprefdir(package):
- 
- 
- # high resolution clock() and sleep()
--uclock = time.clock
-+try:
-+    uclock = time.perf_counter
-+except Exception:
-+    uclock = time.clock
-+
- usleep = time.sleep
- if os.name == "posix":
-     uclock = time.time