[142886] trunk/dports/x11

[jeremyhu at macports.org]

Revision: 142886
          https://trac.macports.org/changeset/142886
Author:   jeremyhu at macports.org
Date:     2015-11-25 21:11:08 -0800 (Wed, 25 Nov 2015)
Log Message:
-----------
wine*: Address a potential build failure

Modified Paths:
--------------
    trunk/dports/x11/wine/Portfile
    trunk/dports/x11/wine-crossover/Portfile
    trunk/dports/x11/wine-devel/Portfile

Added Paths:
-----------
    trunk/dports/x11/wine/files/kVK_RightCommand_macro.patch
    trunk/dports/x11/wine-crossover/files/kVK_RightCommand_macro.patch
    trunk/dports/x11/wine-devel/files/kVK_RightCommand_macro.patch

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2015-11-26 03:18:34 UTC (rev 142885)
+++ trunk/dports/x11/wine/Portfile	2015-11-26 05:11:08 UTC (rev 142886)
@@ -114,6 +114,7 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
+                            kVK_RightCommand_macro.patch \
                             tiger-shell.patch
 
 configure.ldflags-append    -framework CoreServices \

Added: trunk/dports/x11/wine/files/kVK_RightCommand_macro.patch
===================================================================
--- trunk/dports/x11/wine/files/kVK_RightCommand_macro.patch	                        (rev 0)
+++ trunk/dports/x11/wine/files/kVK_RightCommand_macro.patch	2015-11-26 05:11:08 UTC (rev 142886)
@@ -0,0 +1,16 @@
+--- dlls/winemac.drv/cocoa_window.m.orig	2015-11-20 05:46:54.000000000 -0800
++++ dlls/winemac.drv/cocoa_window.m	2015-11-25 14:31:43.000000000 -0800
+@@ -44,10 +44,9 @@ enum {
+ 
+ 
+ /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */
+-enum {
+-    kVK_RightCommand              = 0x36, /* Invented for Wine; was unused */
+-};
+-
++#ifndef kVK_RightCommand
++#define kVK_RightCommand 0x36
++#endif
+ 
+ static NSUInteger style_mask_for_features(const struct macdrv_window_features* wf)
+ {

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2015-11-26 03:18:34 UTC (rev 142885)
+++ trunk/dports/x11/wine-crossover/Portfile	2015-11-26 05:11:08 UTC (rev 142886)
@@ -95,6 +95,7 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
+                            kVK_RightCommand_macro.patch \
                             patch-include-distversion.h.diff
 
 configure.ldflags-append    -framework CoreServices \

Added: trunk/dports/x11/wine-crossover/files/kVK_RightCommand_macro.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/kVK_RightCommand_macro.patch	                        (rev 0)
+++ trunk/dports/x11/wine-crossover/files/kVK_RightCommand_macro.patch	2015-11-26 05:11:08 UTC (rev 142886)
@@ -0,0 +1,16 @@
+--- dlls/winemac.drv/cocoa_window.m.orig	2015-11-20 05:46:54.000000000 -0800
++++ dlls/winemac.drv/cocoa_window.m	2015-11-25 14:31:43.000000000 -0800
+@@ -44,10 +44,9 @@ enum {
+ 
+ 
+ /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */
+-enum {
+-    kVK_RightCommand              = 0x36, /* Invented for Wine; was unused */
+-};
+-
++#ifndef kVK_RightCommand
++#define kVK_RightCommand 0x36
++#endif
+ 
+ static NSUInteger style_mask_for_features(const struct macdrv_window_features* wf)
+ {

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2015-11-26 03:18:34 UTC (rev 142885)
+++ trunk/dports/x11/wine-devel/Portfile	2015-11-26 05:11:08 UTC (rev 142886)
@@ -113,6 +113,7 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
+                            kVK_RightCommand_macro.patch \
                             tiger-shell.patch
 
 # Wine requires the program specified in INSTALL to create intermediate

Added: trunk/dports/x11/wine-devel/files/kVK_RightCommand_macro.patch
===================================================================
--- trunk/dports/x11/wine-devel/files/kVK_RightCommand_macro.patch	                        (rev 0)
+++ trunk/dports/x11/wine-devel/files/kVK_RightCommand_macro.patch	2015-11-26 05:11:08 UTC (rev 142886)
@@ -0,0 +1,16 @@
+--- dlls/winemac.drv/cocoa_window.m.orig	2015-11-20 05:46:54.000000000 -0800
++++ dlls/winemac.drv/cocoa_window.m	2015-11-25 14:31:43.000000000 -0800
+@@ -44,10 +44,9 @@ enum {
+ 
+ 
+ /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */
+-enum {
+-    kVK_RightCommand              = 0x36, /* Invented for Wine; was unused */
+-};
+-
++#ifndef kVK_RightCommand
++#define kVK_RightCommand 0x36
++#endif
+ 
+ static NSUInteger style_mask_for_features(const struct macdrv_window_features* wf)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/976e2e56/attachment.html>