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

[michaelld at macports.org]

Revision: 102396
          https://trac.macports.org/changeset/102396
Author:   michaelld at macports.org
Date:     2013-02-01 11:40:10 -0800 (Fri, 01 Feb 2013)
Log Message:
-----------
qt4-mac: None of these changes effect Qt's functionalty; hence no rev-bump

* addresses tickets #37874 and #37878;

* remove the build.target, since that is the default;

* improve tests for CPATH and LIBRARY_PATH;

* add patch to remove spurious and unnecessary struct declaration.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac/files/cpath/cpath.test
    trunk/dports/aqua/qt4-mac/files/library_path/library_path.test

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2013-02-01 19:14:43 UTC (rev 102395)
+++ trunk/dports/aqua/qt4-mac/Portfile	2013-02-01 19:40:10 UTC (rev 102396)
@@ -230,6 +230,11 @@
 patchfiles-append   \
     patch-tools_macdeployqt_shared_shared.cpp.diff
 
+# (25) fix spurious global struct declariation
+
+patchfiles-append   \
+    patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
+
 ###############################################
 
 # disable CCACHE for now (ticket #34856)
@@ -604,8 +609,6 @@
     compiler.library_path [join ${library_path} :]
 }
 
-build.target all
-
 # do not use DESTDIR directly in the destroot command; Qt uses DISTDIR
 # internally for other purposes, and instead uses INSTALL_ROOT for the
 # additional install root prefix.

Modified: trunk/dports/aqua/qt4-mac/files/cpath/cpath.test
===================================================================
--- trunk/dports/aqua/qt4-mac/files/cpath/cpath.test	2013-02-01 19:14:43 UTC (rev 102395)
+++ trunk/dports/aqua/qt4-mac/files/cpath/cpath.test	2013-02-01 19:40:10 UTC (rev 102396)
@@ -5,11 +5,14 @@
 VERBOSE=$2
 WORKDIR=$3
 
+done=no
 cd $3
+unset CPATH
 
 # (1) do the test, without CPATH; should fail
 if "$COMPILER" -nostdinc -c cpath_test.c 2>/dev/null 1>&2; then
-    true
+    echo "Compile seems to work even with CPATH not set; assuming CPATH does not work"
+    done=0
 else
     # (2) do the test, with CPATH set; should pass
     export CPATH=.
@@ -19,6 +22,9 @@
 fi
 rm -f cpath_test.o
 
+# if done above, assume it works and exit
+[ "$done" != "no" ] && exit $done
+
 if [ "$CPATH_SUPPORT" != "yes" ]; then
     [ "$VERBOSE" = "yes" ] && echo "CPATH support not detected"
     exit 0

Modified: trunk/dports/aqua/qt4-mac/files/library_path/library_path.test
===================================================================
--- trunk/dports/aqua/qt4-mac/files/library_path/library_path.test	2013-02-01 19:14:43 UTC (rev 102395)
+++ trunk/dports/aqua/qt4-mac/files/library_path/library_path.test	2013-02-01 19:40:10 UTC (rev 102396)
@@ -5,13 +5,16 @@
 VERBOSE=$2
 WORKDIR=$3
 
+done=no
 cd $3
+unset LIBRARY_PATH
 
 # (1) make the library
 if "$COMPILER" -dynamiclib -o library_path_lib.dylib library_path_lib.c 2>/dev/null 1>&2; then
     # (2) do the test, without LIBRARY_PATH; should fail
     if "$COMPILER" -nostdlib -nostdinc -I. -o library_path_test library_path_test.c -lrary_path_lib 2>/dev/null 1>&2; then
-	true
+	echo "Compile seems to work even with LIBRARY_PATH not set; assuming LIBRARY_PATH does not work"
+	done=0
     else
 	# (3) do the test, with LIBRARY_PATH set; should pass
 	export LIBRARY_PATH=.
@@ -21,11 +24,14 @@
     fi
     rm -f library_path_test.o library_path_test
 else
-    echo "Unable to compile library; assuming LIBRARY_PATH works"
-    exit 1
+    echo "Unable to compile library; please fix this issue"
+    done=0
 fi
 rm -f library_path_lib.dylib library_path_lib.o
 
+# if done above, assume it works and exit
+[ "$done" != "no" ] && exit $done
+
 if [ "$LIBRARY_PATH_SUPPORT" != "yes" ]; then
     [ "$VERBOSE" = "yes" ] && echo "LIBRARY_PATH support not detected"
     exit 0

Added: trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff	2013-02-01 19:40:10 UTC (rev 102396)
@@ -0,0 +1,11 @@
+--- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig	2013-02-01 11:18:44.000000000 -0500
++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h	2013-02-01 11:19:03.000000000 -0500
+@@ -155,7 +155,7 @@
+ void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
+ bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event);
+ inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); }
+-struct ::TabletProximityRec;
++// struct ::TabletProximityRec;
+ void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec);
+ Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags);
+ Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130201/d2faf951/attachment.html>