<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d6ddac3a44a4430ebb624a3e76d35d4cccc50050">https://github.com/macports/macports-ports/commit/d6ddac3a44a4430ebb624a3e76d35d4cccc50050</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d6ddac3a44a4430ebb624a3e76d35d4cccc50050
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Aug 30 15:18:18 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> buildbot: Update to 2.8.4
</span>---
devel/buildbot/Portfile | 31 +++++++++++++++----------------
devel/buildbot/files/fieldMapping.patch | 15 ---------------
2 files changed, 15 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/buildbot/Portfile b/devel/buildbot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59529058bce..e52f7332f59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/buildbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/buildbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,13 @@ PortSystem 1.0
</span> PortGroup python 1.0
name buildbot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.8.4
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 be1854e6dd2aa1931a0b81a89a3e6fff9278c0f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c98da72de0e597b2e16248b2120d7afaa81bfbf3e3dfe802e99b7bca780403a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3134144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1330d1e0637b1142e012bda7c45cc3aeb919b798 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1bb314f29546b7973de0fb575868d8c2e570bdfe80463244f6627aac615f5a44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3134447
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span> platforms darwin
maintainers {ryandesign @ryandesign} {rajdeep @rajdeepbharati} {mojca @mojca} openmaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,8 @@ homepage https://buildbot.net
</span> python.default_version \
38
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,8 +67,6 @@ post-extract {
</span> copy ${filespath}/${plistfile} ${worksrcpath}/macports/${plistfile}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles fieldMapping.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/macports/${plistfile}
reinplace -locale C "s|@PYTHONVER@|${python.branch}|g" ${worksrcpath}/macports/${plistfile}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,22 +86,22 @@ post-destroot {
</span>
variant console requires www description {Include console view web UI plugin} {
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-console-view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:buildbot-console-view
</span> }
variant grid requires www description {Include grid view web UI plugin} {
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-grid-view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:buildbot-grid-view
</span> }
variant waterfall requires www description {Include waterfall view web UI plugin} {
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-waterfall-view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:buildbot-waterfall-view
</span> }
variant www description {Include web UI server} {
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:buildbot-www
</span> }
default_variants +console +grid +waterfall +www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,8 +115,10 @@ launchd to run it with:
</span> sudo launchctl load -w /Library/LaunchDaemons/your.plist.name
"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # These obsolete subports can be removed after August 2021.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set old_subports {buildbot-2 py-buildbot py38-buildbot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set old_subports [list ${name}-2 py-${name} py38-${name}]
</span> foreach old_subport ${old_subports} {
subport ${old_subport} {
PortGroup obsolete 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,10 +128,7 @@ foreach old_subport ${old_subports} {
</span> pre-activate {
foreach old_subport ${old_subports} {
if {![catch {set installed [lindex [registry_active ${old_subport}] 0]}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${installed_version} 2.8.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite ${old_subport} {} [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite ${old_subport} {} [list ports_nodepcheck 1]
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/buildbot/files/fieldMapping.patch b/devel/buildbot/files/fieldMapping.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8a6c43e2256..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/buildbot/files/fieldMapping.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix bad fieldMapping in change data endpoint. This resulted in 100% CPU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-usage for large installs as the data was filtered manually by Python.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/buildbot/buildbot/pull/5505
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- buildbot/data/changes.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ buildbot/data/changes.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,7 @@ def _fixChange(self, change):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- del change['sourcestampid']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fieldMapping = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'changeid': 'changes.id',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'changeid': 'changes.changeid',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>