<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3a9404d4b745c19f60dcd33ae19bcb485f841e4d">https://github.com/macports/macports-ports/commit/3a9404d4b745c19f60dcd33ae19bcb485f841e4d</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 3a9404d irrlicht: fix build on 10.9
</span>3a9404d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3a9404d4b745c19f60dcd33ae19bcb485f841e4d
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue Oct 8 16:44:12 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> irrlicht: fix build on 10.9
</span>---
devel/irrlicht/Portfile | 8 ++++++-
...h-irrlicht-cirrdevice.diff => patch-r5690.diff} | 26 ----------------------
devel/irrlicht/files/patch-r5869.diff | 26 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/Portfile b/devel/irrlicht/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index debbfb3..07d940e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/irrlicht/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,13 @@ pre-patch {
</span> reinplace "s/\r$//" ${worksrcpath}/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix missing SEvent.MouseInput Shift and Control values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-r5869.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix an errant typecast in one file, but not on 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} != 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-r5690.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# patch out test to exclude older zlib versions that fails on some mac systems like 10.6
patchfiles-append patch-pngpriv-zlib-test.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/files/patch-irrlicht-cirrdevice.diff b/devel/irrlicht/files/patch-r5690.diff
</span>similarity index 56%
rename from devel/irrlicht/files/patch-irrlicht-cirrdevice.diff
rename to devel/irrlicht/files/patch-r5690.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5b15780..396ad9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/irrlicht/files/patch-irrlicht-cirrdevice.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/files/patch-r5690.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,4 @@
</span> ------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-r5869 | cutealien | 2019-10-06 11:52:02 +0000 (Sun, 06 Oct 2019) | 3 lines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CIrrDeviceMacOSX now sets the SEvent.MouseInput Shift and Control values on mouse events like the other devices.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Thanks @ Zero King for patch (#321) (https://sourceforge.net/p/irrlicht/patches/321)
</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;'>-Index: source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5868)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5869)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1259,7 +1259,12 @@
</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;'>- if (post)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ievent.MouseInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postEventFromUser(ievent);
</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;'>- [NSApp sendEvent:(NSEvent *)event];
</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> r5690 | cutealien | 2019-01-23 12:49:24 +0000 (Wed, 23 Jan 2019) | 3 lines
Backport from trunk: Fix compilation on OSX and prevent capturing mouse cursor when Window is not on top (Patch #319.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/irrlicht/files/patch-r5869.diff b/devel/irrlicht/files/patch-r5869.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a3e7dee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/irrlicht/files/patch-r5869.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r5869 | cutealien | 2019-10-06 11:52:02 +0000 (Sun, 06 Oct 2019) | 3 lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CIrrDeviceMacOSX now sets the SEvent.MouseInput Shift and Control values on mouse events like the other devices.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Thanks @ Zero King for patch (#321) (https://sourceforge.net/p/irrlicht/patches/321)
</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;'>+Index: source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5868)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm (revision 5869)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1259,7 +1259,12 @@
</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 (post)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ievent.MouseInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postEventFromUser(ievent);
</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;'>+ [NSApp sendEvent:(NSEvent *)event];
</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></pre><pre style='margin:0'>
</pre>