[81019] trunk/dports/aqua/qt4-mac

[raimue at macports.org]

Revision: 81019
          http://trac.macports.org/changeset/81019
Author:   raimue at macports.org
Date:     2011-07-23 08:20:04 -0700 (Sat, 23 Jul 2011)
Log Message:
-----------
aqua/qt4-mac:
Fix a build error on Lion, closes #30262
This port will still not compile successfully on Lion due to #30271
Committing with permission of maintainer.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2011-07-23 14:23:58 UTC (rev 81018)
+++ trunk/dports/aqua/qt4-mac/Portfile	2011-07-23 15:20:04 UTC (rev 81019)
@@ -82,6 +82,9 @@
 # (6) fix use of CARBON, found on PPC64, but will work on any system
 patchfiles-append   patch-PluginView-no-carbon.diff
 
+# (7) fix use of NSDragOperation on OS X 10.7
+patchfiles-append   patch-NSDragOperation.diff
+
 global TARGET
 set TARGET ""
 

Added: trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-NSDragOperation.diff	2011-07-23 15:20:04 UTC (rev 81019)
@@ -0,0 +1,54 @@
+From 1537d131e59e4fb43001299cfbd747c521fa1888 Mon Sep 17 00:00:00 2001
+From: Mike McQuaid <mike.mcquaid at kdab.com>
+Date: Thu, 21 Jul 2011 10:35:01 -0400
+Subject: [PATCH] Fix compilation under OSX 10.7 or using llvm-gcc.
+
+Use correct error codes instead of type errors.
+Thanks to Dylan Luke <lukes.dylan at gmail.com> for this patch.
+---
+ src/gui/kernel/qcocoasharedwindowmethods_mac_p.h |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+index 9c110fd..94974fc 100644
+--- src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
++++ src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+@@ -309,7 +309,7 @@ QT_END_NAMESPACE
+ 
+     QWidget *target = [self dragTargetHitTest:sender];
+     if (!target)
+-        return [super draggingEntered:sender];
++        return NSDragOperationNone;
+     if (target->testAttribute(Qt::WA_DropSiteRegistered) == false)
+         return NSDragOperationNone;
+ 
+@@ -321,7 +321,7 @@ QT_END_NAMESPACE
+ {
+     QWidget *target = [self dragTargetHitTest:sender];
+     if (!target)
+-        return [super draggingUpdated:sender];
++        return NSDragOperationNone;
+ 
+     if (target == *currentDragTarget()) {
+         // The drag continues to move over the widget that we have sendt
+@@ -345,7 +345,7 @@ QT_END_NAMESPACE
+ {
+     QWidget *target = [self dragTargetHitTest:sender];
+     if (!target)
+-        return [super draggingExited:sender];
++        return;
+ 
+     if (*currentDragTarget()) {
+         [reinterpret_cast<NSView *>((*currentDragTarget())->winId()) draggingExited:sender];
+@@ -357,7 +357,7 @@ QT_END_NAMESPACE
+ {
+     QWidget *target = [self dragTargetHitTest:sender];
+     if (!target)
+-        return [super performDragOperation:sender];
++        return NO;
+ 
+     BOOL dropResult = NO;
+     if (*currentDragTarget()) {
+-- 
+1.6.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110723/2b1b07a0/attachment.html>