<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/033f88ae664eb954ba88c4045c4a10cb381e8ad0">https://github.com/macports/macports-ports/commit/033f88ae664eb954ba88c4045c4a10cb381e8ad0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 033f88ae664eb954ba88c4045c4a10cb381e8ad0
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Feb 5 20:43:42 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-eric-ide: update to 21.2
</span>---
python/py-eric-ide/Portfile | 12 +--
.../files/patch-disable-update-check.diff | 89 +++++++++++++++++++---
...k.diff => patch-disable-update-check_v198.diff} | 0
python/py-eric-ide/files/patch-install.py.diff | 10 +--
4 files changed, 88 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/Portfile b/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3760d18630..833cf093433 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-eric-ide
set real_name eric6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 21.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 21.2
</span> revision 0
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ homepage https://eric-ide.python-projects.org/index.html
</span> master_sites sourceforge:project/eric-ide/${real_name}/stable/${version}
distname ${real_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 febf472fac27db89424dc009c8b5631737f68748 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ae88796caa17ec6bc32165614372c052e409e7f2467d7d8a93a1f0b2bbded0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17074979
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 13a38c3b7047502c3175a9107675086ad9320077 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7cb0fb91b8b91d845c8918a15409c4988130ca9d92f5ccda875115b036a3ab58 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17265384
</span>
python.versions 27 37 38 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,8 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 34a8f2a9b2af2fa0e0e4b17e6822c97ed13ac864 \
sha256 7adcc5299df105d70eae71b4ed02781c937858ac2aee6bfc8dbf63f68527b025 \
size 17205953
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-install.py_v198.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-install.py_v198.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-disable-update-check_v198.diff
</span> livecheck.type none
} else {
patchfiles patch-install.py.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +105,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pysvn \
port:py${python.version}-rope
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.cmd ${python.bin} install.py
build.args -b ${python.prefix}/bin \
-i ${destroot} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/files/patch-disable-update-check.diff b/python/py-eric-ide/files/patch-disable-update-check.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 980a3ca74af..aea53287a35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/files/patch-disable-update-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/files/patch-disable-update-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,78 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- eric/eric6/UI/UserInterface.py.orig 2020-05-31 11:25:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ eric/eric6/UI/UserInterface.py 2020-06-01 21:03:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7030,6 +7030,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @param alternative index of server to download from (integer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @keyparam showVersions flag indicating the show versions mode (boolean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- eric/eric6/UI/UserInterface.py.orig 2021-02-05 21:17:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ eric/eric6/UI/UserInterface.py 2021-02-05 21:19:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7151,74 +7151,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @param versions contents of the downloaded versions file (list of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strings)
</span> """
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # updates should happen through MacPorts, so do not check for new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # versions within the program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.isOnline():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not manual:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if VersionOnly.startswith("@@"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- url = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "snapshot-" in VersionOnly:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # check snapshot version like snapshot-20170810
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "snapshot-" in versions[2]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- installedSnapshotDate = VersionOnly.rsplit("-", 1)[-1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- availableSnapshotDate = versions[2].rsplit("-", 1)[-1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if availableSnapshotDate > installedSnapshotDate:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- res = E5MessageBox.yesNo(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("Update available"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """The update to <b>{0}</b> of eric is"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ available at <b>{1}</b>. Would you like"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ to get it?""")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .format(versions[2], versions[3]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yesDefault=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- url = res and versions[3] or ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if self.manualUpdatesCheck:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- E5MessageBox.information(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("Update Check"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """You are using a snapshot release of"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ eric. A more up-to-date stable release"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ might be available."""))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif VersionOnly.startswith(("rev_", "@@")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # check installation from source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if self.manualUpdatesCheck:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- E5MessageBox.information(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("Update Check"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """You installed eric directly from the source"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ code. There is no possibility to check"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ for the availability of an update."""))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # check release version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- installedVersionTuple = self.__versionToTuple(VersionOnly)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- availableVersionTuple = self.__versionToTuple(versions[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if availableVersionTuple > installedVersionTuple:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- res = E5MessageBox.yesNo(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("Update available"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """The update to <b>{0}</b> of eric is"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ available at <b>{1}</b>. Would you like"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ to get it?""")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .format(versions[0], versions[1]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yesDefault=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- url = res and versions[1] or ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if self.manualUpdatesCheck:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- E5MessageBox.information(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("eric is up to date"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """You are using the latest version of"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ eric"""))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except (IndexError, TypeError):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- E5MessageBox.warning(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("Error during updates check"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.tr("""Could not perform updates check."""))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if url:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QDesktopServices.openUrl(QUrl(url))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @pyqtSlot()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __versionsDownloadCanceled(self):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/files/patch-disable-update-check.diff b/python/py-eric-ide/files/patch-disable-update-check_v198.diff
</span>similarity index 100%
copy from python/py-eric-ide/files/patch-disable-update-check.diff
copy to python/py-eric-ide/files/patch-disable-update-check_v198.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/files/patch-install.py.diff b/python/py-eric-ide/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e82f781d552..74af08904df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install.py.orig 2020-06-01 05:33:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install.py 2020-06-01 21:03:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1076,11 +1076,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install.py.orig 2021-02-01 04:39:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install.py 2021-02-05 20:47:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1099,11 +1099,12 @@
</span> if not os.path.exists(directory):
os.makedirs(directory)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span>
wname = os.path.join(directories["exe"], "eric6")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1106,13 +1107,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1129,13 +1130,15 @@
</span> pathlist_n.append(path_)
pathLine = "PATH={0}\n".format(os.pathsep.join(pathlist_n))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,5 +34,5 @@
</span> + '''exec "{2}" "{3}/{4}.py" "{5}" "$@"\n'''
+ .format(pathLine, dyldLine, starter, pydir, "eric6", pyqt_ver))
copyToFile(wname, wrapper)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- os.chmod(wname, 0o755)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.chmod(wname, 0o755) # secok
</span>
</pre><pre style='margin:0'>
</pre>