<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/24bf2b0b1bda5f8eb6630bbf73745fc4bb1654b0">https://github.com/macports/macports-ports/commit/24bf2b0b1bda5f8eb6630bbf73745fc4bb1654b0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 24bf2b0 wine*: Verify gecko/mono versions after extracting
</span>24bf2b0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 24bf2b0b1bda5f8eb6630bbf73745fc4bb1654b0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 14 18:24:17 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine*: Verify gecko/mono versions after extracting
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of relying on the maintainer to remember to verify manually that
</span><span style='display:block; white-space:pre;color:#404040;'> the wine gecko and wine mono versions are correct after every update, do
</span><span style='display:block; white-space:pre;color:#404040;'> so automatically so that the maintainer can't forget.
</span>---
x11/wine-crossover/Portfile | 28 +++++++++++++++++++++++-----
x11/wine-devel/Portfile | 28 +++++++++++++++++++++++-----
x11/wine/Portfile | 28 +++++++++++++++++++++++-----
3 files changed, 69 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/Portfile b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 090526a..44a4c96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,6 @@ PortGroup compiler_blacklist_versions 1.0
</span>
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When updating the version of wine, update wine_gecko and wine_mono to compatible versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as referenced in the source code. Check here by replacing X.Y with the version:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://source.winehq.org/git/wine.git/blob/refs/tags/wine-X.Y:/dlls/appwiz.cpl/addons.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see also http://wiki.winehq.org/Gecko and http://wiki.winehq.org/Mono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Crossover-specific bug reports are accepted at info@codeweavers.com
name wine-crossover
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,6 +94,29 @@ depends_build port:bison \
</span> port:flex \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${worksrcpath}/dlls/appwiz.cpl/addons.c r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set file_contents [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach addon {gecko mono} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set addon_version_var wine_${addon}_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set addon_version_in_port [set ${addon_version_var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp -lineanchor "^#define [string toupper $addon]_VERSION \"(\[^\"\]+)\"$" ${file_contents} -> addon_version_in_file] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${addon_version_in_port} ne ${addon_version_in_file}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${addon_version_var} should be ${addon_version_in_file} not ${addon_version_in_port}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Could not determine what ${addon_version_var} should be"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${ok}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles BOOL.patch \
cups_headers.patch \
mach_machine.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/Portfile b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc095e5..c22e81d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,6 @@ PortGroup compiler_blacklist_versions 1.0
</span>
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When updating the version of wine, update wine_gecko and wine_mono to compatible versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as referenced in the source code. Check here by replacing X.Y with the version:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://source.winehq.org/git/wine.git/blob/refs/tags/wine-X.Y:/dlls/appwiz.cpl/addons.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see also http://wiki.winehq.org/Gecko and http://wiki.winehq.org/Mono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name wine-devel
conflicts wine wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,6 +93,29 @@ depends_build port:bison \
</span> port:flex \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${worksrcpath}/dlls/appwiz.cpl/addons.c r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set file_contents [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach addon {gecko mono} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set addon_version_var wine_${addon}_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set addon_version_in_port [set ${addon_version_var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp -lineanchor "^#define [string toupper $addon]_VERSION \"(\[^\"\]+)\"$" ${file_contents} -> addon_version_in_file] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${addon_version_in_port} ne ${addon_version_in_file}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${addon_version_var} should be ${addon_version_in_file} not ${addon_version_in_port}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Could not determine what ${addon_version_var} should be"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${ok}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles BOOL.patch \
cups_headers.patch \
fix-flicker.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa13f86..3e06712 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,6 @@ PortGroup compiler_blacklist_versions 1.0
</span>
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When updating the version of wine, update wine_gecko and wine_mono to compatible versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as referenced in the source code. Check here by replacing X.Y with the version:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://source.winehq.org/git/wine.git/blob/refs/tags/wine-X.Y:/dlls/appwiz.cpl/addons.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see also http://wiki.winehq.org/Gecko and http://wiki.winehq.org/Mono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name wine
conflicts wine-devel wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,6 +93,29 @@ depends_build port:bison \
</span> port:flex \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${worksrcpath}/dlls/appwiz.cpl/addons.c r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set file_contents [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach addon {gecko mono} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set addon_version_var wine_${addon}_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set addon_version_in_port [set ${addon_version_var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp -lineanchor "^#define [string toupper $addon]_VERSION \"(\[^\"\]+)\"$" ${file_contents} -> addon_version_in_file] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${addon_version_in_port} ne ${addon_version_in_file}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${addon_version_var} should be ${addon_version_in_file} not ${addon_version_in_port}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ok no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Could not determine what ${addon_version_var} should be"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${ok}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles BOOL.patch \
cups_headers.patch \
fix-flicker.patch \
</pre><pre style='margin:0'>
</pre>