<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/44e89072080542c252438ee23258638769f6fc9e">https://github.com/macports/macports-ports/commit/44e89072080542c252438ee23258638769f6fc9e</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 44e8907 VisualBoyAdvance: Don't redefine i and n
</span>44e8907 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 44e89072080542c252438ee23258638769f6fc9e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Oct 7 21:38:14 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> VisualBoyAdvance: Don't redefine i and n
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Trying to use the same name for two different variables, twice, can't
</span><span style='display:block; white-space:pre;color:#404040;'> have been good. Increase revision to ensure the bad code isn't used
</span><span style='display:block; white-space:pre;color:#404040;'> anymore.
</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/41770
</span>---
emulators/VisualBoyAdvance/Portfile | 9 ++++-
emulators/VisualBoyAdvance/files/debugger.patch | 54 +++++++++++++++++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/VisualBoyAdvance/Portfile b/emulators/VisualBoyAdvance/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ac47f6..be511fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/VisualBoyAdvance/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/VisualBoyAdvance/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,11 @@ PortSystem 1.0
</span>
name VisualBoyAdvance
version 1.7.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 cc02339e3fd8efd9f23121b0a2f81fd8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 cc02339e3fd8efd9f23121b0a2f81fd8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 44f94a4f270f2cda25879681c52892f6978caf99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1410762
</span>
maintainers nomaintainer
categories emulators games
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +28,8 @@ master_sites sourceforge:project/vba/${name}/${version}
</span> depends_lib port:libsdl \
port:libpng
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles debugger.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cxxflags-append \
-I${prefix}/include
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/VisualBoyAdvance/files/debugger.patch b/emulators/VisualBoyAdvance/files/debugger.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9031c21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/VisualBoyAdvance/files/debugger.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't conflate two different variables named "i" and two different
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variables named "n". Clang errors on these variable redefinitions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sdl/debugger.cpp.orig 2004-05-13 09:13:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sdl/debugger.cpp 2018-10-07 21:32:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1275,12 +1275,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ASCII(c) (c) < 32 ? '.' : (c) > 127 ? '.' : (c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void debuggerMemoryByte(int n, char **args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debuggerMemoryByte(int nn, char **args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(n == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(nn == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u32 addr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sscanf(args[1], "%x", &addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(int i = 0; i < 16; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(int ii = 0; ii < 16; ii++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a = debuggerReadByte(addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int b = debuggerReadByte(addr+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int c = debuggerReadByte(addr+2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1310,13 +1310,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debuggerUsage("mb");
</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;'>+-void debuggerMemoryHalfWord(int n, char **args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debuggerMemoryHalfWord(int nn, char **args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(n == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(nn == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u32 addr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sscanf(args[1], "%x", &addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addr = addr & 0xfffffffe;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(int i = 0; i < 16; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(int ii = 0; ii < 16; ii++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a = debuggerReadByte(addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int b = debuggerReadByte(addr+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int c = debuggerReadByte(addr+2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1346,13 +1346,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debuggerUsage("mh");
</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;'>+-void debuggerMemory(int n, char **args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debuggerMemory(int nn, char **args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(n == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(nn == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u32 addr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sscanf(args[1], "%x", &addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addr = addr & 0xfffffffc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(int i = 0; i < 16; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(int ii = 0; ii < 16; ii++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a = debuggerReadByte(addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int b = debuggerReadByte(addr+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int c = debuggerReadByte(addr+2);
</span></pre><pre style='margin:0'>
</pre>