diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile index e5775563898..18e6dfe6b74 100644 --- a/x11/qt4/Makefile +++ b/x11/qt4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2008/03/15 09:44:12 espie Exp $ +# $OpenBSD: Makefile,v 1.53 2008/06/02 10:33:33 espie Exp $ COMMENT-main= C++ X11 GUI toolkit COMMENT-examples= examples for qt4 @@ -34,7 +34,7 @@ SHARED_LIBS= Qt3Support 8.0 \ QtScript 0.0 -VERSION= 4.3.4 +VERSION= 4.3.5 DISTNAME= qt-x11-opensource-src-${VERSION} @@ -219,10 +219,6 @@ MAKE_FLAGS+=LIB$l_VERSION=$v DESTDIRNAME= INSTALL_ROOT -post-patch: - perl -pi -e "s#!!CUPS_LIBS!!#`cups-config --libs`#" \ - ${WRKSRC}/config.tests/unix/cups/cups.pro - post-install: # extra doc cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC} diff --git a/x11/qt4/distinfo b/x11/qt4/distinfo index 682681d74ad..f714a24dbf4 100644 --- a/x11/qt4/distinfo +++ b/x11/qt4/distinfo @@ -1,5 +1,5 @@ -MD5 (qt-x11-opensource-src-4.3.4.tar.gz) = lJkQHsVOt7DeGVs8Xj/6kw== -RMD160 (qt-x11-opensource-src-4.3.4.tar.gz) = 6wgeWZ5hvKoSaYGuy+LbSAvjXso= -SHA1 (qt-x11-opensource-src-4.3.4.tar.gz) = Y59kadWqB8UcKqZ5X44946q4zSU= -SHA256 (qt-x11-opensource-src-4.3.4.tar.gz) = iGTdgPNFa+cKO+YDZFAqDKP0YSWy8VaGCtiA/1X8q9I= -SIZE (qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 +MD5 (qt-x11-opensource-src-4.3.5.tar.gz) = TmI0I1Qx52jhh3f/MpkMwg== +RMD160 (qt-x11-opensource-src-4.3.5.tar.gz) = debRQumUUpmoxSVXfGaHppriYLY= +SHA1 (qt-x11-opensource-src-4.3.5.tar.gz) = lqCXQBTJqHKrGtRHKKJjfW584LQ= +SHA256 (qt-x11-opensource-src-4.3.5.tar.gz) = ihu5woYr5wyFmlNhDgU7eZjQoes5aNRjbfzDlALAQ0k= +SIZE (qt-x11-opensource-src-4.3.5.tar.gz) = 42719000 diff --git a/x11/qt4/patches/patch-config_tests_unix_cups_cups_pro b/x11/qt4/patches/patch-config_tests_unix_cups_cups_pro index 961da1600c4..fc3cf4c1716 100644 --- a/x11/qt4/patches/patch-config_tests_unix_cups_cups_pro +++ b/x11/qt4/patches/patch-config_tests_unix_cups_cups_pro @@ -1,4 +1,4 @@ -$OpenBSD: patch-config_tests_unix_cups_cups_pro,v 1.2 2008/01/06 13:48:12 espie Exp $ +$OpenBSD: patch-config_tests_unix_cups_cups_pro,v 1.3 2008/06/02 10:33:33 espie Exp $ --- config.tests/unix/cups/cups.pro.orig Tue Dec 4 17:43:18 2007 +++ config.tests/unix/cups/cups.pro Mon Dec 24 12:17:32 2007 @@ -1,4 +1,4 @@ @@ -6,4 +6,4 @@ $OpenBSD: patch-config_tests_unix_cups_cups_pro,v 1.2 2008/01/06 13:48:12 espie CONFIG -= qt dylib mac:CONFIG -= app_bundle -LIBS += -lcups -+LIBS += !!CUPS_LIBS!! ++LIBS += `cups-config --libs` diff --git a/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_cpp b/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_cpp index f75e5b8ced2..626a24dfa97 100644 --- a/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_cpp +++ b/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_cpp,v 1.5 2008/03/15 09:44:12 espie Exp $ ---- src/network/qsslsocket_openssl_symbols.cpp.orig Tue Feb 19 18:47:39 2008 -+++ src/network/qsslsocket_openssl_symbols.cpp Mon Mar 3 10:10:16 2008 -@@ -210,7 +210,7 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsi +$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_cpp,v 1.6 2008/06/02 10:33:34 espie Exp $ +--- src/network/qsslsocket_openssl_symbols.cpp.orig Mon May 26 11:06:54 2008 ++++ src/network/qsslsocket_openssl_symbols.cpp Sun Jun 1 11:36:34 2008 +@@ -208,7 +208,7 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsi qWarning("QSslSocket: cannot resolve "#func); #endif diff --git a/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_p_h b/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_p_h index 5ff373f6dbc..6918259a5d1 100644 --- a/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_p_h +++ b/x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_p_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_p_h,v 1.4 2008/03/15 09:44:12 espie Exp $ ---- src/network/qsslsocket_openssl_symbols_p.h.orig Tue Feb 19 18:47:39 2008 -+++ src/network/qsslsocket_openssl_symbols_p.h Mon Mar 3 10:10:16 2008 -@@ -74,7 +74,7 @@ +$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_p_h,v 1.5 2008/06/02 10:33:34 espie Exp $ +--- src/network/qsslsocket_openssl_symbols_p.h.orig Mon May 26 11:06:54 2008 ++++ src/network/qsslsocket_openssl_symbols_p.h Sun Jun 1 11:36:34 2008 +@@ -72,7 +72,7 @@ #define DUMMYARG diff --git a/x11/qt4/pkg/PLIST-html b/x11/qt4/pkg/PLIST-html index b9de5a13333..6adde2dc331 100644 --- a/x11/qt4/pkg/PLIST-html +++ b/x11/qt4/pkg/PLIST-html @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-html,v 1.15 2008/01/06 13:48:13 espie Exp $ +@comment $OpenBSD: PLIST-html,v 1.16 2008/06/02 10:33:34 espie Exp $ share/doc/qt4/html/ share/doc/qt4/html/3rdparty.html share/doc/qt4/html/aboutqt.html @@ -716,6 +716,8 @@ share/doc/qt4/html/images/icons_size_groupbox.png share/doc/qt4/html/images/icons_size_spinbox.png share/doc/qt4/html/images/imagecomposition-example.png share/doc/qt4/html/images/imageviewer-example.png +share/doc/qt4/html/images/imageviewer-fit_to_window_1.png +share/doc/qt4/html/images/imageviewer-fit_to_window_2.png share/doc/qt4/html/images/imageviewer-original_size.png share/doc/qt4/html/images/imageviewer-zoom_in_1.png share/doc/qt4/html/images/imageviewer-zoom_in_2.png