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

Jaroslav Lichtblau jlichtblau at archlinux.org
Sat Jan 25 18:19:35 UTC 2020


    Date: Saturday, January 25, 2020 @ 18:19:35
  Author: jlichtblau
Revision: 555539

archrelease: copy trunk to community-any

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-25 18:19:25 UTC (rev 555538)
+++ PKGBUILD	2020-01-25 18:19:35 UTC (rev 555539)
@@ -1,28 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=pysolfc
-pkgver=2.6.4
-pkgrel=2
-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')
-optdepends=('pysolfc-cardsets')
-source=(https://downloads.sourceforge.net/pysolfc/PySolFC-${pkgver}.tar.xz)
-sha256sums=('4dab3579531530136fb629c045d4b8389f410962e6cf77494f18c61c9de6ea78')
-
-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
-}

Copied: pysolfc/repos/community-any/PKGBUILD (from rev 555538, pysolfc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-25 18:19:35 UTC (rev 555539)
@@ -0,0 +1,31 @@
+# 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/time-attribute-clock-fix.diff (from rev 555538, pysolfc/trunk/time-attribute-clock-fix.diff)
===================================================================
--- time-attribute-clock-fix.diff	                        (rev 0)
+++ time-attribute-clock-fix.diff	2020-01-25 18:19:35 UTC (rev 555539)
@@ -0,0 +1,17 @@
+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



More information about the arch-commits mailing list