[72955] trunk/dports/aqua/qt3-mac

30 Oct 2010

Revision: 72955
          http://trac.macports.org/changeset/72955
Author:   jmr@macports.org
Date:     2010-10-30 13:13:56 -0700 (Sat, 30 Oct 2010)
Log Message:
-----------
qt3-mac: update to 3.3.8b, fix build on 10.6 (#21459), remove bogus symlink (#2255)

Modified Paths:
--------------
    trunk/dports/aqua/qt3-mac/Portfile
    trunk/dports/aqua/qt3-mac/files/fix_install_names.sh
    trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff

Added Paths:
-----------
    trunk/dports/aqua/qt3-mac/files/dlcompat.diff
    trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff
    trunk/dports/aqua/qt3-mac/files/reinplace_support.diff

Modified: trunk/dports/aqua/qt3-mac/Portfile
===================================================================

--- trunk/dports/aqua/qt3-mac/Portfile	2010-10-30 20:12:56 UTC (rev 72954)
+++ trunk/dports/aqua/qt3-mac/Portfile	2010-10-30 20:13:56 UTC (rev 72955)
@@ -3,22 +3,20 @@
 PortSystem		1.0
 
 name			qt3-mac
-version			3.3.8
-revision		1
+version			3.3.8b
 categories		aqua
 maintainers		blair openmaintainer
 description		Qt Tool Kit (Native Aqua Version)
 long_description	This is Qt, TrollTech's C++ toolkit for writing \
 				cross-platform GUI applications.
 homepage		http://qt.nokia.com/
-master_sites		ftp://ftp.trolltech.com/qt/source/ \
-			http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/ \
-			macports:blair
+master_sites		trolltech
 distname		qt-mac-free-${version}
-checksums		md5 dc8013ea4e5b54849f1ed5eedf6b03a3 \
-			sha1 b4835adbf5afc15042ce25270e684df395fe897c \
-			rmd160 dd2bfc62488e2d0dd500df4899aeaf28738bd8b0
+checksums		md5 307eebaa3ee3653595116ad6de36167c \
+			sha1 b366c077179c2e95c04c35da013a282f6b270ada \
+			rmd160 a71ec4140371c88bf5e29c1c2886f02d643a4a57
 platforms		darwin
+supported_archs	i386 ppc
 destroot.violate_mtree	yes
 
 depends_lib		port:zlib port:libpng port:libmng
@@ -70,21 +68,41 @@
 platform darwin	{
 	patchfiles		patch-src-qt_install.pri \
 					patch-mkspecs-qmake.conf \
-          qt3-leopard.diff
+					patch-qmake_Makefile.unix.diff \
+					qt3-leopard.diff \
+					reinplace_support.diff \
+					dlcompat.diff
+    configure.args-append -ldl
+    post-patch {
+        reinplace s|__CC__|${configure.cc}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf
+        reinplace s|__CXX__|${configure.cxx}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf \
+                                              ${worksrcpath}/config.tests/mac/mac_version.test
+        if {[variant_isset universal]} {
+            set archflags ${configure.universal_cflags}
+        } else {
+            set archflags ${configure.cc_archflags}
+        }
+        reinplace s/__ARCHFLAGS__/${archflags}/ ${worksrcpath}/mkspecs/macx-g++/qmake.conf \
+                                                ${worksrcpath}/config.tests/mac/mac_version.test
+        if {!${configure.pipe}} {
+            reinplace s/-pipe// ${worksrcpath}/mkspecs/macx-g++/qmake.conf
+        }
+    }
 	post-destroot {
-		system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}'"
+		system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}' '${frameworks_dir}'"
 		set appPath ${destroot}${applications_dir}/Qt3
 		xinstall -d -m 0755 ${appPath}
 		foreach app {assistant designer linguist qtconfig} {
 			system "mv -v ${destroot}${prefix}/bin/${app}.app \
 				${appPath}/${app}.app"
 		}
-		if {![file exists ${destroot}${prefix}/lib/libqt.dylib]} {
-			set majorver [strsed ${version} {s/\.[0-9]*\.[0-9]*$//}]
-			set minorver [strsed ${version} {s/\.[0-9]*$//}]
-			system "ln -s libqt-mt.${version}.dylib ${destroot}${prefix}/lib/libqt.dylib"
-			system "ln -s libqt-mt.${version}.dylib ${destroot}${prefix}/lib/libqt.${majorver}.dylib"
-			system "ln -s libqt-mt.${version}.dylib ${destroot}${prefix}/lib/libqt.${minorver}.dylib"
+		regexp {[0-9.]+} $version baseversion
+		set majorver [lindex [split ${baseversion} .] 0]
+		set minorver [join [lrange [split ${baseversion} .] 0 1] .]
+		foreach libname "libqt libqt.${majorver} libqt.${minorver}" {
+		    if {![file exists "${destroot}${prefix}/lib/${libname}.dylib"]} {
+		        ln -s libqt-mt.${baseversion}.dylib "${destroot}${prefix}/lib/${libname}.dylib"
+		    }
 		}
 	}
 }

Added: trunk/dports/aqua/qt3-mac/files/dlcompat.diff
===================================================================
--- trunk/dports/aqua/qt3-mac/files/dlcompat.diff	                        (rev 0)
+++ trunk/dports/aqua/qt3-mac/files/dlcompat.diff	2010-10-30 20:13:56 UTC (rev 72955)
@@ -0,0 +1,43 @@
+--- src/network/qdns.cpp.orig	2008-01-16 06:08:57.000000000 +1100
++++ src/network/qdns.cpp	2010-10-31 05:23:32.000000000 +1100
+@@ -79,7 +79,7 @@
+ #include "qcleanuphandler.h"
+ #include <limits.h>
+ #ifdef Q_OS_MAC
+-#include "../3rdparty/dlcompat/dlfcn.h"
++#include <dlfcn.h>
+ #endif
+ 
+ //#define QDNS_DEBUG
+@@ -113,7 +113,7 @@
+     typedef int (*PtrRes_init)();
+     static PtrRes_init ptrRes_init = 0;
+     if (!ptrRes_init)
+-	ptrRes_init = (PtrRes_init)DL_PREFIX(dlsym)(RTLD_NEXT, "res_init");
++	ptrRes_init = (PtrRes_init)dlsym(RTLD_NEXT, "res_init");
+     if (ptrRes_init)
+ 	return (*ptrRes_init)();
+     else
+--- src/qt_professional.pri.orig	2008-01-16 06:08:57.000000000 +1100
++++ src/qt_professional.pri	2010-10-31 05:25:25.000000000 +1100
+@@ -25,7 +25,6 @@
+ 	unix {
+ 		NETWORK_H	= $$NETWORK_CPP
+ 	}
+-	mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat
+ 	INCLUDEPATH += $$QT_SOURCE_TREE/src/network
+ 	include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
+ 	DEFINES     *= QT_MODULE_NETWORK
+--- src/tools/qt_tools.pri.orig	2008-01-16 06:08:57.000000000 +1100
++++ src/tools/qt_tools.pri	2010-10-31 05:29:29.000000000 +1100
+@@ -101,10 +101,6 @@
+ 		  $$TOOLS_CPP/qwaitcondition_unix.cpp
+ 
+         mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
+-	mac {
+-		SOURCES+=3rdparty/dlcompat/dlfcn.c
+-		INCLUDEPATH+=3rdparty/dlcompat
+-	    }
+ 	unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
+ 
+ 	SOURCES += $$TOOLS_CPP/qbitarray.cpp \

Modified: trunk/dports/aqua/qt3-mac/files/fix_install_names.sh
===================================================================
--- trunk/dports/aqua/qt3-mac/files/fix_install_names.sh	2010-10-30 20:12:56 UTC (rev 72954)
+++ trunk/dports/aqua/qt3-mac/files/fix_install_names.sh	2010-10-30 20:13:56 UTC (rev 72955)
@@ -2,14 +2,15 @@
 
 PREFIX="$1"; shift
 DESTROOT="$1"; shift
+FRAMEWORKS_DIR="$1"; shift
 LIBS="libqt-mt.3.dylib libqui.1.dylib"
 
-if [ -z "$PREFIX" ] || [ -z "$DESTROOT" ]; then
-	echo "usage: $0 <prefix> <destroot>"
+if [ -z "$PREFIX" ] || [ -z "$DESTROOT" ] || [ -z "$FRAMEWORKS_DIR" ]; then
+	echo "usage: $0 <prefix> <destroot> <frameworks_dir>"
 	exit 1
 fi
 
-(set -x; install_name_tool -id "/Library/Frameworks/Qt.framework/Qt" "${DESTROOT}/Library/Frameworks/Qt.framework/Qt")
+(set -x; install_name_tool -id "/Library/Frameworks/Qt.framework/Qt" "${DESTROOT}${FRAMEWORKS_DIR}/Qt.framework/Qt")
 
 for lib in $LIBS; do
 	(set -x; install_name_tool -id "${PREFIX}/lib/${lib}" "${DESTROOT}${PREFIX}/lib/${lib}")

Added: trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff
===================================================================
--- trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff	                        (rev 0)
+++ trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff	2010-10-30 20:13:56 UTC (rev 72955)
@@ -0,0 +1,11 @@
+--- qmake/Makefile.unix.orig	2008-01-16 06:08:58.000000000 +1100
++++ qmake/Makefile.unix	2010-10-31 06:53:45.000000000 +1100
+@@ -49,7 +49,7 @@
+ 	-cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@
+ 	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
+ 	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
+-	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
++#	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
+ 
+ clean::
+ 	rm -f $(OBJS) $(QOBJS)

Modified: trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff
===================================================================
--- trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff	2010-10-30 20:12:56 UTC (rev 72954)
+++ trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff	2010-10-30 20:13:56 UTC (rev 72955)
@@ -22,7 +22,7 @@
 ===================================================================
 --- src/tools/qglobal.h	2008-03-25 22:34:33.000000000 -0600
 +++ src/tools/qglobal.h	2008-03-25 22:35:07.000000000 -0600
-@@ -186,7 +186,10 @@
+@@ -186,7 +186,13 @@
  #  if !defined(MAC_OS_X_VERSION_10_4)
  #       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
  #  endif
@@ -30,7 +30,10 @@
 +#  if !defined(MAC_OS_X_VERSION_10_5)
 +#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
 +#  endif
-+#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
++#  if !defined(MAC_OS_X_VERSION_10_6)
++#       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
++#  endif
++#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
  #    error "This version of Mac OS X is unsupported"
  #  endif
  #endif

Added: trunk/dports/aqua/qt3-mac/files/reinplace_support.diff
===================================================================
--- trunk/dports/aqua/qt3-mac/files/reinplace_support.diff	                        (rev 0)
+++ trunk/dports/aqua/qt3-mac/files/reinplace_support.diff	2010-10-30 20:13:56 UTC (rev 72955)
@@ -0,0 +1,52 @@
+--- mkspecs/macx-g++/qmake.conf.orig	2010-10-31 04:42:49.000000000 +1100
++++ mkspecs/macx-g++/qmake.conf	2010-10-31 04:46:16.000000000 +1100
+@@ -8,7 +8,7 @@
+ CONFIG			+= qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+ QMAKE_INCREMENTAL_STYLE = sublibs
+ 
+-QMAKE_CC		= cc
++QMAKE_CC		= __CC__
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+@@ -17,7 +17,7 @@
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+ QMAKE_RESOURCE		= /Developer/Tools/Rez
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe __ARCHFLAGS__
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
+@@ -27,7 +27,7 @@
+ QMAKE_EXTENSION_SHLIB	= dylib
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ 
+-QMAKE_CXX		= c++
++QMAKE_CXX		= __CXX__
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+@@ -45,7 +45,7 @@
+ 
+ QMAKE_LINK		= $$QMAKE_CXX
+ QMAKE_LINK_SHLIB	= $$QMAKE_CXX
+-QMAKE_LFLAGS		= -headerpad_max_install_names
++QMAKE_LFLAGS		= -headerpad_max_install_names __ARCHFLAGS__
+ #QMAKE_LFLAGS_PREBIND    = -seg1addr 0x90000000
+ QMAKE_LFLAGS_RELEASE	=
+ QMAKE_LFLAGS_DEBUG	=
+--- config.tests/mac/mac_version.test.orig	2010-10-31 04:42:49.000000000 +1100
++++ config.tests/mac/mac_version.test	2010-10-31 04:54:48.000000000 +1100
+@@ -27,9 +27,9 @@
+ 
+ COMPILE_ERROR=yes
+ if [ "$VERBOSE" = "yes" ]; then
+-    c++ $TSTFILE -o tst_mac_version -framework Carbon >&2 && COMPILE_ERROR=no
++    __CXX__ $TSTFILE -o tst_mac_version __ARCHFLAGS__ -framework Carbon >&2 && COMPILE_ERROR=no
+ else
+-    c++ $TSTFILE -o tst_mac_version -framework Carbon >/dev/null 2>&1 && COMPILE_ERROR=no
++    __CXX__ $TSTFILE -o tst_mac_version __ARCHFLAGS__ -framework Carbon >/dev/null 2>&1 && COMPILE_ERROR=no
+ fi
+ 
+ # done

    

jmr＠macports.org

tags

participants (1)