From 8bd00266dc1b89a8a7a9d6170d1d895ef285c905 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Mon, 16 Jul 2007 10:12:15 +0000 Subject: Update to Qt 4.3.0, introduce bsd.qt.mk. Approved by: portmgr (bsd.port.mk changes) --- devel/Makefile | 3 + devel/dbus-qt4/Makefile | 34 +- devel/dbus-qt4/distinfo | 6 +- devel/dbus-qt4/pkg-plist | 10 +- devel/qmake4/Makefile | 14 +- devel/qmake4/distinfo | 6 +- devel/qmake4/files/Makefile.bsd | 8 +- devel/qmake4/pkg-plist | 21 +- devel/qt4-assistant/Makefile | 30 +- devel/qt4-assistant/distinfo | 6 +- devel/qt4-assistant/pkg-plist | 1 + devel/qt4-corelib/Makefile | 43 +- devel/qt4-corelib/distinfo | 6 +- .../files/patch-qlocale_workaround_patch.txt | 11 - devel/qt4-corelib/files/patch-utf8-bug-qt4 | 132 ---- devel/qt4-corelib/pkg-plist | 17 +- devel/qt4-designer/Makefile | 38 +- devel/qt4-designer/distinfo | 6 +- devel/qt4-designer/pkg-plist | 21 +- devel/qt4-libqtassistantclient/Makefile | 33 +- devel/qt4-libqtassistantclient/distinfo | 6 +- devel/qt4-libqtassistantclient/pkg-plist | 6 +- devel/qt4-linguist/Makefile | 28 +- devel/qt4-linguist/distinfo | 6 +- devel/qt4-linguist/pkg-plist | 1 + devel/qt4-makeqpf/Makefile | 55 ++ devel/qt4-makeqpf/distinfo | 3 + .../qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp | 11 + devel/qt4-makeqpf/pkg-descr | 12 + devel/qt4-makeqpf/pkg-plist | 2 + devel/qt4-moc/Makefile | 20 +- devel/qt4-moc/distinfo | 6 +- devel/qt4-porting/Makefile | 25 +- devel/qt4-porting/distinfo | 6 +- devel/qt4-qdbusviewer/Makefile | 57 ++ devel/qt4-qdbusviewer/distinfo | 3 + devel/qt4-qdbusviewer/pkg-descr | 12 + devel/qt4-qdbusviewer/pkg-plist | 2 + devel/qt4-qt3support/Makefile | 30 +- devel/qt4-qt3support/distinfo | 6 +- devel/qt4-qt3support/pkg-plist | 6 +- devel/qt4-qtestlib/Makefile | 35 +- devel/qt4-qtestlib/distinfo | 6 +- devel/qt4-qtestlib/pkg-plist | 7 +- devel/qt4-qvfb/Makefile | 28 +- devel/qt4-qvfb/distinfo | 6 +- devel/qt4-qvfb/files/patch-qvfbshmem.cpp | 11 - devel/qt4-qvfb/files/patch-qwssignalhandler.cpp | 16 - devel/qt4-qvfb/pkg-plist | 118 +-- devel/qt4-rcc/Makefile | 18 +- devel/qt4-rcc/distinfo | 6 +- devel/qt4-script/Makefile | 68 ++ devel/qt4-script/distinfo | 3 + devel/qt4-script/pkg-descr | 12 + devel/qt4-script/pkg-plist | 32 + devel/qt4-uic/Makefile | 20 +- devel/qt4-uic/distinfo | 6 +- devel/qt4-uic3/Makefile | 26 +- devel/qt4-uic3/distinfo | 6 +- devel/qt4/Makefile | 8 +- devel/qt4/files/configure | 791 ++++++++++++++++----- 61 files changed, 1190 insertions(+), 782 deletions(-) delete mode 100644 devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt delete mode 100644 devel/qt4-corelib/files/patch-utf8-bug-qt4 create mode 100644 devel/qt4-makeqpf/Makefile create mode 100644 devel/qt4-makeqpf/distinfo create mode 100644 devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp create mode 100644 devel/qt4-makeqpf/pkg-descr create mode 100644 devel/qt4-makeqpf/pkg-plist create mode 100644 devel/qt4-qdbusviewer/Makefile create mode 100644 devel/qt4-qdbusviewer/distinfo create mode 100644 devel/qt4-qdbusviewer/pkg-descr create mode 100644 devel/qt4-qdbusviewer/pkg-plist delete mode 100644 devel/qt4-qvfb/files/patch-qvfbshmem.cpp delete mode 100644 devel/qt4-qvfb/files/patch-qwssignalhandler.cpp create mode 100644 devel/qt4-script/Makefile create mode 100644 devel/qt4-script/distinfo create mode 100644 devel/qt4-script/pkg-descr create mode 100644 devel/qt4-script/pkg-plist (limited to 'devel') diff --git a/devel/Makefile b/devel/Makefile index f4414270af20..075023cea3b2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1971,12 +1971,15 @@ SUBDIR += qt4-designer SUBDIR += qt4-libqtassistantclient SUBDIR += qt4-linguist + SUBDIR += qt4-makeqpf SUBDIR += qt4-moc SUBDIR += qt4-porting + SUBDIR += qt4-qdbusviewer SUBDIR += qt4-qt3support SUBDIR += qt4-qtestlib SUBDIR += qt4-qvfb SUBDIR += qt4-rcc + SUBDIR += qt4-script SUBDIR += qt4-uic SUBDIR += qt4-uic3 SUBDIR += qsa diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index cc6bfa612e10..52768b9b135e 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -7,37 +7,27 @@ # PORTNAME= dbus -PORTVERSION= 4.2.3 -PORTREVISION= 3 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} -PKGNAMESUFFIX= -qt4 +PKGNAMEPREFIX= qt4- DISTNAME= qt-x11-opensource-src-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 bindings for the D-BUS messaging system -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 -LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtXml:${PORTSDIR}/textproc/qt4-xml \ - dbus-1.3:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc corelib gui xml +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -system-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \ - -no-nas-sound -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -56,7 +46,8 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../ .include pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/tools/tools.pro ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ ${WRKSRC}/tools/qdbus/qdbus.pro \ ${WRKSRC}/tools/qdbuscpp2xml/qdbuscpp2xml.pro \ @@ -67,13 +58,14 @@ pre-configure: ${MKDIR} ${WRKSRC}/../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc post-configure: - ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtDBus.pc|${PREFIX}/libdata/pkgconfig/QtDBus.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/*Qt* + ${WRKSRC}/../../lib/pkgconfig/*Qt* .include diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/dbus-qt4/distinfo +++ b/devel/dbus-qt4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index d1b337562ef0..9575b6c51744 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -9,6 +9,7 @@ include/QtDBus/QDBusAbstractInterface include/QtDBus/QDBusArgument include/QtDBus/QDBusConnection include/QtDBus/QDBusConnectionInterface +include/QtDBus/QDBusContext include/QtDBus/QDBusError include/QtDBus/QDBusInterface include/QtDBus/QDBusMessage @@ -24,6 +25,7 @@ include/QtDBus/qdbusabstractinterface.h include/QtDBus/qdbusargument.h include/QtDBus/qdbusconnection.h include/QtDBus/qdbusconnectioninterface.h +include/QtDBus/qdbuscontext.h include/QtDBus/qdbuserror.h include/QtDBus/qdbusextratypes.h include/QtDBus/qdbusinterface.h @@ -32,12 +34,12 @@ include/QtDBus/qdbusmessage.h include/QtDBus/qdbusmetatype.h include/QtDBus/qdbusreply.h include/QtDBus/qdbusserver.h -libdata/pkgconfig/QtDBus.pc lib/libQtDBus.la lib/libQtDBus.prl lib/libQtDBus.so lib/libQtDBus.so.4 -lib/libQtDBus.so.4.2 -lib/libQtDBus.so.4.2.3 -lib/libQtDBus.so.4.2.3.debug +lib/libQtDBus.so.4.3 +lib/libQtDBus.so.4.3.0 +lib/libQtDBus.so.4.3.0.debug +libdata/pkgconfig/QtDBus.pc @dirrm include/QtDBus diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 4ba4893d6eb6..c85fcc4335de 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -6,17 +6,17 @@ # $FreeBSD$ PORTNAME= qmake -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-opensource-src-${PORTVERSION} DIST_SUBDIR= KDE -LATEST_LINK= qmake4 -MAINTAINER= kde@freebsd.org +MAINTAINER= kde@FreeBSD.org COMMENT= The build utility of the Qt project +LATEST_LINK= qmake4 REINPLACE_ARGS= -i "" WRKSRC= ${WRKDIR}/${DISTNAME}/qmake MAKEFILE= ${FILESDIR}/Makefile.bsd @@ -33,7 +33,10 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ '${DISTNAME}/src/corelib/global' \ '${DISTNAME}/src/corelib/plugin' \ '${DISTNAME}/src/corelib/kernel' \ - '${DISTNAME}/src/3rdparty/md5' + '${DISTNAME}/src/script' \ + '${DISTNAME}/src/3rdparty/md4' \ + '${DISTNAME}/src/3rdparty/md5' \ + '${DISTNAME}/src/3rdparty/sha1' .if !defined(NOPORTDOCS) EXTRACT_AFTER_ARGS+='${DISTNAME}/doc/html/qmake*' @@ -66,6 +69,7 @@ do-configure: ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h +.include "${.CURDIR}/../../Mk/bsd.qt.mk" .include .if ${OSVERSION} < 500035 diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qmake4/distinfo +++ b/devel/qmake4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qmake4/files/Makefile.bsd index dd4e48c651bf..7997e28d17d4 100644 --- a/devel/qmake4/files/Makefile.bsd +++ b/devel/qmake4/files/Makefile.bsd @@ -9,11 +9,15 @@ NOMAN= true # qmake.1 anyone? .PATH: ${.CURDIR} ${.CURDIR:H}/src/corelib/tools ${.CURDIR:H}/src/corelib/io \ ${.CURDIR:H}/src/corelib/global ${.CURDIR:H}/src/corelib/plugin \ - ${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5 + ${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5 \ + ${.CURDIR:H}/src/3rdparty/md4 ${.CURDIR:H}/src/3rdparty/sha1 \ + ${.CURDIR:H}/src/script + CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++ .for s in src/corelib/arch/generic src/global src/tools src/kernel src/codecs \ - src/3rdparty/md5 include/QtCore include + src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \ + src/script include/QtCore include CXXFLAGS+=-I${.CURDIR:H}/$s .endfor diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index 7f00b8484c24..d282c1df166d 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -23,6 +23,8 @@ share/qt4/mkspecs/aix-xlc/qmake.conf share/qt4/mkspecs/aix-xlc/qplatformdefs.h share/qt4/mkspecs/common/g++.conf share/qt4/mkspecs/common/linux.conf +share/qt4/mkspecs/common/mac.conf +share/qt4/mkspecs/common/mac-g++.conf share/qt4/mkspecs/common/unix.conf share/qt4/mkspecs/darwin-g++/qmake.conf share/qt4/mkspecs/darwin-g++/qplatformdefs.h @@ -35,11 +37,16 @@ share/qt4/mkspecs/features/default_pre.prf share/qt4/mkspecs/features/designer.prf share/qt4/mkspecs/features/dll.prf share/qt4/mkspecs/features/exclusive_builds.prf +share/qt4/mkspecs/features/incredibuild_xge.prf +share/qt4/mkspecs/features/lex.prf share/qt4/mkspecs/features/link_pkgconfig.prf share/qt4/mkspecs/features/qdbus.prf share/qt4/mkspecs/features/qt_functions.prf +share/qt4/mkspecs/features/mac/dwarf2.prf share/qt4/mkspecs/features/mac/ppc.prf +share/qt4/mkspecs/features/mac/ppc64.prf share/qt4/mkspecs/features/mac/x86.prf +share/qt4/mkspecs/features/mac/x86_64.prf share/qt4/mkspecs/features/mac/default_post.prf share/qt4/mkspecs/features/mac/default_pre.prf share/qt4/mkspecs/features/mac/objective_c.prf @@ -61,6 +68,7 @@ share/qt4/mkspecs/features/static_and_shared.prf share/qt4/mkspecs/features/staticlib.prf share/qt4/mkspecs/features/uic.prf share/qt4/mkspecs/features/uitools.prf +share/qt4/mkspecs/features/unix/bsymbolic_functions.prf share/qt4/mkspecs/features/unix/dylib.prf share/qt4/mkspecs/features/unix/hide_symbols.prf share/qt4/mkspecs/features/unix/largefile.prf @@ -91,6 +99,7 @@ share/qt4/mkspecs/features/win32/stl_off.prf share/qt4/mkspecs/features/win32/thread.prf share/qt4/mkspecs/features/win32/thread_off.prf share/qt4/mkspecs/features/win32/windows.prf +share/qt4/mkspecs/features/yacc.prf share/qt4/mkspecs/freebsd-g++/qmake.conf share/qt4/mkspecs/freebsd-g++/qplatformdefs.h share/qt4/mkspecs/freebsd-g++34/qmake.conf @@ -135,10 +144,12 @@ share/qt4/mkspecs/linux-g++/qmake.conf share/qt4/mkspecs/linux-g++/qplatformdefs.h share/qt4/mkspecs/linux-icc/qmake.conf share/qt4/mkspecs/linux-icc/qplatformdefs.h +share/qt4/mkspecs/linux-icc-64/qmake.conf +share/qt4/mkspecs/linux-icc-64/qplatformdefs.h share/qt4/mkspecs/linux-kcc/qmake.conf share/qt4/mkspecs/linux-kcc/qplatformdefs.h -share/qt4/mkspecs/linux-lsb/qmake.conf -share/qt4/mkspecs/linux-lsb/qplatformdefs.h +share/qt4/mkspecs/linux-lsb-g++/qmake.conf +share/qt4/mkspecs/linux-lsb-g++/qplatformdefs.h share/qt4/mkspecs/linux-pgcc/qmake.conf share/qt4/mkspecs/linux-pgcc/qplatformdefs.h share/qt4/mkspecs/lynxos-g++/qmake.conf @@ -174,6 +185,8 @@ share/qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf share/qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h share/qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf share/qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-lsb-g++/qmake.conf +share/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-mips-g++/qmake.conf share/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-sharp-g++/qmake.conf @@ -228,6 +241,7 @@ share/qt4/mkspecs/win32-g++/qplatformdefs.h @dirrm share/qt4/mkspecs/qws/linux-x86-g++ @dirrm share/qt4/mkspecs/qws/linux-sharp-g++ @dirrm share/qt4/mkspecs/qws/linux-mips-g++ +@dirrm share/qt4/mkspecs/qws/linux-lsb-g++ @dirrm share/qt4/mkspecs/qws/linux-ipaq-g++ @dirrm share/qt4/mkspecs/qws/linux-generic-g++ @dirrm share/qt4/mkspecs/qws/linux-generic-g++-32 @@ -244,8 +258,9 @@ share/qt4/mkspecs/win32-g++/qplatformdefs.h @dirrm share/qt4/mkspecs/macx-icc @dirrm share/qt4/mkspecs/lynxos-g++ @dirrm share/qt4/mkspecs/linux-pgcc -@dirrm share/qt4/mkspecs/linux-lsb +@dirrm share/qt4/mkspecs/linux-lsb-g++ @dirrm share/qt4/mkspecs/linux-kcc +@dirrm share/qt4/mkspecs/linux-icc-64 @dirrm share/qt4/mkspecs/linux-icc @dirrm share/qt4/mkspecs/linux-g++-64 @dirrm share/qt4/mkspecs/linux-g++-32 diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 4ff30149b466..2d7a925fdf79 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -7,8 +7,8 @@ # PORTNAME= assistant -PORTVERSION= 4.2.3 -PORTREVISION= 2 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,31 +18,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 \ - rcc:${PORTSDIR}/devel/qt4-rcc \ - uic-qt4:${PORTSDIR}/devel/qt4-uic -LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \ - QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtNetwork:${PORTSDIR}/net/qt4-network \ - QtSql:${PORTSDIR}/databases/qt4-sql \ - QtXml:${PORTSDIR}/textproc/qt4-xml -RUN_DEPENDS= qt4-doc>=4.2.3:${PORTSDIR}/misc/qt4-doc - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc uic qt3support corelib gui network sql xml doc +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license -no-separate-debug-info - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-assistant/distinfo +++ b/devel/qt4-assistant/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist index 98334ee203db..5d85d93372aa 100644 --- a/devel/qt4-assistant/pkg-plist +++ b/devel/qt4-assistant/pkg-plist @@ -1 +1,2 @@ bin/assistant-qt4 +bin/assistant-qt4.debug diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 769cd8c31740..598a7b9581b7 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -7,44 +7,27 @@ # PORTNAME= corelib -PORTVERSION= 4.2.3 -PORTREVISION= 3 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- DISTNAME= qt-x11-opensource-src-${PORTVERSION} DIST_SUBDIR= KDE -MAINTAINER?= kde@FreeBSD.org -COMMENT?= Qt core library +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt core library -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -confirm-license \ - -prefix ${PREFIX} \ - -docdir ${PREFIX}/share/doc/qt4 \ - -headerdir ${PREFIX}/include \ - -plugindir ${PREFIX}/lib/plugins \ - -datadir ${PREFIX}/share/qt4 \ - -libdir ${PREFIX}/lib \ - -translationdir ${PREFIX}/share/qt4/translations \ - -sysconfdir ${PREFIX}/local/etc/xdg \ - -examplesdir ${PREFIX}/share/qt4/examples \ - -demosdir ${PREFIX}/share/qt4/demos \ - -bindir ${PREFIX}/bin - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -67,7 +50,7 @@ PATCH_WRKSRC=${WRKSRC}/../../ .include pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ -e 's|flat_headers.path.*|flat_headers.path=${PREFIX}/include/Qt|g' \ -e 's|targ_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \ @@ -76,17 +59,17 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtCore.pc|${PREFIX}/libdata/pkgconfig/QtCore.pc|g' \ - ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/*Qt* + ${WRKSRC}/../../lib/pkgconfig/*Qt* .if !defined(PKGNAMESUFFIX) post-install: ${MKDIR} ${PREFIX}/lib/plugins - touch ${PREFIX}/lib/plugins/.keep_me + ${TOUCH} ${PREFIX}/lib/plugins/.keep_me .endif .include diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-corelib/distinfo +++ b/devel/qt4-corelib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt b/devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt deleted file mode 100644 index 2f93298794c9..000000000000 --- a/devel/qt4-corelib/files/patch-qlocale_workaround_patch.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/corelib/tools/qlocale.cpp -+++ src/corelib/tools/qlocale.cpp -@@ -44,7 +44,7 @@ - - #if !defined(QT_QLOCALE_NEEDS_VOLATILE) - # if defined(Q_CC_GNU) --# if __GNUC__ == 4 && __GNUC_MINOR__ == 0 -+# if __GNUC__ == 4 - # define QT_QLOCALE_NEEDS_VOLATILE - # elif defined(Q_OS_WIN) - # define QT_QLOCALE_NEEDS_VOLATILE diff --git a/devel/qt4-corelib/files/patch-utf8-bug-qt4 b/devel/qt4-corelib/files/patch-utf8-bug-qt4 deleted file mode 100644 index 4b7ee9c81401..000000000000 --- a/devel/qt4-corelib/files/patch-utf8-bug-qt4 +++ /dev/null @@ -1,132 +0,0 @@ ---- src/corelib/tools/qstring.cpp -+++ src/corelib/tools/qstring.cpp -@@ -3342,6 +3342,7 @@ QString QString::fromUtf8(const char *st - result.resize(size); // worst case - ushort *qch = result.d->data; - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -3359,6 +3360,12 @@ QString QString::fromUtf8(const char *st - ushort low = uc%0x400 + 0xdc00; - *qch++ = high; - *qch++ = low; -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = 0xdbff; -+ *qch++ = 0xde00 + ((uchar)str[i]); - } else { - *qch++ = uc; - } -@@ -3381,14 +3388,17 @@ QString QString::fromUtf8(const char *st - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); ---- src/corelib/codecs/qutfcodec.cpp -+++ src/corelib/codecs/qutfcodec.cpp -@@ -117,15 +117,19 @@ QString QUtf8Codec::convertToUnicode(con - bool headerdone = false; - QChar replacement = QChar::ReplacementCharacter; - int need = 0; -+ int error = -1; - uint uc = 0; -+ uint min_uc = 0; - if (state) { - if (state->flags & IgnoreHeader) - headerdone = true; - if (state->flags & ConvertInvalidToNull) - replacement = QChar::Null; - need = state->remainingChars; -- if (need) -+ if (need) { - uc = state->state_data[0]; -+ min_uc = state->state_data[1]; -+ } - } - if (!headerdone && len > 3 - && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) { -@@ -142,7 +146,7 @@ QString QUtf8Codec::convertToUnicode(con - int invalid = 0; - - for (int i=0; i= result.size()) { -+ result.resize(where + 2); -+ qch = result.data() + where; -+ } -+ - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // error -+ *qch++ = QChar::ReplacementCharacter; -+ ++invalid; - } else { - *qch++ = uc; - } - } - } else { - // error -+ i = error; - *qch++ = QChar::ReplacementCharacter; - ++invalid; - need = 0; -@@ -171,12 +188,22 @@ QString QUtf8Codec::convertToUnicode(con - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::ReplacementCharacter; -+ ++invalid; - } - } - } -@@ -187,6 +214,7 @@ QString QUtf8Codec::convertToUnicode(con - if (headerdone) - state->flags |= IgnoreHeader; - state->state_data[0] = need ? uc : 0; -+ state->state_data[1] = need ? min_uc : 0; - } - return result; - } diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index 10346fb33f9e..d3d9433865ce 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -33,10 +33,12 @@ include/Qt/qconfig.h include/Qt/qcontainerfwd.h include/Qt/qcoreapplication.h include/Qt/qcoreevent.h +include/Qt/qcryptographichash.h include/Qt/qdatastream.h include/Qt/qdatetime.h include/Qt/qdebug.h include/Qt/qdir.h +include/Qt/qdiriterator.h include/Qt/qendian.h include/Qt/qeventloop.h include/Qt/qfactoryinterface.h @@ -61,6 +63,7 @@ include/Qt/qmetatype.h include/Qt/qmimedata.h include/Qt/qmutex.h include/Qt/qnamespace.h +include/Qt/qnumeric.h include/Qt/qobject.h include/Qt/qobjectcleanuphandler.h include/Qt/qobjectdefs.h @@ -104,6 +107,7 @@ include/Qt/qwaitcondition.h include/QtCore/QAbstractEventDispatcher include/QtCore/QAbstractFileEngine include/QtCore/QAbstractFileEngineHandler +include/QtCore/QAbstractFileEngineIterator include/QtCore/QAbstractItemModel include/QtCore/QAbstractListModel include/QtCore/QAbstractTableModel @@ -127,15 +131,18 @@ include/QtCore/QCharRef include/QtCore/QChildEvent include/QtCore/QConstString include/QtCore/QCoreApplication +include/QtCore/QCryptographicHash include/QtCore/QCustomEvent include/QtCore/QDataStream include/QtCore/QDate include/QtCore/QDateTime include/QtCore/QDebug include/QtCore/QDir +include/QtCore/QDirIterator include/QtCore/QDynamicPropertyChangeEvent include/QtCore/QEvent include/QtCore/QEventLoop +include/QtCore/QExplicitlySharedDataPointer include/QtCore/QFSFileEngine include/QtCore/QFactoryInterface include/QtCore/QFile @@ -150,6 +157,7 @@ include/QtCore/QForeachContainerBase include/QtCore/QGenericArgument include/QtCore/QGenericReturnArgument include/QtCore/QGlobalStatic +include/QtCore/QGlobalStaticDeleter include/QtCore/QHash include/QtCore/QHashData include/QtCore/QHashDummyNode @@ -237,6 +245,7 @@ include/QtCore/QString include/QtCore/QStringList include/QtCore/QStringListIterator include/QtCore/QStringMatcher +include/QtCore/QStringRef include/QtCore/QSysInfo include/QtCore/QSystemLocale include/QtCore/QTS @@ -333,10 +342,12 @@ include/QtCore/qconfig.h include/QtCore/qcontainerfwd.h include/QtCore/qcoreapplication.h include/QtCore/qcoreevent.h +include/QtCore/qcryptographichash.h include/QtCore/qdatastream.h include/QtCore/qdatetime.h include/QtCore/qdebug.h include/QtCore/qdir.h +include/QtCore/qdiriterator.h include/QtCore/qendian.h include/QtCore/qeventloop.h include/QtCore/qfactoryinterface.h @@ -361,6 +372,7 @@ include/QtCore/qmetatype.h include/QtCore/qmimedata.h include/QtCore/qmutex.h include/QtCore/qnamespace.h +include/QtCore/qnumeric.h include/QtCore/qobject.h include/QtCore/qobjectcleanuphandler.h include/QtCore/qobjectdefs.h @@ -405,9 +417,8 @@ lib/libQtCore.la lib/libQtCore.prl lib/libQtCore.so lib/libQtCore.so.4 -lib/libQtCore.so.4.2 -lib/libQtCore.so.4.2.3 -lib/libQtCore.so.4.2.3.debug +lib/libQtCore.so.4.3 +lib/libQtCore.so.4.3.0 lib/plugins/.keep_me libdata/pkgconfig/QtCore.pc @dirrmtry share/qt4 diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index a0e889c46958..6a4d4815f671 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -7,8 +7,8 @@ # PORTNAME= designer -PORTVERSION= 4.2.3 -PORTREVISION= 3 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,32 +18,15 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt ui editor -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 \ - rcc:${PORTSDIR}/devel/qt4-rcc \ - uic-qt4:${PORTSDIR}/devel/qt4-uic -LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \ - Qt3Support:${PORTSDIR}/devel/qt4-qt3support \ - QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtNetwork:${PORTSDIR}/net/qt4-network \ - QtSql:${PORTSDIR}/databases/qt4-sql \ - QtXml:${PORTSDIR}/textproc/qt4-xml - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc uic assistantclient qt3support corelib gui network\ + script sql xml +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -62,7 +45,7 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../ .include pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ -e 's|^TARGET.*|TARGET=designer-qt4|g' \ ${WRKSRC}/src/designer/${PORTNAME}.pro @@ -79,10 +62,11 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc post-configure: - ${REINPLACE_CMD} -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/uitools/Makefile + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/uitools/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/*Qt* + ${WRKSRC}/../../lib/pkgconfig/*Qt* .include diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-designer/distinfo +++ b/devel/qt4-designer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index ea84579a1a87..5441f3ec4714 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -10,6 +10,7 @@ include/QtDesigner/QDesignerContainerExtension include/QtDesigner/QDesignerCustomWidgetCollectionInterface include/QtDesigner/QDesignerCustomWidgetInterface include/QtDesigner/QDesignerDnDItemInterface +include/QtDesigner/QDesignerDynamicPropertySheetExtension include/QtDesigner/QDesignerExportWidget include/QtDesigner/QDesignerExtraInfoExtension include/QtDesigner/QDesignerFormEditorInterface @@ -19,14 +20,17 @@ include/QtDesigner/QDesignerFormWindowInterface include/QtDesigner/QDesignerFormWindowManagerInterface include/QtDesigner/QDesignerFormWindowToolInterface include/QtDesigner/QDesignerIconCacheInterface +include/QtDesigner/QDesignerIntegrationInterface include/QtDesigner/QDesignerLanguageExtension include/QtDesigner/QDesignerLayoutDecorationExtension include/QtDesigner/QDesignerMemberSheetExtension include/QtDesigner/QDesignerMetaDataBaseInterface include/QtDesigner/QDesignerMetaDataBaseItemInterface include/QtDesigner/QDesignerObjectInspectorInterface +include/QtDesigner/QDesignerPromotionInterface include/QtDesigner/QDesignerPropertyEditorInterface include/QtDesigner/QDesignerPropertySheetExtension +include/QtDesigner/QDesignerResourceBrowserInterface include/QtDesigner/QDesignerTaskMenuExtension include/QtDesigner/QDesignerWidgetBoxInterface include/QtDesigner/QDesignerWidgetDataBaseInterface @@ -47,16 +51,20 @@ include/QtDesigner/abstractformwindowcursor.h include/QtDesigner/abstractformwindowmanager.h include/QtDesigner/abstractformwindowtool.h include/QtDesigner/abstracticoncache.h +include/QtDesigner/abstractintegration.h include/QtDesigner/abstractlanguage.h include/QtDesigner/abstractmetadatabase.h include/QtDesigner/abstractobjectinspector.h +include/QtDesigner/abstractpromotioninterface.h include/QtDesigner/abstractpropertyeditor.h +include/QtDesigner/abstractresourcebrowser.h include/QtDesigner/abstractwidgetbox.h include/QtDesigner/abstractwidgetdatabase.h include/QtDesigner/abstractwidgetfactory.h include/QtDesigner/container.h include/QtDesigner/customwidget.h include/QtDesigner/default_extensionfactory.h +include/QtDesigner/dynamicpropertysheet.h include/QtDesigner/extension.h include/QtDesigner/extension_global.h include/QtDesigner/extrainfo.h @@ -77,18 +85,19 @@ include/QtUiTools/quiloader.h lib/libQtDesigner.prl lib/libQtDesigner.so lib/libQtDesigner.so.4 -lib/libQtDesigner.so.4.2 -lib/libQtDesigner.so.4.2.3 -lib/libQtDesigner.so.4.2.3.debug +lib/libQtDesigner.so.4.3 +lib/libQtDesigner.so.4.3.0 +lib/libQtDesigner.so.4.3.0.debug lib/libQtDesignerComponents.prl lib/libQtDesignerComponents.so lib/libQtDesignerComponents.so.4 -lib/libQtDesignerComponents.so.4.2 -lib/libQtDesignerComponents.so.4.2.3 -lib/libQtDesignerComponents.so.4.2.3.debug +lib/libQtDesignerComponents.so.4.3 +lib/libQtDesignerComponents.so.4.3.0 +lib/libQtDesignerComponents.so.4.3.0.debug lib/libQtUiTools.a lib/libQtUiTools.prl lib/plugins/libqt3supportwidgets.so lib/plugins/libqt3supportwidgets.so.debug +libdata/pkgconfig/QtUiTools.pc @dirrm include/QtUiTools @dirrm include/QtDesigner diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index f45083de0ca6..255dfd469c26 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -7,8 +7,8 @@ # PORTNAME= libQtAssistantClient -PORTVERSION= 4.2.3 -PORTREVISION= 2 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,27 +18,14 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration library -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 - -LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtNetwork:${PORTSDIR}/net/qt4-network - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc corelib gui network +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -67,4 +54,12 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc +post-configure: + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ + -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ + -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + ${WRKSRC}/../../../lib/pkgconfig/*Qt* + .include diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-libqtassistantclient/distinfo +++ b/devel/qt4-libqtassistantclient/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index db1d832e3410..32f134063776 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -5,7 +5,7 @@ include/QtAssistant/qassistantclient_global.h lib/libQtAssistantClient.prl lib/libQtAssistantClient.so lib/libQtAssistantClient.so.4 -lib/libQtAssistantClient.so.4.2 -lib/libQtAssistantClient.so.4.2.3 -lib/libQtAssistantClient.so.4.2.3.debug +lib/libQtAssistantClient.so.4.3 +lib/libQtAssistantClient.so.4.3.0 +libdata/pkgconfig/QtAssistantClient.pc @dirrm include/QtAssistant diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 48baee29b381..4941696f0255 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -7,8 +7,8 @@ # PORTNAME= linguist -PORTVERSION= 4.2.3 -PORTREVISION= 3 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,29 +18,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt localisation tool -BUILD_DEPENDS= ${LOCALBASE}/lib/libQtUiTools.a:${PORTSDIR}/devel/qt4-designer \ - moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 \ - rcc:${PORTSDIR}/devel/qt4-rcc \ - uic-qt4:${PORTSDIR}/devel/qt4-uic -LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtNetwork:${PORTSDIR}/net/qt4-network \ - QtXml:${PORTSDIR}/textproc/qt4-xml - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake designer moc rcc uic assistantclient gui network xml +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-linguist/distinfo +++ b/devel/qt4-linguist/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist index 7b11182b2282..e629ea1c49be 100644 --- a/devel/qt4-linguist/pkg-plist +++ b/devel/qt4-linguist/pkg-plist @@ -10,6 +10,7 @@ share/qt4/phrasebooks/finnish.qph share/qt4/phrasebooks/french.qph share/qt4/phrasebooks/german.qph share/qt4/phrasebooks/italian.qph +share/qt4/phrasebooks/japanese.qph share/qt4/phrasebooks/norwegian.qph share/qt4/phrasebooks/russian.qph share/qt4/phrasebooks/spanish.qph diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile new file mode 100644 index 000000000000..85274db8ef62 --- /dev/null +++ b/devel/qt4-makeqpf/Makefile @@ -0,0 +1,55 @@ +# -*-mode: makefile-*- +# New ports collection makefile for: qt40 +# Date created: Wed Jun 29 11:49:42 CEST 2005 +# Whom: lofi@freebsd.org +# +# $FreeBSD$ +# + +PORTNAME= makeqpf +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 +CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} +PKGNAMEPREFIX= qt4- +DISTNAME= qt-x11-opensource-src-${PORTVERSION} +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt qtopia font creator + +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc uic corelib gui +QT_NONSTANDARD= yes +QT_DIST= yes + +HAS_CONFIGURE= yes + +ALL_TARGET= first +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ + PATH=${WRKSRC}/bin:$$PATH +EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ + --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \ + --exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \ + --exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \ + --exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \ + --exclude '${DISTNAME}/src/3rdparty' --exclude '${DISTNAME}/src/tools/moc' \ + --exclude '${DISTNAME}/src/tools/rcc' --exclude '${DISTNAME}/src/tools/uic' \ + --exclude '${DISTNAME}/src/tools/uic3' --exclude '${DISTNAME}/tools/porting' \ + --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb' +WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} +CONFIGURE_WRKSRC=${WRKSRC}/../../ + +pre-configure: + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ + -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}-qt4|g' \ + ${WRKSRC}/${PORTNAME}.pro + ${MKDIR} ${WRKSRC}/../../mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + +.include diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo new file mode 100644 index 000000000000..8fb631a2787d --- /dev/null +++ b/devel/qt4-makeqpf/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp b/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp new file mode 100644 index 000000000000..e91adeeccea1 --- /dev/null +++ b/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp @@ -0,0 +1,11 @@ +--- qpf2.cpp Sun Jul 8 08:08:09 2007 ++++ qpf2.cpp Sun Jul 8 08:08:33 2007 +@@ -342,6 +342,8 @@ + int startGlyphIndex; + }; + ++#define log2(x) log(x)/log(2) ++ + static QByteArray generateTrueTypeCMap(QFontEngine *fe) + { + QByteArray cmap; diff --git a/devel/qt4-makeqpf/pkg-descr b/devel/qt4-makeqpf/pkg-descr new file mode 100644 index 000000000000..efc79b9aaf24 --- /dev/null +++ b/devel/qt4-makeqpf/pkg-descr @@ -0,0 +1,12 @@ +Qt is a C++ toolkit for application development. It lets application +developers target all major operating systems with a single application +source code. + +Qt provides a platform-independent API to all central platform functionality: +GUI, database access, networking, file handling, etc. The Qt library +encapsulates the different APIs of different operating systems, providing +the application programmer with a single, common API for all operating systems. +The native C APIs are encapsulated in a set of well-designed, fully +object-oriented C++ classes. + +WWW: http://www.trolltech.com/products/qt/index.html diff --git a/devel/qt4-makeqpf/pkg-plist b/devel/qt4-makeqpf/pkg-plist new file mode 100644 index 000000000000..e559beaa3c72 --- /dev/null +++ b/devel/qt4-makeqpf/pkg-plist @@ -0,0 +1,2 @@ +bin/makeqpf-qt4 +bin/makeqpf-qt4.debug diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 0e76b1f634f9..95224e8c61bc 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -7,8 +7,8 @@ # PORTNAME= moc -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,21 +18,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt meta object compiler -BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4 - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-moc/distinfo +++ b/devel/qt4-moc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 31813805ad82..bea665729817 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -7,7 +7,7 @@ # PORTNAME= porting -PORTVERSION= 4.2.3 +PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -17,26 +17,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting Qt3 applications to Qt4 -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 \ - rcc:${PORTSDIR}/devel/qt4-rcc \ - uic-qt4:${PORTSDIR}/devel/qt4-uic -LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtXml:${PORTSDIR}/textproc/qt4-xml - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc uic corelib xml +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -57,7 +44,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ -e 's|RULESXML.path.*|RULESXML.path=${PREFIX}/share/qt4|g' \ ${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/src/src.pro diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-porting/distinfo +++ b/devel/qt4-porting/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile new file mode 100644 index 000000000000..b5e988b6e5b3 --- /dev/null +++ b/devel/qt4-qdbusviewer/Makefile @@ -0,0 +1,57 @@ +### -*-mode: makefile-*- +# New ports collection makefile for: qt40 +# Date created: Wed Jun 29 11:49:42 CEST 2005 +# Whom: lofi@freebsd.org +# +# $FreeBSD$ +# + +PORTNAME= qdbusviewer +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 +CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} +PKGNAMEPREFIX= qt4- +DISTNAME= qt-x11-opensource-src-${PORTVERSION} +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt4 D-BUS viewer + +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus + +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc corelib dbus gui xml +QT_NONSTANDARD= yes +QT_DIST= yes + +HAS_CONFIGURE= yes +USE_LDCONFIG= yes + +ALL_TARGET= first +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ + PATH=${WRKSRC}/bin:$$PATH +EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ + --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \ + --exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \ + --exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/sql' \ + --exclude '${DISTNAME}/src/tools/moc' --exclude '${DISTNAME}/src/tools/rcc' \ + --exclude '${DISTNAME}/src/tools/uic3' --exclude '${DISTNAME}/tools/designer' \ + --exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \ + --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb' +WRKSRC= ${WRKDIR}/${DISTNAME}/tools/qdbus/tools/qdbusviewer +CONFIGURE_WRKSRC=${WRKSRC}/../../../.. + +.include + +pre-configure: + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ + ${WRKSRC}/qdbusviewer.pro + ${MKDIR} ${WRKSRC}/../../../../mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../../bin/rcc + +.include diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo new file mode 100644 index 000000000000..8fb631a2787d --- /dev/null +++ b/devel/qt4-qdbusviewer/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-qdbusviewer/pkg-descr b/devel/qt4-qdbusviewer/pkg-descr new file mode 100644 index 000000000000..efc79b9aaf24 --- /dev/null +++ b/devel/qt4-qdbusviewer/pkg-descr @@ -0,0 +1,12 @@ +Qt is a C++ toolkit for application development. It lets application +developers target all major operating systems with a single application +source code. + +Qt provides a platform-independent API to all central platform functionality: +GUI, database access, networking, file handling, etc. The Qt library +encapsulates the different APIs of different operating systems, providing +the application programmer with a single, common API for all operating systems. +The native C APIs are encapsulated in a set of well-designed, fully +object-oriented C++ classes. + +WWW: http://www.trolltech.com/products/qt/index.html diff --git a/devel/qt4-qdbusviewer/pkg-plist b/devel/qt4-qdbusviewer/pkg-plist new file mode 100644 index 000000000000..1eb0a48e3608 --- /dev/null +++ b/devel/qt4-qdbusviewer/pkg-plist @@ -0,0 +1,2 @@ +bin/qdbusviewer +bin/qdbusviewer.debug diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index f6e189ac19de..473b56cbe5fd 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -7,8 +7,8 @@ # PORTNAME= qt3support -PORTVERSION= 4.2.3 -PORTREVISION= 2 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel x11-toolkits MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,29 +18,15 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt3 compatibility library -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 -LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtNetwork:${PORTSDIR}/net/qt4-network \ - QtSql:${PORTSDIR}/databases/qt4-sql \ - QtXml:${PORTSDIR}/textproc/qt4-xml - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc corelib gui network sql xml +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes USE_XLIB= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -70,11 +56,11 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|${PREFIX}/lib/Qt3Support.pc|${PREFIX}/libdata/pkgconfig/Qt3Support.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/*Qt* + ${WRKSRC}/../../lib/pkgconfig/*Qt* .include diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-qt3support/distinfo +++ b/devel/qt4-qt3support/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index b1dbe4283419..002aca07c933 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -405,8 +405,8 @@ lib/libQt3Support.la lib/libQt3Support.prl lib/libQt3Support.so lib/libQt3Support.so.4 -lib/libQt3Support.so.4.2 -lib/libQt3Support.so.4.2.3 -lib/libQt3Support.so.4.2.3.debug +lib/libQt3Support.so.4.3 +lib/libQt3Support.so.4.3.0 +lib/libQt3Support.so.4.3.0.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/Qt3Support diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 8c50a64a0485..cb7dd4b4b535 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -7,36 +7,25 @@ # PORTNAME= qtestlib -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- DISTNAME= qt-x11-opensource-src-${PORTVERSION} DIST_SUBDIR= KDE -MAINTAINER?= kde@FreeBSD.org -COMMENT?= Qt unit testing library +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt unit testing library -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 - -LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc corelib +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -58,7 +47,7 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../ .include pre-configure: - ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ -e 's|qtestlib_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \ ${WRKSRC}/${PORTNAME}.pro @@ -66,11 +55,11 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtTest.pc|${PREFIX}/libdata/pkgconfig/QtTest.pc|g' \ - ${WRKSRC}/src/Makefile + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/src/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ - ${WRKSRC}/../../lib/*Qt* + ${WRKSRC}/../../lib/pkgconfig/*Qt* .include diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-qtestlib/distinfo +++ b/devel/qt4-qtestlib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index 6c376ae53107..373b663d75df 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -27,12 +27,11 @@ include/QtTest/qtestkeyboard.h include/QtTest/qtestmouse.h include/QtTest/qtestspontaneevent.h include/QtTest/qtestsystem.h -libdata/pkgconfig/QtTest.pc lib/libQtTest.la lib/libQtTest.prl lib/libQtTest.so lib/libQtTest.so.4 -lib/libQtTest.so.4.2 -lib/libQtTest.so.4.2.3 -lib/libQtTest.so.4.2.3.debug +lib/libQtTest.so.4.3 +lib/libQtTest.so.4.3.0 +libdata/pkgconfig/QtTest.pc @dirrm include/QtTest diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index e8f016d1d19d..f12215ffc1a2 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -7,8 +7,8 @@ # PORTNAME= qvfb -PORTVERSION= 4.2.3 -PORTREVISION= 2 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,27 +18,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt virtual framebuffer utility -BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ - qmake-qt4:${PORTSDIR}/devel/qmake4 \ - rcc:${PORTSDIR}/devel/qt4-rcc \ - uic-qt4:${PORTSDIR}/devel/qt4-uic -LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtOpenGL:${PORTSDIR}/x11/qt4-opengl - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc rcc uic corelib gui opengl +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ @@ -54,7 +40,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ --exclude '${DISTNAME}/src/tools/uic' --exclude '${DISTNAME}/src/tools/uic3' \ --exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \ --exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \ - --exclude '${DISTNAME}/tools/qtconfig' + --exclude '${DISTNAME}/tools/qtconfig' WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-qvfb/distinfo +++ b/devel/qt4-qvfb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-qvfb/files/patch-qvfbshmem.cpp b/devel/qt4-qvfb/files/patch-qvfbshmem.cpp deleted file mode 100644 index aaa4c8a6dd57..000000000000 --- a/devel/qt4-qvfb/files/patch-qvfbshmem.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- qvfbshmem.cpp.orig Sun Jan 14 15:50:33 2007 -+++ qvfbshmem.cpp Sun Jan 14 15:50:46 2007 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp b/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp deleted file mode 100644 index 364c289a41f5..000000000000 --- a/devel/qt4-qvfb/files/patch-qwssignalhandler.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- qwssignalhandler.cpp.orig Thu Mar 22 16:17:51 2007 -+++ qwssignalhandler.cpp Thu Mar 22 16:18:10 2007 -@@ -27,13 +27,6 @@ - #include - #include - --union semun { -- int val; -- struct semid_ds *buf; -- unsigned short *array; -- struct seminfo *__buf; --}; -- - class QWSSignalHandlerPrivate - { - public: diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist index 9da8e06f6cf8..ae5639ce4ec3 100644 --- a/devel/qt4-qvfb/pkg-plist +++ b/devel/qt4-qvfb/pkg-plist @@ -1,61 +1,61 @@ bin/qvfb-qt4 bin/qvfb-qt4.debug -share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin -share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png -share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png -share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png -share/qvfb/ClamshellPhone.skin/defaultbuttons.conf -share/qvfb/DualScreenPhone.skin/DualScreen-pressed.png -share/qvfb/DualScreenPhone.skin/DualScreen.png -share/qvfb/DualScreenPhone.skin/DualScreenPhone.skin -share/qvfb/DualScreenPhone.skin/defaultbuttons.conf -share/qvfb/PDAPhone.skin/PDAPhone.skin -share/qvfb/PDAPhone.skin/defaultbuttons.conf -share/qvfb/PDAPhone.skin/finger.png -share/qvfb/PDAPhone.skin/pda_down.png -share/qvfb/PDAPhone.skin/pda_up.png -share/qvfb/PortableMedia.skin/PortableMedia.skin -share/qvfb/PortableMedia.skin/defaultbuttons.conf -share/qvfb/PortableMedia.skin/portablemedia-pressed.png -share/qvfb/PortableMedia.skin/portablemedia.png -share/qvfb/PortableMedia.skin/portablemedia.xcf -share/qvfb/SmartPhone.skin/SmartPhone-pressed.png -share/qvfb/SmartPhone.skin/SmartPhone.png -share/qvfb/SmartPhone.skin/SmartPhone.skin -share/qvfb/SmartPhone.skin/defaultbuttons.conf -share/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png -share/qvfb/SmartPhone2.skin/SmartPhone2.png -share/qvfb/SmartPhone2.skin/SmartPhone2.skin -share/qvfb/SmartPhone2.skin/defaultbuttons.conf -share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png -share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png -share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin -share/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf -share/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png -share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png -share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin -share/qvfb/TouchscreenPhone.skin/defaultbuttons.conf -share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png -share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png -share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png -share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin -share/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf -share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png -share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png -share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin -share/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf -share/qvfb/pda.qrc -share/qvfb/pda.skin -share/qvfb/pda_down.png -share/qvfb/pda_up.png -@dirrm share/qvfb/Trolltech-Touchscreen.skin -@dirrm share/qvfb/Trolltech-Keypad.skin -@dirrm share/qvfb/TouchscreenPhone.skin -@dirrm share/qvfb/SmartPhoneWithButtons.skin -@dirrm share/qvfb/SmartPhone2.skin -@dirrm share/qvfb/SmartPhone.skin -@dirrm share/qvfb/PortableMedia.skin -@dirrm share/qvfb/PDAPhone.skin -@dirrm share/qvfb/DualScreenPhone.skin -@dirrm share/qvfb/ClamshellPhone.skin -@dirrm share/qvfb +%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone.skin +%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-closed.png +%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png +%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5.png +%%DATADIR%%/ClamshellPhone.skin/defaultbuttons.conf +%%DATADIR%%/DualScreenPhone.skin/DualScreen-pressed.png +%%DATADIR%%/DualScreenPhone.skin/DualScreen.png +%%DATADIR%%/DualScreenPhone.skin/DualScreenPhone.skin +%%DATADIR%%/DualScreenPhone.skin/defaultbuttons.conf +%%DATADIR%%/PDAPhone.skin/PDAPhone.skin +%%DATADIR%%/PDAPhone.skin/defaultbuttons.conf +%%DATADIR%%/PDAPhone.skin/finger.png +%%DATADIR%%/PDAPhone.skin/pda_down.png +%%DATADIR%%/PDAPhone.skin/pda_up.png +%%DATADIR%%/PortableMedia.skin/PortableMedia.skin +%%DATADIR%%/PortableMedia.skin/defaultbuttons.conf +%%DATADIR%%/PortableMedia.skin/portablemedia-pressed.png +%%DATADIR%%/PortableMedia.skin/portablemedia.png +%%DATADIR%%/PortableMedia.skin/portablemedia.xcf +%%DATADIR%%/SmartPhone.skin/SmartPhone-pressed.png +%%DATADIR%%/SmartPhone.skin/SmartPhone.png +%%DATADIR%%/SmartPhone.skin/SmartPhone.skin +%%DATADIR%%/SmartPhone.skin/defaultbuttons.conf +%%DATADIR%%/SmartPhone2.skin/SmartPhone2-pressed.png +%%DATADIR%%/SmartPhone2.skin/SmartPhone2.png +%%DATADIR%%/SmartPhone2.skin/SmartPhone2.skin +%%DATADIR%%/SmartPhone2.skin/defaultbuttons.conf +%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png +%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png +%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin +%%DATADIR%%/SmartPhoneWithButtons.skin/defaultbuttons.conf +%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone-pressed.png +%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.png +%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.skin +%%DATADIR%%/TouchscreenPhone.skin/defaultbuttons.conf +%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png +%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-down.png +%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.png +%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.skin +%%DATADIR%%/Trolltech-Keypad.skin/defaultbuttons.conf +%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png +%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png +%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin +%%DATADIR%%/Trolltech-Touchscreen.skin/defaultbuttons.conf +%%DATADIR%%/pda.qrc +%%DATADIR%%/pda.skin +%%DATADIR%%/pda_down.png +%%DATADIR%%/pda_up.png +@dirrm %%DATADIR%%/Trolltech-Touchscreen.skin +@dirrm %%DATADIR%%/Trolltech-Keypad.skin +@dirrm %%DATADIR%%/TouchscreenPhone.skin +@dirrm %%DATADIR%%/SmartPhoneWithButtons.skin +@dirrm %%DATADIR%%/SmartPhone2.skin +@dirrm %%DATADIR%%/SmartPhone.skin +@dirrm %%DATADIR%%/PortableMedia.skin +@dirrm %%DATADIR%%/PDAPhone.skin +@dirrm %%DATADIR%%/DualScreenPhone.skin +@dirrm %%DATADIR%%/ClamshellPhone.skin +@dirrm %%DATADIR%% diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 555bd5655b41..0a276bf52905 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -7,7 +7,7 @@ # PORTNAME= rcc -PORTVERSION= 4.2.3 +PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -17,21 +17,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt resource compiler -BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4 - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-rcc/distinfo +++ b/devel/qt4-rcc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile new file mode 100644 index 000000000000..28f1e68bc5c2 --- /dev/null +++ b/devel/qt4-script/Makefile @@ -0,0 +1,68 @@ +# -*-mode: makefile-*- +# New ports collection makefile for: qt40 +# Date created: Wed Jun 29 11:49:42 CEST 2005 +# Whom: lofi@freebsd.org +# +# $FreeBSD$ +# + +PORTNAME= script +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 +CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} +PKGNAMEPREFIX= qt4- +DISTNAME= qt-x11-opensource-src-${PORTVERSION} +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt script + +USE_QT_VER= 4 +QT_COMPONENTS= qmake moc corelib +QT_NONSTANDARD= yes +QT_DIST= yes + +HAS_CONFIGURE= yes +USE_LDCONFIG= yes + +ALL_TARGET= first +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ + PATH=${WRKSRC}/bin:$$PATH +EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ + --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \ + --exclude '${DISTNAME}/demos' --exclude '${DISTNAME}/examples' \ + --exclude '${DISTNAME}/src/gui' --exclude '${DISTNAME}/src/network' \ + --exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \ + --exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/xml' \ + --exclude '${DISTNAME}/src/tools/moc' --exclude '${DISTNAME}/src/tools/rcc' \ + --exclude '${DISTNAME}/src/tools/uic' --exclude '${DISTNAME}/src/tools/uic3' \ + --exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \ + --exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \ + --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb' +WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} +CONFIGURE_WRKSRC=${WRKSRC}/../../ +PATCH_WRKSRC=${WRKSRC}/../../ + +.include + +pre-configure: + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ + -e 's|flat_headers.path.*|flat_headers.path=${PREFIX}/include/Qt|g' \ + -e 's|targ_headers.path.*|targ_headers.path=${PREFIX}/include/$$$$TARGET|g' \ + ${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/../qt_install.pri + ${MKDIR} ${WRKSRC}/../../mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + +post-configure: + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ + -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ + -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + ${WRKSRC}/../../lib/pkgconfig/*Qt* + +.include diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo new file mode 100644 index 000000000000..8fb631a2787d --- /dev/null +++ b/devel/qt4-script/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-script/pkg-descr b/devel/qt4-script/pkg-descr new file mode 100644 index 000000000000..efc79b9aaf24 --- /dev/null +++ b/devel/qt4-script/pkg-descr @@ -0,0 +1,12 @@ +Qt is a C++ toolkit for application development. It lets application +developers target all major operating systems with a single application +source code. + +Qt provides a platform-independent API to all central platform functionality: +GUI, database access, networking, file handling, etc. The Qt library +encapsulates the different APIs of different operating systems, providing +the application programmer with a single, common API for all operating systems. +The native C APIs are encapsulated in a set of well-designed, fully +object-oriented C++ classes. + +WWW: http://www.trolltech.com/products/qt/index.html diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist new file mode 100644 index 000000000000..9b91d242407b --- /dev/null +++ b/devel/qt4-script/pkg-plist @@ -0,0 +1,32 @@ +include/Qt/QtScript +include/Qt/qscriptable.h +include/Qt/qscriptcontext.h +include/Qt/qscriptengine.h +include/Qt/qscriptextensioninterface.h +include/Qt/qscriptextensionplugin.h +include/Qt/qscriptvalue.h +include/Qt/qscriptvalueiterator.h +include/QtScript/QScriptContext +include/QtScript/QScriptEngine +include/QtScript/QScriptExtensionInterface +include/QtScript/QScriptExtensionPlugin +include/QtScript/QScriptValue +include/QtScript/QScriptValueIterator +include/QtScript/QScriptValueList +include/QtScript/QScriptable +include/QtScript/QtScript +include/QtScript/qscriptable.h +include/QtScript/qscriptcontext.h +include/QtScript/qscriptengine.h +include/QtScript/qscriptextensioninterface.h +include/QtScript/qscriptextensionplugin.h +include/QtScript/qscriptvalue.h +include/QtScript/qscriptvalueiterator.h +lib/libQtScript.la +lib/libQtScript.prl +lib/libQtScript.so +lib/libQtScript.so.4 +lib/libQtScript.so.4.3 +lib/libQtScript.so.4.3.0 +libdata/pkgconfig/QtScript.pc +@dirrm include/QtScript diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index 7cb3777e061f..bbadecde2553 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -7,8 +7,8 @@ # PORTNAME= uic -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,21 +18,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt user interface compiler -BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4 - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-uic/distinfo +++ b/devel/qt4-uic/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index 978a886f670e..b83d0c891af6 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -7,8 +7,8 @@ # PORTNAME= uic3 -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,27 +18,13 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt backwards-compatible user interface compiler -BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4 -LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \ - QtCore:${PORTSDIR}/devel/qt4-corelib \ - QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ - QtNetwork:${PORTSDIR}/net/qt4-network \ - QtSql:${PORTSDIR}/databases/qt4-sql \ - QtXml:${PORTSDIR}/textproc/qt4-xml - -CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ - qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \ - xfmail-1.5.5_[1-2] +USE_QT_VER= 4 +QT_COMPONENTS= qmake qt3support corelib gui network sql xml +QT_NONSTANDARD= yes +QT_DIST= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= -fast -no-exceptions \ - -platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ - -qt-gif -release -system-libjpeg -system-libpng \ - -system-zlib -no-nas-sound -prefix ${PREFIX} \ - -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \ - -confirm-license - ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo index 48b91bd5d5e3..8fb631a2787d 100644 --- a/devel/qt4-uic3/distinfo +++ b/devel/qt4-uic3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99 -SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b -SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 +MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d +SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index c8e06ce49474..99a41fee6c5f 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -6,8 +6,8 @@ # PORTNAME= qt4 -PORTVERSION= 4.2.3 -PORTREVISION= 2 +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # none @@ -23,17 +23,20 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so ${LOCALBASE}/lib/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 \ qmake-qt4:${PORTSDIR}/devel/qmake4 \ assistant-qt4:${PORTSDIR}/devel/qt4-assistant \ ${LOCALBASE}/lib/libQtCore.so:${PORTSDIR}/devel/qt4-corelib \ designer-qt4:${PORTSDIR}/devel/qt4-designer \ ${LOCALBASE}/lib/libQtAssistantClient.so:${PORTSDIR}/devel/qt4-libqtassistantclient \ linguist-qt4:${PORTSDIR}/devel/qt4-linguist \ + makeqpf-qt4:${PORTSDIR}/devel/qt4-makeqpf \ moc-qt4:${PORTSDIR}/devel/qt4-moc \ qt3to4:${PORTSDIR}/devel/qt4-porting \ ${LOCALBASE}/lib/libQt3Support.so:${PORTSDIR}/devel/qt4-qt3support \ rcc:${PORTSDIR}/devel/qt4-rcc \ qvfb-qt4:${PORTSDIR}/devel/qt4-qvfb \ + ${LOCALBASE}/lib/libQtScript.so:${PORTSDIR}/devel/qt4-script \ uic-qt4:${PORTSDIR}/devel/qt4-uic \ uic3:${PORTSDIR}/devel/qt4-uic3 \ ${LOCALBASE}/lib/libQtTest.so:${PORTSDIR}/devel/qt4-qtestlib \ @@ -52,6 +55,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so NO_BUILD= yes +.include "${.CURDIR}/../../Mk/bsd.qt.mk" .include .if defined(WITH_SQL_PLUGINS) diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure index 34921f55b6f0..702882753b01 100644 --- a/devel/qt4/files/configure +++ b/devel/qt4/files/configure @@ -20,6 +20,14 @@ relpath=`(cd "$relpath"; /bin/pwd)` # the current directory is the "build tree" or "object tree" outpath=`/bin/pwd` +#license file location +LICENSE_FILE="$QT_LICENSE_FILE" +[ -z "$LICENSE_FILE" ] && LICENSE_FILE="$HOME/.qt-license" +if [ -f "$LICENSE_FILE" ]; then + tr -d '\r' <"$LICENSE_FILE" >"${LICENSE_FILE}.tmp" + diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp" +fi + # later cache the command line in config.status OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"` @@ -27,11 +35,11 @@ OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"` QMAKE_SWITCHES= QMAKE_VARS= QMAKE_CONFIG= +QTCONFIG_CONFIG= QT_CONFIG= - SUPPORTED= - QMAKE_VARS_FILE=.qmake.vars + exec 5> "$QMAKE_VARS_FILE" #------------------------------------------------------------------------------- @@ -176,6 +184,20 @@ elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ]; then Licensee="Preview" Edition="Preview" QT_EDITION="QT_EDITION_DESKTOP" +elif [ -f "$relpath"/LICENSE.SNAPSHOT.COMMERCIAL ]; then + # snapshot - commercial + [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes + [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes + Licensee="Snapshot" + Edition="Snapshot" + QT_EDITION="QT_EDITION_DESKTOP" +elif [ -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE ]; then + # snapshot - opensource + [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes + [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes + Licensee="Snapshot" + Edition="Snapshot" + QT_EDITION="QT_EDITION_OPENSOURCE" elif [ -f "$relpath"/LICENSE.TROLL ]; then # internal Trolltech edition [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes @@ -187,15 +209,9 @@ else [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes - # fix license file to quote the right side - newlicense=`cat "$HOME"/.qt-license | sed -e 's/=\([^\"]\)/=\"\1/g' -e 's/\([^\"]\)$/\1\"/g' ` - cat > "$HOME"/.qt-license-temp </dev/null 2>&1 + if [ -f "$LICENSE_FILE" ]; then + . "$LICENSE_FILE" >/dev/null 2>&1 if [ -z "$LicenseKeyExt" ]; then echo echo "You are using an old license file." @@ -439,16 +455,19 @@ for varname in $SYSTEM_VARIABLES; do fi'` eval "$cmd" done +# Use CC/CXX to run config.tests +mkdir -p "$outpath/config.tests" +rm -f "$outpath/config.tests/.qmake.cache" +cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" QMakeVar add styles "cde mac motif plastique cleanlooks windows" QMakeVar add decorations "default windows styled" QMakeVar add gfx-drivers "linuxfb" QMakeVar add kbd-drivers "tty" -QMakeVar add mouse-drivers "pc" +QMakeVar add mouse-drivers "pc linuxtp" if [ "$Edition" = "Trolltech" ]; then QMakeVar add kbd-drivers "um" - QMakeVar add mouse-drivers "linuxtp" # adjust below as well fi # QTDIR may be set and point to an old or system-wide Qt installation @@ -465,6 +484,7 @@ CFG_INCREMENTAL=auto CFG_QCONFIG=full CFG_EMBEDDED=no CFG_DEBUG=auto +CFG_MYSQL_CONFIG= CFG_DEBUG_RELEASE=no CFG_SHARED=yes CFG_SM=auto @@ -472,7 +492,9 @@ CFG_XSHAPE=auto CFG_XINERAMA=auto CFG_ZLIB=auto CFG_SQLITE=qt -CFG_GIF=no +CFG_GIF=auto +CFG_TIFF=auto +CFG_LIBTIFF=auto CFG_PNG=yes CFG_LIBPNG=auto CFG_JPEG=auto @@ -483,16 +505,18 @@ CFG_XCURSOR=auto CFG_XRANDR=auto CFG_XRENDER=auto CFG_OPENGL=auto +CFG_SSE=auto CFG_FONTCONFIG=auto CFG_QWS_FREETYPE=auto CFG_LIBFREETYPE=auto CFG_SQL_AVAILABLE= -QT_DEFAULT_BUILD_PARTS="libs tools examples" +QT_DEFAULT_BUILD_PARTS="libs tools examples demos" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" +CFG_RELEASE_QMAKE=no -CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc" -CFG_GFX_ON="linuxfb" +CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen" +CFG_GFX_ON="linuxfb multiscreen" CFG_GFX_PLUGIN_AVAILABLE= CFG_GFX_PLUGIN= CFG_GFX_OFF= @@ -524,10 +548,16 @@ CFG_ICONV=auto CFG_QDBUS=auto CFG_GLIB=auto CFG_LARGEFILE=auto +CFG_OPENSSL=auto CFG_STL=auto -CFG_PRECOMPILE=no +CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=auto CFG_REDUCE_EXPORTS=auto +CFG_MMX=auto +CFG_3DNOW=auto +CFG_SSE=auto +CFG_SSE2=auto +CFG_REDUCE_RELOCATIONS=no CFG_IPV6=auto CFG_NAS=no CFG_QWS_DEPTHS=prompted @@ -536,14 +566,18 @@ CFG_ACCESSIBILITY=auto CFG_QT3SUPPORT=yes CFG_ENDIAN=auto CFG_DOUBLEFORMAT=auto +CFG_ARMFPA=auto CFG_IWMMXT=no +CFG_CLOCK_MONOTONIC=auto +CFG_MREMAP=auto CFG_GETADDRINFO=auto CFG_IPV6IFNAME=auto CFG_GETIFADDRS=auto CFG_INOTIFY=auto CFG_RPATH=yes CFG_FRAMEWORK=auto -CFG_UNIVERSAL_BINARY=auto +CFG_MAC_ARCHS= +CFG_MAC_DWARF2=no CFG_SXE=no CFG_PREFIX_INSTALL=yes CFG_SDK= @@ -601,30 +635,46 @@ CFG_SQL_tds=no CFG_SQL_oci=no CFG_SQL_db2=no -CFG_SQL_AVAILABLE=`find "$relpath"/src/plugins/sqldrivers/* -prune -type d -exec basename {} \;` -CFG_SQL_AVAILABLE=`echo $CFG_SQL_AVAILABLE` # normalize whitespace -# by default, auto-detect which sql drivers can be built -for i in $CFG_SQL_AVAILABLE; do - eval "CFG_SQL_$i=auto" -done +CFG_SQL_AVAILABLE= +if [ -d "$relpath/src/plugins/sqldrivers" ]; then + for a in "$relpath/src/plugins/sqldrivers/"*; do + if [ -d "$a" ]; then + base_a=`basename $a` + CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}" + eval "CFG_SQL_${base_a}=auto" + fi + done +fi -CFG_DECORATION_PLUGIN_AVAILABLE="" +CFG_DECORATION_PLUGIN_AVAILABLE= if [ -d "$relpath/src/plugins/decorations" ]; then - CFG_DECORATION_PLUGIN_AVAILABLE=`find "$relpath"/src/plugins/decorations/* -prune -type d -exec basename {} \;` - CFG_DECORATION_PLUGIN_AVAILABLE=`echo $CFG_DECORATION_PLUGIN_AVAILABLE` # normalize whitespace + for a in "$relpath/src/plugins/decorations/"*; do + if [ -d "$a" ]; then + base_a=`basename $a` + CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}" + fi + done fi -CFG_MOUSE_PLUGIN_AVAILABLE="" +CFG_MOUSE_PLUGIN_AVAILABLE= if [ -d "$relpath/src/plugins/mousedrivers" ]; then - CFG_MOUSE_PLUGIN_AVAILABLE=`find "$relpath"/src/plugins/mousedrivers/* -prune -type d -exec basename {} \;` - CFG_MOUSE_PLUGIN_AVAILABLE=`echo $CFG_MOUSE_PLUGIN_AVAILABLE` # normalize whitespace + for a in "$relpath/src/plugins/mousedrivers/"*; do + if [ -d "$a" ]; then + base_a=`basename $a` + CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}" + fi + done fi -CFG_GFX_PLUGIN_AVAILABLE="" +CFG_GFX_PLUGIN_AVAILABLE= if [ -d "$relpath/src/plugins/gfxdrivers" ]; then - CFG_GFX_PLUGIN_AVAILABLE=`find "$relpath"/src/plugins/gfxdrivers/* -prune -type d -exec basename {} \;` - CFG_GFX_PLUGIN_AVAILABLE=`echo $CFG_GFX_PLUGIN_AVAILABLE` # normalize whitespace - CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off + for a in "$relpath/src/plugins/gfxdrivers/"*; do + if [ -d "$a" ]; then + base_a=`basename $a` + CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}" + fi + done + CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off fi #------------------------------------------------------------------------------- @@ -668,7 +718,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-glib|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-glib|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -683,7 +733,7 @@ while [ "$#" -gt 0 ]; do UNKNOWN_ARG=yes fi ;; - -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk) + -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -811,9 +861,15 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + license) + LICENSE_FILE="$VAL" + ;; gnumake) CFG_USE_GNUMAKE="$VAL" ;; + mysql_config) + CFG_MYSQL_CONFIG="$VAL" + ;; prefix) QT_INSTALL_PREFIX="$VAL" ;; @@ -869,6 +925,13 @@ while [ "$#" -gt 0 ]; do CFG_EMBEDDED=no fi ;; + sse) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_SSE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; endian) if [ "$VAL" = "little" ]; then CFG_ENDIAN="Q_LITTLE_ENDIAN" @@ -878,6 +941,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + armfpa) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_ARMFPA="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; depths) CFG_QWS_DEPTHS="$VAL" ;; @@ -927,9 +997,23 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - universal) + dwarf2) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_MAC_DWARF2="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + arch) if [ "$PLATFORM_MAC" = "yes" ]; then - CFG_UNIVERSAL_BINARY="$VAL" + CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL" + else + UNKNOWN_OPT=yes + fi + ;; + universal) + if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then + CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86 ppc" else UNKNOWN_OPT=yes fi @@ -1007,6 +1091,19 @@ while [ "$#" -gt 0 ]; do unixware7-g++) PLATFORM=unixware-g++ ;; + macx-g++-64) + PLATFORM=macx-g++ + NATIVE_64_ARCH= + case `uname -p` in + i386) NATIVE_64_ARCH="x86_64" ;; + powerpc) NATIVE_64_ARCH="ppc64" ;; + *) echo "WARNING: Can't detect CPU architecture for macx-g++-64" ;; + esac + if [ ! -z "$NATIVE_64_ARCH" ]; then + QTCONFIG_CONFIG="$QTCONFIG_CONFIG $NATIVE_64_ARCH" + CFG_MAC_ARCHS="$CFG_MAC_ARCHS $NATIVE_64_ARCH" + fi + ;; esac ;; xplatform) @@ -1019,6 +1116,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + optimized-qmake) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_RELEASE_QMAKE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; release) if [ "$VAL" = "yes" ]; then CFG_DEBUG=no @@ -1147,6 +1251,41 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + mmx) + if [ "$VAL" = "no" ]; then + CFG_MMX="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + 3dnow) + if [ "$VAL" = "no" ]; then + CFG_3DNOW="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + sse) + if [ "$VAL" = "no" ]; then + CFG_SSE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + sse2) + if [ "$VAL" = "no" ]; then + CFG_SSE2="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + reduce-relocations) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_REDUCE_RELOCATIONS="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; freetype) [ "$VAL" = "qt" ] && VAL=yes if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then @@ -1195,6 +1334,14 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + libtiff) + [ "$VAL" = "yes" ] && VAL=qt + if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then + CFG_LIBTIFF="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; nas-sound) if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then CFG_NAS="$VAL" @@ -1286,6 +1433,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + openssl) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_OPENSSL="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; confirm-license) if [ "$VAL" = "yes" ]; then OPT_CONFIRM_LICENSE="$VAL" @@ -1485,6 +1639,7 @@ fi # where to find which.. unixtests="$relpath/config.tests/unix" +mactests="$relpath/config.tests/mac" WHICH="$unixtests/which.test" # find out which awk we want to use, prefer gawk, then nawk, then regular awk @@ -2078,36 +2233,41 @@ else CFG_FRAMEWORK=no fi -# find the default universal value -if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_UNIVERSAL_BINARY" = "auto" ]; then - CFG_UNIVERSAL_BINARY="no" #any other default? ### - fi -else - CFG_UNIVERSAL_BINARY="no" -fi - -TEST_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` +TEST_COMPILER="$CC" +[ -z "$TEST_COMPILE" ] && TEST_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` # auto-detect precompiled header support if [ "$CFG_PRECOMPILE" = "auto" ]; then - if [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then + if [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then CFG_PRECOMPILE=no elif "$unixtests/precomp.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then CFG_PRECOMPILE=no else CFG_PRECOMPILE=yes fi -elif [ "$CFG_PRECOMPILE" = "yes" ] && [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then +elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then echo echo "WARNING: Using universal binaries disables precompiled headers." echo CFG_PRECOMPILE=no fi +#auto-detect DWARF2 on the mac +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" != "no" ]; then + if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then + CFG_MAC_DWARF2=no + else + CFG_MAC_DWARF2=yes + fi +fi + # auto-detect support for separate debug info in objcopy -if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ] && [ "$CFG_SHARED" = "yes" ]; then - COMPILER_WITH_FLAGS="$TEST_COMPILER `getQMakeConf | sed -n -e 's/QMAKE_CFLAGS[^_].*=//p'`" +if [ "$CFG_SEPARATE_DEBUG_INFO" != "no" ] && [ "$CFG_SHARED" = "yes" ]; then + TEST_COMPILER_CFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CFLAGS[^_].*=%%p' | tr '\n' ' '` + TEST_COMPILER_CXXFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CXXFLAGS[^_].*=%%p' | tr '\n' ' '` + TEST_CXX_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s%.* *= *\(.*\)$%\1%" | tr '\n' ' '` + COMPILER_WITH_FLAGS="$TEST_CXX_COMPILER $TEST_COMPILER_CXXFLAGS" + COMPILER_WITH_FLAGS=`echo "$COMPILER_WITH_FLAGS" | sed -e "s%\\$\\$QMAKE_CFLAGS%$TEST_COMPILER_CFLAGS%"` if "$unixtests/objcopy.test" "$COMPILER_WITH_FLAGS" "$OPT_VERBOSE"; then CFG_SEPARATE_DEBUG_INFO=no else @@ -2132,28 +2292,21 @@ if [ "$CFG_REDUCE_EXPORTS" = "auto" ]; then fi fi -# detect sse support -if "$unixtests/sse.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then - CFG_HAVE_SSE=no -else - CFG_HAVE_SSE=yes -fi - -# check iwmmxt support -if [ "$CFG_IWMMXT" = "yes" ]; then - if ! "$unixtests/iwmmxt.test" "$XQMAKESPEC" "$OPT_VERBOSE"; then - echo "The iwmmxt functionality test failed!" - echo " Please make sure your compiler supports iwmmxt intrinsics!" - exit 1 +# detect the availability of the -Bsymbolic-functions linker optimization +if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then + if "$unixtests/bsymbolic_functions.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then + CFG_REDUCE_RELOCATIONS=no + else + CFG_REDUCE_RELOCATIONS=yes fi fi -#auto-detect GNU make support +# auto-detect GNU make support if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then CFG_USE_GNUMAKE=yes fi -#mac +# mac if [ "$PLATFORM_MAC" = "yes" ]; then if [ "$CFG_OPENGL" = "auto" ]; then CFG_OPENGL=yes @@ -2174,16 +2327,7 @@ else CFG_FRAMEWORK=no fi -# find the default universal value -if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_UNIVERSAL_BINARY" = "auto" ]; then - CFG_UNIVERSAL_BINARY="no" #any other default? ### - fi -else - CFG_UNIVERSAL_BINARY="no" -fi - -#x11 tests are done after qmake is built +# x11 tests are done after qmake is built # embedded if [ "$PLATFORM_QWS" = "yes" ]; then @@ -2404,19 +2548,20 @@ if [ "$OPT_HELP" = "yes" ]; then Usage: $relconf [-prefix ] [-prefix-install] [-bindir ] [-libdir ] [-docdir ] [-headerdir ] [-plugindir ] [-datadir ] [-translationdir ] [-sysconfdir ] [-examplesdir ] - [-demosdir ] [-buildkey ] [-release] [-debug] + [-demosdir ] [-buildkey ] [-release] [-debug] [-debug-and-release] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] [-plugin-sql-] [-system-sqlite] [-no-qt3support] [-qt3support] [-platform] [-D ] [-I ] [-L ] [-help] [-no-zlib] - [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libpng] [-qt-libpng] - [-system-libpng] [-no-libmng] [-qt-libmng] [-system-libmng] [-no-libjpeg] - [-qt-libjpeg] [-system-libjpeg] [-make ] [-no-make ] - [-R ] [-l ] [-no-rpath] [-rpath] [-continue] + [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-system-libtiff] + [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] + [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] + [-no-make ] [-R ] [-l ] [-no-rpath] [-rpath] [-continue] [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv] [-iconv] [-no-pch] [-pch] [-no-qdbus] [-qdbus] [-no-separate-debug-info] - [-separate-debug-info] + [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] + [-separate-debug-info] [-armfpa] [-no-optimized-qmake] [-optimized-qmake] [additional platform specific options (see below)] @@ -2533,6 +2678,11 @@ fi See the README file for a list of supported operating systems and compilers. + -no-mmx ............ Do not compile with use of MMX instructions. + -no-3dnow .......... Do not compile with use of 3DNOW instructions. + -no-sse ............ Do not compile with use of SSE instructions. + -no-sse2 ........... Do not compile with use of SSE2 instructions. + -D ........ Add an explicit define to the preprocessor. -I ........ Add an explicit include path. -L ........ Add an explicit library path. @@ -2550,6 +2700,11 @@ Third Party Libraries: -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. + -qt-libtiff ........ Use the libtiff bundled with Qt. + + -system-libtiff .... Use libtiff from the operating system. + See http://www.libtiff.org + -no-libpng ......... Do not compile in PNG support. -qt-libpng ......... Use the libpng bundled with Qt. + -system-libpng ..... Use libpng from the operating system. @@ -2565,6 +2720,9 @@ Third Party Libraries: + -system-libjpeg .... Use libjpeg from the operating system. See http://www.ijg.org + -no-openssl ........ Do not compile support for OpenSSL. + + -openssl ........... Use OpenSSL from the operating system. + Additional options: -make ....... Add part to the list of parts to be built at make time. @@ -2589,6 +2747,9 @@ Additional options: -silent ............ Reduce the build output so that warnings and errors can be seen more easily. + * -no-optimized-qmake ... Do not build qmake optimized. + -optimized-qmake ...... Build qmake optimized. + $NSN -no-nis ............ Do not compile NIS support. $NSY -nis ............... Compile NIS support. @@ -2604,8 +2765,9 @@ Additional options: $DBN -no-qdbus........... Do not compile the QtDBus module. $DBY -qdbus.............. Compile the QtDBus module. - $SBN -no-separate-debug-info Do not store debug information in a separate file - $SBY -separate-debug-info Strip debug information into a separate .debug file + -reduce-relocations ... Reduce relocations in the libraries through extra linker + optimizations (Qt/X11 / Qtopia/Core only; + experimental; needs GNU ld >= 2.18) EOF @@ -2741,6 +2903,9 @@ Qt/X11 only: $GBN -no-glib............ Do not compile Glib support. $GBY -glib............... Compile Glib support. + $SBN -no-separate-debug-info Do not store debug information in a separate file + $SBY -separate-debug-info Strip debug information into a separate .debug file + EOF fi @@ -2756,9 +2921,13 @@ Qt/Mac only: link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. - -universal ......... Build Qt as a universal binary to work on intel - as well as PPC platforms. - * -no-universal ...... Build Qt and its tools to work only on this host platform. + -dwarf2 ............ Enable dwarf2 debugging symbols. + * -no-dwarf2 ......... Disable dwarf2 debugging symbols. + + -universal ......... Equivalent to -arch "ppc x86" + + -arch ....... Build Qt for + Example values for : x86 ppc x86_64 ppc64 -sdk .......... Build Qt using Apple provided SDK . @@ -2780,6 +2949,12 @@ Qtopia Core only: proper license for this switch to work. Example values for : arm mips x86 generic + -armfpa ............. Target platform is uses the ARM-FPA floating point format. + -no-armfpa .......... Target platform does not use the ARM-FPA floating point format. + + The floating point format is usually autodetected by configure. Use this + to override the detected value. + -little-endian ...... Target platform is little endian (LSB first). -big-endian ......... Target platform is big endian (MSB first). @@ -2959,6 +3134,41 @@ elif [ "$Edition" = "Preview" ]; then fi fi done +elif [ "$Edition" = "Snapshot" ]; then + while true; do + if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then + echo "You have already accepted the terms of the $LicenseType license." + acceptance=yes + else + echo "You are licensed to use this software under the terms of" + echo "the Qt SNAPSHOT VERSION LICENSE AGREEMENT" + echo + echo "Type '?' to read the Snapshot License." + echo "Type 'yes' to accept this license offer." + echo "Type 'no' to decline this license offer." + echo + if echo '\c' | grep '\c' >/dev/null; then + echo -n "Do you accept the terms of the license? " + else + echo "Do you accept the terms of the license? \c" + fi + read acceptance + fi + echo + if [ "$acceptance" = "yes" ]; then + break + elif [ "$acceptance" = "no" ] ;then + echo "You are not licensed to use this software." + echo + exit 0 + elif [ "$acceptance" = "?" ]; then + if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then + more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE" + else + more "$relpath/LICENSE.SNAPSHOT.COMMERCIAL" + fi + fi + done elif [ "$Edition" != "Trolltech" ]; then if [ -n "$ExpiryDate" ]; then ExpiryDate=`echo $ExpiryDate | sed -e "s,-,,g" | tr -d "\n\r"` @@ -3150,7 +3360,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() { - variableRegExp="$1[^_A-Z0-9]" + variableRegExp="^$1[^_A-Z0-9]" getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK ' { varLength = index($0, "=") - 1 @@ -3169,7 +3379,7 @@ END { printf "%s =", var for (i = 1; i <= NR; ++i) printf " $(%s_%s)", var, i - printf "\n" + printf "\n" } }' >> "$mkfile" } @@ -3232,13 +3442,19 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)" EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" + + if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then + EXTRA_LFLAGS="$EXTRA_LFLAGS -lm" + fi + [ -n "$CC" ] && echo "CC = $CC" >>$mkfile + [ -n "$CXX" ] && echo "CXX = $CXX" >>$mkfile if [ "$CFG_SILENT" = "yes" ]; then - setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,' - setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,' + [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC.*=,CC=\@,' + [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX.*=,CXX=\@,' else - setBootstrapVariable QMAKE_CC 's,QMAKE_CC,CC,' - setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX,CXX,' + [ -z "$CC" ] && setBootstrapVariable QMAKE_CC 's,QMAKE_CC,CC,' + [ -z "$CXX" ] && setBootstrapVariable QMAKE_CXX 's,QMAKE_CXX,CXX,' fi setBootstrapVariable QMAKE_CFLAGS setBootstrapVariable QMAKE_CXXFLAGS 's,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS),' @@ -3250,12 +3466,18 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; else echo "include Makefile.commercial" >>"$mkfile" fi - if [ "$CFG_DEBUG" = "yes" ]; then + if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then + setBootstrapVariable QMAKE_CFLAGS_RELEASE + setBootstrapVariable QMAKE_CXXFLAGS_RELEASE 's,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE),' + EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" + elif [ "$CFG_DEBUG" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_DEBUG setBootstrapVariable QMAKE_CXXFLAGS_DEBUG 's,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG),' EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" fi + if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then setBootstrapVariable QMAKE_RPATH 's,\$\$LITERAL_WHITESPACE, ,' for rpath in $RPATH_FLAGS; do @@ -3263,21 +3485,26 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; done fi if [ "$PLATFORM_MAC" = "yes" ]; then - echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>"$mkfile" + echo "export MACOSX_DEPLOYMENT_TARGET = 10.3" >>"$mkfile" echo "CARBON_LFLAGS =-framework CoreServices -framework CoreFoundation" >>"$mkfile" EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)" EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)" EXTRA_CXXFLAGS="$EXTRA_CFLAGS \$(CARBON_CXXFLAGS)" 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 [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then + if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then X86_CFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CFLAGS_X86[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` X86_LFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_LFLAGS_X86[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` + EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS" + EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS" + EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS" + fi + if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then PPC_CFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CFLAGS_PPC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` PPC_LFLAGS=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_LFLAGS_PPC[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` - EXTRA_CFLAGS="$X86_CFLAGS $PPC_CFLAGS $EXTRA_CFLAGS" - EXTRA_CXXFLAGS="$X86_CFLAGS $PPC_CFLAGS $EXTRA_CXXFLAGS" - EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS $PPC_LFLAGS" + EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS" + EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS" + EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS" fi if [ '!' -z "$CFG_SDK" ]; then echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile" @@ -3326,9 +3553,61 @@ fi # Build qmake # tests that need qmake #------------------------------------------------------------------------------- +# detect availability of float math.h functions +if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_USE_FLOATMATH=yes +else + CFG_USE_FLOATMATH=no +fi + +# detect mmx support +if [ "${CFG_MMX}" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then + CFG_MMX=yes + else + CFG_MMX=no + fi +fi + +# detect 3dnow support +if [ "${CFG_3DNOW}" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then + CFG_3DNOW=yes + else + CFG_3DNOW=no + fi +fi + +# detect sse support +if [ "${CFG_SSE}" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then + CFG_SSE=yes + else + CFG_SSE=no + fi +fi + +# detect sse2 support +if [ "${CFG_SSE2}" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then + CFG_SSE2=yes + else + CFG_SSE2=no + fi +fi + +# check iWMMXt support +if [ "$CFG_IWMMXT" = "yes" ]; then + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"; then + echo "The iWMMXt functionality test failed!" + echo " Please make sure your compiler supports iWMMXt intrinsics!" + exit 1 + fi +fi + # detect zlib if [ "$CFG_ZLIB" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_ZLIB=system else CFG_ZLIB=yes @@ -3345,13 +3624,40 @@ if [ "$CFG_JPEG" = "auto" ]; then fi # detect jpeg if [ "$CFG_LIBJPEG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_LIBJPEG=system else CFG_LIBJPEG=qt fi fi +# detect how gif should be built +if [ "$CFG_GIF" = "auto" ]; then + if [ "$CFG_SHARED" = "yes" ]; then + CFG_GIF=plugin + else + CFG_GIF=yes + fi +fi + +# detect how tiff should be built +if [ "$CFG_TIFF" = "auto" ]; then + if [ "$CFG_SHARED" = "yes" ]; then + CFG_TIFF=plugin + else + CFG_TIFF=yes + fi +fi + +# detect tiff +if [ "$CFG_LIBTIFF" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_LIBTIFF=system + else + CFG_LIBTIFF=qt + fi +fi + # detect how mng should be built if [ "$CFG_MNG" = "auto" ]; then if [ "$CFG_SHARED" = "yes" ]; then @@ -3362,7 +3668,7 @@ if [ "$CFG_MNG" = "auto" ]; then fi # detect mng if [ "$CFG_LIBMNG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_LIBMNG=system else CFG_LIBMNG=qt @@ -3371,7 +3677,7 @@ fi # detect png if [ "$CFG_LIBPNG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_LIBPNG=system else CFG_LIBPNG=qt @@ -3388,15 +3694,17 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do case $_SQLDR in mysql) if [ "$CFG_SQL_mysql" != "no" ]; then - if "$WHICH" mysql_config >/dev/null 2>&1; then - QT_CFLAGS_MYSQL=`mysql_config --include 2>/dev/null` - QT_LFLAGS_MYSQL_R=`mysql_config --libs_r 2>/dev/null` - QT_LFLAGS_MYSQL=`mysql_config --libs 2>/dev/null` - QT_MYSQL_VERSION=`mysql_config --version | cut -d . -f 1` + [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config` + if [ -x "$CFG_MYSQL_CONFIG" ]; then + QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` + QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` + QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` + QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` + QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` fi - if [ -n "$QT_MYSQL_VERSION" ] && [ "$QT_MYSQL_VERSION" -lt 4 ]; then + if [ -n "$QT_MYSQL_VERSION" ] && [ "$QT_MYSQL_VERSION_MAJOR" -lt 4 ]; then if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "This version of MySql is not supported (`mysql_config --version`)." + echo "This version of MySql is not supported ($QT_MYSQL_VERSION)." echo " You need MySql 4 or higher." echo " If you believe this message is in error you may use the continue" echo " switch (-continue) to $0 to continue." @@ -3408,13 +3716,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do QT_CFLAGS_MYSQL="" fi else - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql_r "MySQL (thread-safe)" $QT_LFLAGS_MYSQL_R $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then QMakeVar add CONFIG use_libmysqlclient_r if [ "$CFG_SQL_mysql" = "auto" ]; then CFG_SQL_mysql=plugin fi QT_LFLAGS_MYSQL="$QT_LFLAGS_MYSQL_R" - elif "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mysql "MySQL (thread-unsafe)" $QT_LFLAGS_MYSQL $L_FLAGS $QT_CFLAGS_MYSQL $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_mysql" = "auto" ]; then CFG_SQL_mysql=plugin fi @@ -3443,7 +3751,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" - if "$unixtests/compile.test" $XQMAKESPEC $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_psql" = "auto" ]; then CFG_SQL_psql=plugin fi @@ -3464,7 +3772,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; odbc) if [ "$CFG_SQL_odbc" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_odbc" = "auto" ]; then CFG_SQL_odbc=plugin fi @@ -3483,7 +3791,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; oci) if [ "$CFG_SQL_oci" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/oci "OCI" $L_FLAGS $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_oci" = "auto" ]; then CFG_SQL_oci=plugin fi @@ -3502,7 +3810,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; tds) if [ "$CFG_SQL_tds" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_tds" = "auto" ]; then CFG_SQL_tds=plugin fi @@ -3521,7 +3829,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; db2) if [ "$CFG_SQL_db2" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/db2 "DB2" $L_FLAGS $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_db2" = "auto" ]; then CFG_SQL_db2=plugin fi @@ -3540,7 +3848,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; ibase) if [ "$CFG_SQL_ibase" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ibase "InterBase" $L_FLAGS $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_ibase" = "auto" ]; then CFG_SQL_ibase=plugin fi @@ -3559,7 +3867,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; sqlite2) if [ "$CFG_SQL_sqlite2" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite2 "SQLite2" $L_FLAGS $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_sqlite2" = "auto" ]; then CFG_SQL_sqlite2=plugin fi @@ -3584,11 +3892,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do QT_CFLAGS_SQLITE=`pkg-config --cflags sqlite3` QT_LFLAGS_SQLITE=`pkg-config --libs sqlite3` fi - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_sqlite" = "auto" ]; then CFG_SQL_sqlite=plugin - QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" fi + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" else SQLITE_AUTODETECT_FAILED="yes" CFG_SQL_sqlite=no @@ -3621,7 +3929,7 @@ done # auto-detect NIS support if [ "$CFG_NIS" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/nis "NIS" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_NIS=yes else if [ "$CFG_NIS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3638,7 +3946,7 @@ fi # auto-detect CUPS support if [ "$CFG_CUPS" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/cups "Cups" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_CUPS=yes else if [ "$CFG_CUPS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3657,9 +3965,9 @@ fi if [ "$CFG_ICONV" != "no" ]; then if [ "$PLATFORM_QWS" = "yes" ]; then CFG_ICONV=no - elif "$unixtests/compile.test" "$XQMAKESPEC" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then CFG_ICONV=yes - elif "$unixtests/compile.test" "$XQMAKESPEC" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" "$L_FLAGS" "$I_FLAGS" "$l_FLAGS"; then CFG_ICONV=gnu else if [ "$CFG_ICONV" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3681,7 +3989,7 @@ if [ "$CFG_QDBUS" != "no" ]; then QT_CFLAGS_DBUS=`pkg-config --cflags dbus-1` QT_LIBS_DBUS=`pkg-config --libs dbus-1` fi - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "dbus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/dbus "D-Bus" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DBUS $QT_LIBS_DBUS; then CFG_QDBUS=yes QMakeVar set QT_CFLAGS_DBUS "$QT_CFLAGS_DBUS" QMakeVar set QT_LIBS_DBUS "$QT_LIBS_DBUS" @@ -3713,7 +4021,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect OpenGL support if [ "$CFG_OPENGL" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_OPENGL=yes else CFG_OPENGL=no @@ -3722,7 +4030,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Xcursor support if [ "$CFG_XCURSOR" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xcursor "Xcursor" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xcursor "Xcursor" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_XCURSOR=yes else if [ "$CFG_XCURSOR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3739,7 +4047,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Xfixes support if [ "$CFG_XFIXES" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xfixes "Xfixes" $L_FLAGS $I_FLAGS $X11TESTS_FLAGS; then CFG_XFIXES=yes else if [ "$CFG_XFIXES" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3756,7 +4064,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Xrandr support (resize and rotate extension) if [ "$CFG_XRANDR" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrandr "Xrandr" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrandr "Xrandr" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_XRANDR=yes else if [ "$CFG_XRANDR" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3773,7 +4081,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Xrender support if [ "$CFG_XRENDER" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_XRENDER=yes else if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3790,7 +4098,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_FONTCONFIG=yes QMakeVar set QMAKE_LIBS_X11 '-lfreetype -lfontconfig $$QMAKE_LIBS_X11' CFG_LIBFREETYPE=system @@ -3809,7 +4117,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Session Management support if [ "$CFG_SM" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/sm "Session Management" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/sm "Session Management" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_SM=yes else if [ "$CFG_SM" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3826,7 +4134,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect SHAPE support if [ "$CFG_XSHAPE" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xshape "XShape" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xshape "XShape" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_XSHAPE=yes else if [ "$CFG_XSHAPE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3843,7 +4151,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect Xinerama support if [ "$CFG_XINERAMA" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_XINERAMA=yes else if [ "$CFG_XINERAMA" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3860,7 +4168,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect tablet support (currenlty only in IRIX) if [ "$CFG_TABLET" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "Tablet (XInput)" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput "Tablet (XInput)" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_TABLET=yes else if [ "$CFG_TABLET" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3877,7 +4185,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then # auto-detect XKB support if [ "$CFG_XKB" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xkb "XKB" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xkb "XKB" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_XKB=yes else if [ "$CFG_XKB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -3898,7 +4206,7 @@ if [ "$PLATFORM_X11" = "yes" ]; 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 - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then CFG_GLIB=yes QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB" QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB" @@ -3919,10 +4227,22 @@ fi # X11 # QWS if [ "$PLATFORM_QWS" = "yes" ]; then + # OpenGL ES + if [ "$CFG_OPENGL" = "yes" ]; then + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/opengles "OpenGL ES" $L_FLAGS $I_FLAGS $l_FLAGS; then + echo "The OpenGL ES functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" + echo " ${XQMAKESPEC}." + exit 1 + fi + + fi + # mouse drivers for mouse in ${CFG_MOUSE_ON} ${CFG_MOUSE_PLUGIN}; do if [ "${mouse}" = "tslib" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then - if ! "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; then + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tslib "tslib" $L_FLAGS $I_FLAGS $l_FLAGS; then echo "The tslib functionality test failed!" echo " You might need to add additional include and library search paths" echo " by passing the -I and -L switches to $0." @@ -3937,14 +4257,13 @@ fi # QWS [ "x$CFG_EMBEDDED" != "xno" ] && CFG_LIBFREETYPE="$CFG_QWS_FREETYPE" [ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no if [ "$CFG_LIBFREETYPE" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS ; then CFG_LIBFREETYPE=system else CFG_LIBFREETYPE=yes fi fi - if [ "$CFG_ENDIAN" = "auto" ]; then if [ "$PLATFORM_MAC" = "yes" ]; then true #leave as auto @@ -3966,6 +4285,19 @@ if [ "$CFG_ENDIAN" = "auto" ]; then fi fi +if [ "$CFG_ARMFPA" != "auto" ]; then + if [ "$CFG_ARMFPA" = "yes" ]; then + if [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then + CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED" + else + CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED" + fi + else + CFG_DOUBLEFORMAT="normal" + fi +fi + + if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then if [ "$PLATFORM_QWS" != "yes" ]; then CFG_DOUBLEFORMAT=normal @@ -3982,8 +4314,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then CFG_DOUBLEFORMAT="Q_DOUBLE_BIG" elif [ "$F" -eq 12 ]; then CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED" + CFG_ARMFPA="yes" elif [ "$F" -eq 13 ]; then CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED" + CFG_ARMFPA="yes" else echo echo "The system floating point format could not be detected." @@ -3996,7 +4330,7 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then fi fi if [ "$CFG_STL" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_STL=yes else if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4013,7 +4347,7 @@ fi # find if the platform supports IPv6 if [ "$CFG_IPV6" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_IPV6=yes else if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4028,9 +4362,27 @@ if [ "$CFG_IPV6" != "no" ]; then fi fi +# detect POSIX monotonic clocks +if [ "$CFG_CLOCK_MONOTONIC" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-monotonic "POSIX Monotonic Clock" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_CLOCK_MONOTONIC=yes + else + CFG_CLOCK_MONOTONIC=no + fi +fi + +# detect mremap +if [ "$CFG_MREMAP" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mremap "mremap" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_MREMAP=yes + else + CFG_MREMAP=no + fi +fi + # find if the platform provides getaddrinfo (ipv6 dns lookups) if [ "$CFG_GETADDRINFO" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getaddrinfo "getaddrinfo" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getaddrinfo "getaddrinfo" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_GETADDRINFO=yes else if [ "$CFG_GETADDRINFO" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4047,7 +4399,7 @@ fi # find if the platform provides inotify if [ "$CFG_INOTIFY" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/inotify "inotify" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/inotify "inotify" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_INOTIFY=yes else if [ "$CFG_INOTIFY" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4064,7 +4416,7 @@ fi # find if the platform provides if_nametoindex (ipv6 interface name support) if [ "$CFG_IPV6IFNAME" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6ifname "IPv6 interface name" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6ifname "IPv6 interface name" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_IPV6IFNAME=yes else if [ "$CFG_IPV6IFNAME" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4081,7 +4433,7 @@ fi # find if the platform provides getifaddrs (network interface enumeration) if [ "$CFG_GETIFADDRS" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getifaddrs "getifaddrs" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/getifaddrs "getifaddrs" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_GETIFADDRS=yes else if [ "$CFG_GETIFADDRS" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4098,7 +4450,7 @@ fi # find if the platform supports X/Open Large File compilation environment if [ "$CFG_LARGEFILE" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_LARGEFILE=yes else if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then @@ -4113,6 +4465,23 @@ if [ "$CFG_LARGEFILE" != "no" ]; then fi fi +# detect OpenSSL +if [ "$CFG_OPENSSL" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_OPENSSL=yes + else + if [ "$CFG_OPENSSL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "OpenSSL support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_OPENSSL=no + fi + fi +fi + #------------------------------------------------------------------------------- # ask for all that hasn't been auto-detected or specified in the arguments #------------------------------------------------------------------------------- @@ -4122,6 +4491,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then echo echo "Choose pixel-depths to support:" echo + echo " 4. 4bpp grayscale" echo " 8. 8bpp" echo " 16. 16bpp" echo " 18. 18bpp" @@ -4142,6 +4512,11 @@ if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then done fi +# enable dwarf2 support on Mac +if [ "$CFG_MAC_DWARF2" = "yes" ]; then + QT_CONFIG="$QT_CONFIG dwarf2" +fi + # enable Qt 3 support functionality if [ "$CFG_QT3SUPPORT" = "yes" ]; then QT_CONFIG="$QT_CONFIG qt3support" @@ -4158,6 +4533,13 @@ fi if [ "$CFG_OPENGL" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" else + if [ "$PLATFORM_QWS" = "yes" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES" + QCONFIG_FLAGS="$QCONFIG_FLAGS Q_USE_EGLWINDOWSURFACE" + + # The examples and demos currently don't compile with OpenGL ES + CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples demos" + fi QT_CONFIG="$QT_CONFIG opengl" fi @@ -4204,6 +4586,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then QT_CONFIG="$QT_CONFIG embedded" rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes fi +QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR" QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR" QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR" @@ -4220,18 +4603,28 @@ if [ "$CFG_USE_GNUMAKE" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG GNUmake" fi [ "$CFG_REDUCE_EXPORTS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_exports" +[ "$CFG_REDUCE_RELOCATIONS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_relocations" [ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header" if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then QMakeVar add QMAKE_CFLAGS -g QMakeVar add QMAKE_CXXFLAGS -g QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info" fi -[ "$CFG_HAVE_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" +[ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx" +[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" +[ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" +[ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" -[ "$CFG_UNIVERSAL_BINARY" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG x86 ppc" +[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" if [ "$CFG_IPV6" = "yes" ]; then QT_CONFIG="$QT_CONFIG ipv6" fi +if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then + QT_CONFIG="$QT_CONFIG clock-monotonic" +fi +if [ "$CFG_MREMAP" = "yes" ]; then + QT_CONFIG="$QT_CONFIG mremap" +fi if [ "$CFG_GETADDRINFO" = "yes" ]; then QT_CONFIG="$QT_CONFIG getaddrinfo" fi @@ -4276,6 +4669,14 @@ if [ "$CFG_GIF" = "no" ]; then elif [ "$CFG_GIF" = "yes" ]; then QT_CONFIG="$QT_CONFIG gif" fi +if [ "$CFG_LIBTIFF" = "system" ]; then + QT_CONFIG="$QT_CONFIG system-tiff" +fi +if [ "$CFG_TIFF" = "no" ]; then + QT_CONFIG="$QT_CONFIG no-tiff" +elif [ "$CFG_TIFF" = "yes" ]; then + QT_CONFIG="$QT_CONFIG tiff" +fi if [ "$CFG_LIBFREETYPE" = "no" ]; then QT_CONFIG="$QT_CONFIG no-freetype" elif [ "$CFG_LIBFREETYPE" = "system" ]; then @@ -4305,6 +4706,7 @@ fi [ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib" [ "$CFG_QDBUS" = "yes" ] && QT_CONFIG="$QT_CONFIG qdbus" [ "$CFG_NAS" = "system" ] && QT_CONFIG="$QT_CONFIG nas" +[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl" if [ "$PLATFORM_X11" = "yes" ]; then [ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm" @@ -4471,6 +4873,7 @@ esac # system-mng no-mng mng # system-png no-png png # system-zlib no-zlib zlib +# system-libtiff no-libtiff # no-gif gif # debug release # dll staticlib @@ -4618,6 +5021,9 @@ if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then #define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT EOF fi +if [ "$CFG_ARMFPA" = "yes" ]; then + echo "#define QT_ARMFPA" >>"$outpath/src/corelib/global/qconfig.h.new" +fi echo '/* Machine Architecture */' >>"$outpath/src/corelib/global/qconfig.h.new" ARCH_STR=`echo $ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@ -4634,8 +5040,20 @@ if [ "$CFG_FRAMEWORK" = "yes" ]; then echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new" fi -"$unixtests/ptrsize.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" -echo "#define QT_POINTER_SIZE $?" >>"$outpath/src/corelib/global/qconfig.h.new" +if [ "$PLATFORM_MAC" = "yes" ]; then + cat >>"$outpath/src/corelib/global/qconfig.h.new" <>"$outpath/src/corelib/global/qconfig.h.new" +fi + + echo "" >>"$outpath/src/corelib/global/qconfig.h.new" if [ "$Edition" = "Trolltech" ]; then @@ -4661,6 +5079,10 @@ if [ "$PLATFORM_QWS" = "yes" ]; then done CFG_KBD_OFF="$CFG_KBD_AVAILABLE" + # the um driver is currently not in the available list for external builds + if [ "$Edition" != "Trolltech" ]; then + CFG_KBD_OFF="$CFG_KBD_OFF um" + fi for ADRIVER in $CFG_KBD_ON; do CFG_KBD_OFF=`echo "${CFG_KBD_OFF} " | sed "s,${ADRIVER} ,,g"` done @@ -4686,6 +5108,10 @@ if [ "$PLATFORM_QWS" = "yes" ]; then done fi # QWS +if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then + QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS" +fi + # Add turned on SQL drivers for DRIVER in $CFG_SQL_AVAILABLE; do eval "VAL=\$CFG_SQL_$DRIVER" @@ -4706,6 +5132,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" # Add other configuration options to the qconfig.h file [ "$CFG_GIF" = "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1" +[ "$CFG_TIFF" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_TIFF" [ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG" [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" @@ -4720,12 +5147,16 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" [ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV" [ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB" +[ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC" +[ "$CFG_MREMAP" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP" [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO" [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME" [ "$CFG_GETIFADDRS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETIFADDRS" [ "$CFG_INOTIFY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY" [ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" [ "$CFG_NIS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS" +[ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL" + [ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER" [ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR" [ "$CFG_XFIXES" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES" @@ -4801,8 +5232,8 @@ fi #------------------------------------------------------------------------------- QTCONFIG="$outpath/mkspecs/qconfig.pri" +QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -QTCONFIG_CONFIG= if [ "$CFG_DEBUG" = "yes" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG debug" if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then @@ -4825,8 +5256,8 @@ else QT_CONFIG="$QT_CONFIG qt_framework" QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework" fi -if [ "$CFG_UNIVERSAL_BINARY" = "yes" ]; then - QT_CONFIG="$QT_CONFIG x86 ppc" +if [ "$PLATFORM_MAC" = "yes" ]; then + QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS" fi cat >>"$QTCONFIG.tmp" </dev/null; then - echo -n "qmake vars ...... " + echo -n "qmake vars .......... " else - echo "qmake vars ...... \c" + echo "qmake vars .......... \c" fi cat "$QMAKE_VARS_FILE" | tr '\n' ' ' - echo "qmake switches .. $QMAKE_SWITCHES" + echo "qmake switches ...... $QMAKE_SWITCHES" fi [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL" echo "Build ............... $CFG_BUILD_PARTS" echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG" if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - echo "Debug................ yes (combined)" + echo "Debug ............... yes (combined)" if [ "$CFG_DEBUG" = "yes" ]; then - echo "Default Link......... debug" + echo "Default Link ........ debug" else - echo "Default Link......... release" + echo "Default Link ........ release" fi else - echo "Debug................ $CFG_DEBUG" + echo "Debug ............... $CFG_DEBUG" fi -echo "Qt 3 compatibility... $CFG_QT3SUPPORT" -echo "QtDBus module........ $CFG_QDBUS" +echo "Qt 3 compatibility .. $CFG_QT3SUPPORT" +echo "QtDBus module ....... $CFG_QDBUS" echo "STL support ......... $CFG_STL" echo "PCH support ......... $CFG_PRECOMPILE" -echo "MMX/SSE support ..... $CFG_HAVE_SSE" +echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" echo "IPv6 support ........ $CFG_IPV6" echo "IPv6 ifname support . $CFG_IPV6IFNAME" echo "getaddrinfo support . $CFG_GETADDRINFO" -echo "getifaddrs support... $CFG_GETIFADDRS" +echo "getifaddrs support .. $CFG_GETIFADDRS" echo "Accessibility ....... $CFG_ACCESSIBILITY" echo "NIS support ......... $CFG_NIS" echo "CUPS support ........ $CFG_CUPS" @@ -5037,6 +5468,11 @@ echo "Iconv support ....... $CFG_ICONV" echo "Glib support ........ $CFG_GLIB" echo "Large File support .. $CFG_LARGEFILE" echo "GIF support ......... $CFG_GIF" +if [ "$CFG_TIFF" = "no" ]; then + echo "TIFF support ........ $CFG_TIFF" +else + echo "TIFF support ........ $CFG_TIFF ($CFG_LIBTIFF)" +fi if [ "$CFG_JPEG" = "no" ]; then echo "JPEG support ........ $CFG_JPEG" else @@ -5100,6 +5536,8 @@ fi [ "$CFG_SQL_sqlite2" != "no" ] && echo "SQLite 2 support .... $CFG_SQL_sqlite2" [ "$CFG_SQL_sqlite" != "no" ] && echo "SQLite support ...... $CFG_SQL_sqlite ($CFG_SQLITE)" +echo "OpenSSL support ..... $CFG_OPENSSL" + # complain about not being able to use dynamic plugins if we are using a static build if [ "$CFG_SHARED" = "no" ]; then echo @@ -5126,26 +5564,10 @@ EXEC="" echo "Finding project files. Please wait..." "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" -if [ -z "$QMAKE_PROJECTS" ]; then - QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'` -else - QT_PROJECTS= - for a in `echo $QMAKE_PROJECTS`; do - put_in="$a" - for leave_out in `echo $QMAKE_IGNORE_PROJECTS`; do - if [ "$put_in" = "$leave_out" ]; then - put_in= - break; - fi - done - [ '!' -z "$put_in" ] && QT_PROJECTS="$QT_PROJECTS $put_in" - done -fi if [ -f "${relpath}/projects.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" "$outpath/bin/qmake" "QT_PROJECTS=$CFG_BUILD_PARTS" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" - QTDIR="$outpath" qmake-qt4 "QT_PROJECTS=$CFG_BUILD_PARTS" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" + QTDIR="$outpath" qmake-qt4 -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" fi # .projects -> projects to process @@ -5154,6 +5576,7 @@ fi # .projects.3 -> the rest rm -f .projects .projects.1 .projects.2 .projects.3 +QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'` if [ -z "$AWK" ]; then for p in `echo $QMAKE_PROJECTS`; do echo "$p" >> .projects -- cgit v1.2.3