<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/d8906db1cd20637c750a5670d68312426221fa51">https://github.com/macports/macports-ports/commit/d8906db1cd20637c750a5670d68312426221fa51</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 d8906db1cd2 lisaem: Fix compiler error with const char *
</span>d8906db1cd2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d8906db1cd20637c750a5670d68312426221fa51
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 16 19:09:10 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> lisaem: Fix compiler error with const char *
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56333
</span>---
emulators/lisaem/Portfile | 16 +++-------------
emulators/lisaem/files/const.patch | 23 +++++++++++++++++++++++
2 files changed, 26 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/lisaem/Portfile b/emulators/lisaem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5090998997f..29c04834f85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/lisaem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/lisaem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup wxWidgets 1.0
</span> name lisaem
version 1.2.6
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign}
</span> platforms darwin
categories emulators
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,8 @@ checksums \
</span> patchfiles \
patch-build.sh.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append const.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.cmd ./build.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,18 +62,6 @@ pre-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # lisaem 1.2.6_0 installed items to /usr/local/bin; remove them if found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file {lisadiskinfo lisafsh-tool} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set filepath /usr/local/bin/${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {delete ${filepath}}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Cannot delete ${filepath}; please remove it manually"
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # the two wxWidgets variants can go away if lisaem gets ported to wxWidgets-3.0
variant wxwidgets28 conflicts wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
wxWidgets.use wxWidgets-2.8
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/lisaem/files/const.patch b/emulators/lisaem/files/const.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c15be488a45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/lisaem/files/const.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: assigning to 'char *' from incompatible type 'const char *'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This fix is included in 1.2.6.2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+There is no commit URL because the developer did not start using git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+until after making this fix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wxui/lisaem_wx.cpp.orig 2007-12-05 18:02:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wxui/lisaem_wx.cpp 2020-10-16 19:01:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1745,9 +1745,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // override config file on startup if passed a parameter.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc>1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *ext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv1.Printf(_T("%s"),argv[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ext=strstr(argv1.fn_str(),".lisaem");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *ext=strstr(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (const char *)(argv1.fn_str()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (const char *)(".lisaem"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ext!=NULL && strlen(ext)==7) // ensure the proper extension is contained.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>