Hi, Please see attached for the diff required for area51/qt-4.5 to compile on my system. devel/qt4 with SQL plugins compiles cleanly.
I'll check the integrity of the programs tomorrow. Regards, David
Index: databases/qt4-odbc-plugin/files/Makefile.bsd
===================================================================
--- databases/qt4-odbc-plugin/files/Makefile.bsd (revision 4703)
+++ databases/qt4-odbc-plugin/files/Makefile.bsd (working copy)
@@ -4,6 +4,7 @@
CXXFLAGS+= -I${DRIVER} \
-I${PREFIX}/include/qt4 \
-I${PREFIX}/include/qt4/Qt \
+ -I${PREFIX}/include/qt4/QtCore \
-I${LOCALBASE}/include \
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
Index: devel/qt4-corelib/files/qconfig.h.in
===================================================================
--- devel/qt4-corelib/files/qconfig.h.in (revision 4703)
+++ devel/qt4-corelib/files/qconfig.h.in (working copy)
@@ -1,42 +0,0 @@
-#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC)
-# undef QT_NO_CLOCK_MONOTONIC
-#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC)
-# define QT_NO_CLOCK_MONOTONIC
-#endif
-
-#if defined(QT_NO_EXCEPTIONS) && defined(QT_EXCEPTIONS)
-# undef QT_NO_EXCEPTIONS
-#elif !defined(QT_NO_EXCEPTIONS) && !defined(QT_EXCEPTIONS)
-# define QT_NO_EXCEPTIONS
-#endif
-
-#if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY)
-# undef QT_NO_INOTIFY
-#elif !defined(QT_NO_INOTIFY) && !defined(QT_INOTIFY)
-# define QT_NO_INOTIFY
-#endif
-
-#if defined(QT_NO_MREMAP) && defined(QT_MREMAP)
-# undef QT_NO_MREMAP
-#elif !defined(QT_NO_MREMAP) && !defined(QT_MREMAP)
-# define QT_NO_MREMAP
-#endif
-
-#if defined(QT_NO_NAS) && defined(QT_NAS)
-# undef QT_NO_NAS
-#elif !defined(QT_NO_NAS) && !defined(QT_NAS)
-# define QT_NO_NAS
-#endif
-
-#if defined(QT_NO_SXE) && defined(QT_SXE)
-# undef QT_NO_SXE
-#elif !defined(QT_NO_SXE) && !defined(QT_SXE)
-# define QT_NO_SXE
-#endif
-
-#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS)
-# undef QT_USE_MATH_H_FLOATS
-#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS)
-# define QT_USE_MATH_H_FLOATS
-#endif
-
Index: devel/qt4-corelib/Makefile
===================================================================
--- devel/qt4-corelib/Makefile (revision 4703)
+++ devel/qt4-corelib/Makefile (working copy)
@@ -62,10 +62,6 @@
-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/QtCore.pc
- #hack to hard-code the feature part of qconfig.h
- ${HEAD} -n 27 ${WRKSRC}/global/qconfig.h > ${WRKDIR}/qconfig.tmp
- ${CHMOD} 644 ${WRKSRC}/global/qconfig.h
- ${CAT} ${WRKDIR}/qconfig.tmp ${FILESDIR}/qconfig.h.in > ${WRKSRC}/global/qconfig.h
.if ${OSVERSION} >= 700042
${ECHO_CMD} "#define QT_VISIBILITY_AVAILABLE" >> ${WRKSRC}/global/qconfig.h
.endif
Index: devel/qt4-linguist/files/patch-0185-fix-format-strings.diff
===================================================================
--- devel/qt4-linguist/files/patch-0185-fix-format-strings.diff (revision 4703)
+++ devel/qt4-linguist/files/patch-0185-fix-format-strings.diff (working copy)
@@ -1,16 +0,0 @@
---- tools/linguist/shared/profileevaluator.h.orig 2008-04-28 09:11:21.000000000 -0400
-+++ tools/linguist/shared/profileevaluator.h 2008-05-09 10:50:40.000000000 -0400
-@@ -112,7 +112,12 @@
- private:
- QStringList expandPattern(const QString &pattern);
- void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2);
-- void logMessage(MessageType mt, const char *msg, ...);
-+ void logMessage(MessageType mt, const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+ __attribute__ ((format (printf, 3, 4)))
-+#endif
-+ ;
-+
- QStringList expandVariableReferences(const QString &value);
- QStringList evaluateExpandFunction(const QByteArray &func, const QString &arguments);
-
Index: devel/qt4-linguist/files/patch-tools__linguist__linguist__mainwindow.cpp
===================================================================
--- devel/qt4-linguist/files/patch-tools__linguist__linguist__mainwindow.cpp (revision 0)
+++ devel/qt4-linguist/files/patch-tools__linguist__linguist__mainwindow.cpp (revision 0)
@@ -0,0 +1,11 @@
+--- tools/linguist/linguist/mainwindow.cpp~ 2009-04-02 12:17:18.000000000 +0200
++++ tools/linguist/linguist/mainwindow.cpp 2009-04-02 12:17:36.000000000 +0200
+@@ -1314,7 +1314,7 @@
+ if (m_assistantProcess->state() != QProcess::Running) {
+ QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+ #if !defined(Q_OS_MAC)
+- app += QLatin1String("assistant");
++ app += QLatin1String("assistant-qt4");
+ #else
+ app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+ #endif
Index: devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp
===================================================================
--- devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp (revision 4703)
+++ devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp (working copy)
@@ -1,11 +0,0 @@
---- ./tools/linguist/linguist/trwindow.cpp.orig 2008-04-28 17:11:21.000000000 +0400
-+++ ./tools/linguist/linguist/trwindow.cpp 2008-06-17 01:02:02.000000000 +0400
-@@ -939,7 +939,7 @@
- if (m_assistantProcess->state() != QProcess::Running) {
- QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
-- app += QLatin1String("assistant");
-+ app += QLatin1String("assistant-qt4");
- #else
- app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
- #endif
Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk (revision 4703)
+++ Mk/bsd.qt.mk (working copy)
@@ -26,7 +26,7 @@
-qt-gif -system-libjpeg -system-libpng \
-system-libmng -system-libtiff -system-zlib \
-confirm-license -no-gtkstyle \
- --no-pch --no-iconv \
+ -no-pch -no-iconv \
-prefix ${PREFIX} \
-bindir ${PREFIX}/bin \
-libdir ${PREFIX}/${QT_LIBDIR_REL} \
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
