Update to Qt 4.3.1.

2 files changed, 40 insertions, 24 deletions

diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index 72d48c915582..0c2f55e1a9b9 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -18,9 +18,9 @@ COMMENT=	Multiplatform C++ application framework (metaport)
 
 OPTIONS=	SQL_PLUGINS "Database connectivity plugins for QtSql" off
 
-RUN_DEPENDS=	${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so:${PORTSDIR}/accessibility/qt4-accessible \
-		${LOCALBASE}/lib/plugins/codecs/libqcncodecs.so:${PORTSDIR}/chinese/qt4-codecs-cn \
-		${LOCALBASE}/lib/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/chinese/qt4-codecs-tw \
+RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so:${PORTSDIR}/accessibility/qt4-accessible \
+		${LOCALBASE}/lib/qt4/plugins/codecs/libqcncodecs.so:${PORTSDIR}/chinese/qt4-codecs-cn \
+		${LOCALBASE}/lib/qt4/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/chinese/qt4-codecs-tw \
 		${LOCALBASE}/lib/libQtSql.so:${PORTSDIR}/databases/qt4-sql \
 		qdbus:${PORTSDIR}/devel/dbus-qt4 \
 		qdbusviewer:${PORTSDIR}/devel/qt4-qdbusviewer \
@@ -40,17 +40,17 @@ RUN_DEPENDS=	${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so
 		uic-qt4:${PORTSDIR}/devel/qt4-uic \
 		uic3:${PORTSDIR}/devel/qt4-uic3 \
 		${LOCALBASE}/lib/libQtTest.so:${PORTSDIR}/devel/qt4-qtestlib \
-		${LOCALBASE}/lib/plugins/imageformats/libqgif.so:${PORTSDIR}/graphics/qt4-imageformats \
+		${LOCALBASE}/lib/qt4/plugins/imageformats/libqgif.so:${PORTSDIR}/graphics/qt4-imageformats \
 		${LOCALBASE}/lib/libQtSvg.so:${PORTSDIR}/graphics/qt4-svg \
-		${LOCALBASE}/lib/plugins/iconengines/libqsvg.so:${PORTSDIR}/graphics/qt4-iconengines \
+		${LOCALBASE}/lib/qt4/plugins/iconengines/libqsvg.so:${PORTSDIR}/graphics/qt4-iconengines \
 		pixeltool:${PORTSDIR}/graphics/qt4-pixeltool \
-		${LOCALBASE}/lib/plugins/codecs/libqjpcodecs.so:${PORTSDIR}/japanese/qt4-codecs-jp \
-		${LOCALBASE}/lib/plugins/codecs/libqkrcodecs.so:${PORTSDIR}/korean/qt4-codecs-kr \
+		${LOCALBASE}/lib/qt4/plugins/codecs/libqjpcodecs.so:${PORTSDIR}/japanese/qt4-codecs-jp \
+		${LOCALBASE}/lib/qt4/plugins/codecs/libqkrcodecs.so:${PORTSDIR}/korean/qt4-codecs-kr \
 		qtconfig-qt4:${PORTSDIR}/misc/qt4-qtconfig \
 		${LOCALBASE}/lib/libQtNetwork.so:${PORTSDIR}/net/qt4-network \
 		${LOCALBASE}/lib/libQtXml.so:${PORTSDIR}/textproc/qt4-xml \
 		${LOCALBASE}/lib/libQtOpenGL.so:${PORTSDIR}/x11/qt4-opengl \
-		${LOCALBASE}/lib/plugins/inputmethods/libqimsw-multi.so:${PORTSDIR}/x11/qt4-inputmethods \
+		${LOCALBASE}/lib/qt4/plugins/inputmethods/libqimsw-multi.so:${PORTSDIR}/x11/qt4-inputmethods \
 		${LOCALBASE}/lib/libQtGui.so:${PORTSDIR}/x11-toolkits/qt4-gui
 
 NO_BUILD=	yes
@@ -59,12 +59,12 @@ NO_BUILD=	yes
 .include "${.CURDIR}/../../Mk/bsd.qt.mk"
 
 .if defined(WITH_SQL_PLUGINS)
-RUN_DEPENDS+=	${LOCALBASE}/lib/plugins/sqldrivers/libqsqlibase.so:${PORTSDIR}/databases/qt4-ibase-plugin \
-		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \
-		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlodbc.so:${PORTSDIR}/databases/qt4-odbc-plugin \
-		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpgsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin \
-		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlsqlite.so:${PORTSDIR}/databases/qt4-sqlite-plugin \
-		${LOCALBASE}/lib/plugins/sqldrivers/libqsqlsqlite3.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
+RUN_DEPENDS+=	${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlibase.so:${PORTSDIR}/databases/qt4-ibase-plugin \
+		${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \
+		${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlodbc.so:${PORTSDIR}/databases/qt4-odbc-plugin \
+		${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin \
+		${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \
+		${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
 .endif
 
 do-install:	#empty
diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure
index 702882753b01..b59d302adc5f 100644
--- a/devel/qt4/files/configure
+++ b/devel/qt4/files/configure
@@ -589,6 +589,7 @@ l_FLAGS=
 QCONFIG_FLAGS=
 XPLATFORM=
 PLATFORM=$QMAKESPEC
+QT_CROSS_COMPILE=no
 OPT_CONFIRM_LICENSE=no
 OPT_SHADOW=maybe
 OPT_FAST=auto
@@ -2013,6 +2014,7 @@ else
   XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
 fi
 if [ "$PLATFORM" != "$XPLATFORM" ]; then
+    QT_CROSS_COMPILE=yes
     QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
 fi
 
@@ -2161,7 +2163,7 @@ else
         ARCH=i386
         ;;
     *:*:x86_64|*:*:amd64)
-        if [ "$PLATFORM" = "linux-g++-32" ]; then
+        if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
             if [ "$OPT_VERBOSE" = "yes" ]; then
                 echo "    32 bit on 64-bit AMD 80x86 (i386)"
             fi
@@ -2191,6 +2193,18 @@ else
     	fi
     	ARCH=s390
     	;;
+    *:*:arm*)
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    ARM (arm)"
+        fi
+        ARCH=arm
+        ;;
+    Linux:*:sparc*) 
+        if [ "$OPT_VERBOSE" = "yes" ]; then 
+            echo "    Linux on SPARC" 
+        fi 
+        ARCH=sparc 
+        ;; 
     *:*:*)
         if [ "$OPT_VERBOSE" = "yes" ]; then
             echo "    Trying '$UNAME_MACHINE'..."
@@ -2696,8 +2710,8 @@ Third Party Libraries:
  +  -system-zlib ....... Use zlib from the operating system.
                          See http://www.gzip.org/zlib
 
- *  -no-gif ............ Do not compile the plugin for GIF reading support.
-    -qt-gif ............ Compile the plugin for GIF reading support.
+    -no-gif ............ Do not compile the plugin for GIF reading support.
+ *  -qt-gif ............ Compile the plugin for GIF reading support.
                          See also src/plugins/imageformats/gif/qgifhandler.h
 
     -no-libtiff ........ Do not compile the plugin for TIFF support.
@@ -2971,7 +2985,7 @@ Qtopia Core only:
                           default ($CFG_QCONFIG).
 
     -depths <list> ...... Comma-separated list of supported bit-per-pixel
-                          depths, from: 4, 8, 16, 18, 24, and 32.
+                          depths, from: 1, 4, 8, 16, 18, 24, and 32.
 
     -qt-decoration-<style> ....Enable a decoration <style> in the QtGui library,
                                by default all available decorations are on.
@@ -3486,10 +3500,11 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
         fi
         if [ "$PLATFORM_MAC" = "yes" ]; then
             echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile"
-            echo "CARBON_LFLAGS =-framework CoreServices -framework CoreFoundation" >>"$mkfile"
+            echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+            echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
             EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
             EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
-            EXTRA_CXXFLAGS="$EXTRA_CFLAGS \$(CARBON_CXXFLAGS)"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
             EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
 	    if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then
@@ -3888,7 +3903,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
             if [ "$CFG_SQL_sqlite" != "no" ]; then
                 SQLITE_AUTODETECT_FAILED="no"
                 if [ "$CFG_SQLITE" = "system" ]; then
-                    if $WHICH pkg-config >/dev/null 2>&1; then
+                    if [ "$QT_CROSS_COMPILE" = "no" ] && $WHICH pkg-config >/dev/null 2>&1; then
                         QT_CFLAGS_SQLITE=`pkg-config --cflags sqlite3`
                         QT_LFLAGS_SQLITE=`pkg-config --libs sqlite3`
                     fi
@@ -3984,7 +3999,7 @@ fi
 
 # auto-detect libdbus-1 support
 if [ "$CFG_QDBUS" != "no" ]; then
-    if "$WHICH" pkg-config >/dev/null 2>&1 && \
+    if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pkg-config >/dev/null 2>&1 && \
         pkg-config --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then
         QT_CFLAGS_DBUS=`pkg-config --cflags dbus-1`
         QT_LIBS_DBUS=`pkg-config --libs dbus-1`
@@ -4202,7 +4217,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
 
     # auto-detect Glib support
     if [ "$CFG_GLIB" != "no" ]; then
-        if "$WHICH" pkg-config >/dev/null 2>&1; then
+        if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pkg-config >/dev/null 2>&1; then
             QT_CFLAGS_GLIB=`pkg-config --cflags glib-2.0 gthread-2.0`
             QT_LIBS_GLIB=`pkg-config --libs glib-2.0 gthread-2.0`
         fi
@@ -4491,6 +4506,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then
     echo
     echo "Choose pixel-depths to support:"
     echo
+    echo "   1. 1bpp black/white"
     echo "   4. 4bpp grayscale"
     echo "   8. 8bpp"
     echo "  16. 16bpp"
@@ -4507,7 +4523,7 @@ fi
 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
     for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
 	case $D in
-	    4|8|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
+	    1|4|8|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
 	esac
     done
 fi