diff options
Diffstat (limited to 'devel/qt4-qt3support')
| -rw-r--r-- | devel/qt4-qt3support/Makefile | 1 | ||||
| -rw-r--r-- | devel/qt4-qt3support/distinfo | 6 | ||||
| -rw-r--r-- | devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff | 69 | ||||
| -rw-r--r-- | devel/qt4-qt3support/pkg-plist | 4 |
4 files changed, 6 insertions, 74 deletions
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 8f97d711b9ea..79806c2583a2 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -60,6 +60,7 @@ post-configure: ${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' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-qt3support/distinfo +++ b/devel/qt4-qt3support/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff b/devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff deleted file mode 100644 index d6570f036550..000000000000 --- a/devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- src/qt3support/tools/q3gcache.cpp -+++ src/qt3support/tools/q3gcache.cpp -@@ -622,7 +622,7 @@ void Q3GCache::statistics() const - #if defined(QT_DEBUG) - QString line; - line.fill(QLatin1Char('*'), 80); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - qDebug("CACHE STATISTICS:"); - qDebug("cache contains %d item%s, with a total cost of %d", - count(), count() != 1 ? "s" : "", tCost); -@@ -643,7 +643,7 @@ void Q3GCache::statistics() const - lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts); - qDebug("Statistics from internal dictionary class:"); - dict->statistics(); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - #endif - } - ---- src/qt3support/tools/q3gdict.cpp -+++ src/qt3support/tools/q3gdict.cpp -@@ -828,11 +828,11 @@ void Q3GDict::statistics() const - QString line; - line.fill(QLatin1Char('-'), 60); - double real, ideal; -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - qDebug("DICTIONARY STATISTICS:"); - if (count() == 0) { - qDebug("Empty!"); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - return; - } - real = 0.0; -@@ -853,7 +853,7 @@ void Q3GDict::statistics() const - while (b--) - *pbuf++ = '*'; - *pbuf = '\0'; -- qDebug(buf); -+ qDebug("%s", buf); - i++; - } - qDebug("Array size = %d", size()); -@@ -861,7 +861,7 @@ void Q3GDict::statistics() const - qDebug("Real dist = %g", real); - qDebug("Rand dist = %g", ideal); - qDebug("Real/Rand = %g", real/ideal); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - #endif // QT_DEBUG - } - ---- src/qt3support/tools/q3cstring.h -+++ src/qt3support/tools/q3cstring.h -@@ -57,7 +57,11 @@ public: - } - - Q3CString copy() const { return *this; } -- Q3CString &sprintf(const char *format, ...); -+ Q3CString &sprintf(const char *format, ...) -+#if defined(Q_CC_GNU) && !defined(__INSURE__) -+ __attribute__ ((format (printf, 2, 3))) -+#endif -+ ; - - Q3CString left(uint len) const { return QByteArray::left(len); } - Q3CString right(uint len) const { return QByteArray::right(len); }
\ No newline at end of file diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 7cc317e99397..5c2ae6c25daf 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -406,7 +406,7 @@ lib/libQt3Support.prl lib/libQt3Support.so lib/libQt3Support.so.4 lib/libQt3Support.so.4.3 -lib/libQt3Support.so.4.3.1 -%%DEBUG%%lib/libQt3Support.so.4.3.1.debug +lib/libQt3Support.so.4.3.4 +%%DEBUG%%lib/libQt3Support.so.4.3.4.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/Qt3Support |