[arch-commits] Commit in pysolfc/repos/community-any (3 files)

[Jaroslav Lichtblau]

    Date: Thursday, March 5, 2020 @ 20:36:37
  Author: jlichtblau
Revision: 590874

archrelease: copy trunk to community-any

Added:
  pysolfc/repos/community-any/PKGBUILD
    (from rev 590873, pysolfc/trunk/PKGBUILD)
Deleted:
  pysolfc/repos/community-any/PKGBUILD
  pysolfc/repos/community-any/time-attribute-clock-fix.diff

-------------------------------+
 PKGBUILD                      |   59 ++++++++++++++++++----------------------
 time-attribute-clock-fix.diff |   17 -----------
 2 files changed, 28 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-05 20:36:28 UTC (rev 590873)
+++ PKGBUILD	2020-03-05 20:36:37 UTC (rev 590874)
@@ -1,31 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=pysolfc
-pkgver=2.6.4
-pkgrel=3
-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')
-
-prepare() {
-  cd PySolFC-$pkgver
-
-  patch -Np1 -i "${srcdir}"/time-attribute-clock-fix.diff
-  sed -i 's/pysol.py/pysol/' data/pysol.desktop
-}
-
-
-package() {
-  cd PySolFC-$pkgver
-
-  python setup.py install --root="${pkgdir}"
-  mv "${pkgdir}"/usr/bin/pysol.py "${pkgdir}"/usr/bin/pysol
-}

Copied: pysolfc/repos/community-any/PKGBUILD (from rev 590873, pysolfc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-05 20:36:37 UTC (rev 590874)
@@ -0,0 +1,28 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=pysolfc
+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' 'python-pysol_cards')
+makedepends=('python-setuptools')
+source=(https://downloads.sourceforge.net/$pkgname/PySolFC-$pkgver.tar.xz)
+sha256sums=('2b09a076f544f299155cbb8d0d455bfbf9be082bff76a6f9758959697cc07844')
+
+prepare() {
+  cd PySolFC-$pkgver
+
+  sed -i 's/pysol.py/pysol/' data/pysol.desktop
+}
+
+
+package() {
+  cd PySolFC-$pkgver
+
+  python setup.py install --root="${pkgdir}"
+  mv "${pkgdir}"/usr/bin/pysol.py "${pkgdir}"/usr/bin/pysol
+}

Deleted: time-attribute-clock-fix.diff
===================================================================
--- time-attribute-clock-fix.diff	2020-03-05 20:36:28 UTC (rev 590873)
+++ time-attribute-clock-fix.diff	2020-03-05 20:36:37 UTC (rev 590874)
@@ -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