Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Jun 2021 08:58:34 GMT
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: cb3b365038fc - 2021Q2 - games/pysolfc: Fix runtime issues with Python 3.8+
Message-ID:  <202106300858.15U8wYpf003862@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cb3b365038fcaee997eb9e4006a7e2bfed6e5ab0

commit cb3b365038fcaee997eb9e4006a7e2bfed6e5ab0
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2021-06-30 08:31:41 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2021-06-30 08:56:01 +0000

    games/pysolfc: Fix runtime issues with Python 3.8+
    
    * The deprecated function "time.clock()" has been removed in Python 3.8
      and "time.perf_counter()" should be used instead.
    
      Because updating to a newer version of PySolFC requires a bit more
      work, use a backport for now to remedy the runtime issues.
    
    * Bump PORTREVISION due changed package contents.
    
    PR:             256504
    Reported by:    <sven.a.jonsson@bahnhof.se>
    MFH:            2021Q2
    
    (cherry picked from commit 91cf30435554dda6bf71dc566f91352dd469d816)
---
 games/pysolfc/Makefile                        |  2 +-
 games/pysolfc/files/patch-pysollib_mfxutil.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 8a26d7761010..7d564b06430d 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,7 +1,7 @@
 
 PORTNAME=	pysolfc
 DISTVERSION=	2.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \
 		SF/${PORTNAME}/PySolFC-Cardsets/${CARDSETDIR}:cardsets
diff --git a/games/pysolfc/files/patch-pysollib_mfxutil.py b/games/pysolfc/files/patch-pysollib_mfxutil.py
new file mode 100644
index 000000000000..a76d320c68ae
--- /dev/null
+++ b/games/pysolfc/files/patch-pysollib_mfxutil.py
@@ -0,0 +1,21 @@
+Fix runtime errors with Python 3.8+ because the function time.clock() has been
+removed in Python 3.8, after having been deprecated since Python 3.3.
+
+Obtained from:
+https://github.com/shlomif/PySolFC/commit/0961401105850a18ff129e2c25cfffae45a81752
+
+--- pysollib/mfxutil.py.orig	2021-06-09 18:23:28 UTC
++++ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106300858.15U8wYpf003862>