Update to Qt 4.3.4

4 files changed, 7 insertions, 35 deletions

diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 1654b10..208e6d3 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -55,7 +55,7 @@ OPTIONS=	CUPS "Enable printing support (requires CUPS)" off \
 
 .if !defined(WITHOUT_CUPS) || defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	cupsd:${PORTSDIR}/print/cups-base
-CUPS=		-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include
+CUPS=		-cups -L${LOCALBASE}/lib -I. -I../../include/Qt -I${LOCALBASE}/include
 .elif defined(WITHOUT_CUPS)
 CUPS=
 .endif
@@ -85,6 +85,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.post.mk>
diff --git a/x11-toolkits/qt4-gui/distinfo b/x11-toolkits/qt4-gui/distinfo
index 8fbd772..9451a68 100644
--- a/x11-toolkits/qt4-gui/distinfo
+++ b/x11-toolkits/qt4-gui/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/x11-toolkits/qt4-gui/files/patch-0185-fix-format-strings.diff b/x11-toolkits/qt4-gui/files/patch-0185-fix-format-strings.diff
deleted file mode 100644
index ce23edf..0000000
--- a/x11-toolkits/qt4-gui/files/patch-0185-fix-format-strings.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/gui/painting/qprintengine_pdf_p.h
-+++ src/gui/painting/qprintengine_pdf_p.h
-@@ -148,7 +148,11 @@ private:
-     void writePage();
- 
-     int addXrefEntry(int object, bool printostr = true);
--    void xprintf(const char* fmt, ...);
-+    void xprintf(const char* fmt, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 2, 3)))
-+#endif
-+        ;
-     inline void write(const QByteArray &data) {
-         stream->writeRawData(data.constData(), data.size());
-         streampos += data.size();
---- src/gui/painting/qprintengine_pdf.cpp
-+++ src/gui/painting/qprintengine_pdf.cpp
-@@ -386,9 +386,8 @@ int QPdfEnginePrivate::addConstantAlphaO
-         object = addXrefEntry(-1);
-         QByteArray alphaDef;
-         QPdf::ByteStream s(&alphaDef);
--        s << "<< /ca " << (alpha/qreal(255.)) << ">>\n";
--        xprintf(alphaDef.constData());
--        xprintf("endobj\n");
-+        s << "<< /ca " << (alpha/qreal(255.)) << ">>";
-+        xprintf("%s\nendobj\n", alphaDef.constData());
-     }
-     currentPage->graphicStates.append(object);
-     return object;
\ No newline at end of file
diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist
index 8124aee..386f91e 100644
--- a/x11-toolkits/qt4-gui/pkg-plist
+++ b/x11-toolkits/qt4-gui/pkg-plist
@@ -739,7 +739,7 @@ lib/libQtGui.prl
 lib/libQtGui.so
 lib/libQtGui.so.4
 lib/libQtGui.so.4.3
-lib/libQtGui.so.4.3.1
-%%DEBUG%%lib/libQtGui.so.4.3.1.debug
+lib/libQtGui.so.4.3.4
+%%DEBUG%%lib/libQtGui.so.4.3.4.debug
 libdata/pkgconfig/QtGui.pc
 @dirrm include/QtGui