summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/qt4-docs/Makefile3
-rw-r--r--x11/qt4-libs/Makefile3
-rw-r--r--x11/qt4-libs/distinfo15
-rw-r--r--x11/qt4-libs/patches/patch-CVE-2014-019041
-rw-r--r--x11/qt4-libs/patches/patch-aq32
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h17
-rw-r--r--x11/qt4-libs/patches/patch-src_gui_image_qbmphandler.cpp25
-rw-r--r--x11/qt4-libs/patches/patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm13
-rw-r--r--x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp13
-rw-r--r--x11/qt4-mng/Makefile3
-rw-r--r--x11/qt4-mysql/Makefile3
-rw-r--r--x11/qt4-pgsql/Makefile3
-rw-r--r--x11/qt4-qdbus/Makefile3
-rw-r--r--x11/qt4-qscintilla/Makefile3
-rw-r--r--x11/qt4-sqlite3/Makefile3
-rw-r--r--x11/qt4-tiff/Makefile3
-rw-r--r--x11/qt4-tools/Makefile3
-rw-r--r--x11/qt4-tools/PLIST12
-rw-r--r--x11/qt4/Makefile.common4
19 files changed, 40 insertions, 162 deletions
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile
index c07741daefe..4396ea527d2 100644
--- a/x11/qt4-docs/Makefile
+++ b/x11/qt4-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2015/07/08 17:49:49 wiz Exp $
PKGNAME= qt4-docs-${QTVERSION}
-PKGREVISION= 1
COMMENT= Documentation for the QT C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index f3d3dfc4051..2d3355a6464 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2015/06/25 08:02:25 joerg Exp $
+# $NetBSD: Makefile,v 1.107 2015/07/08 17:49:49 wiz Exp $
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 7
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 2999fb7e744..454ce5a688e 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.100 2015/06/29 21:06:14 markd Exp $
+$NetBSD: distinfo,v 1.101 2015/07/08 17:49:49 wiz Exp $
-SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6
-RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33
-Size (qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667 bytes
-SHA1 (patch-CVE-2014-0190) = 1e0b283cb0959caa3cb9b44694b3a61c77631593
+SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
+RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
+Size (qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567 bytes
SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -20,7 +19,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 44dcc5b8445776ddd5dd9ee4580ab6ed4e51bd74
+SHA1 (patch-aq) = 587adf2777f1b915c410908c08c6ba62034b89ec
SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
@@ -45,7 +44,6 @@ SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) =
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a
-SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h) = 375e5ed9af891b3511a4d5fe940e4080d5ff95c2
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64
@@ -70,9 +68,6 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEvent
SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191fa5fa4d4184b1
-SHA1 (patch-src_gui_image_qbmphandler.cpp) = efe717ee805f808dc8a1ce7c56b3872bc3d75f69
-SHA1 (patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm) = 0caa9b006b3ffee4ab747fca9fd224c7c49211c9
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
-SHA1 (patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp) = eea948f07fd9e595c7813aa485e985407dfcfbf9
diff --git a/x11/qt4-libs/patches/patch-CVE-2014-0190 b/x11/qt4-libs/patches/patch-CVE-2014-0190
deleted file mode 100644
index b8032148c2d..00000000000
--- a/x11/qt4-libs/patches/patch-CVE-2014-0190
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-CVE-2014-0190,v 1.1 2014/11/28 21:07:51 spz Exp $
-
-patch for CVE-2014-0190 from https://codereview.qt-project.org/#/c/84035/1/src/gui/image/qgifhandler.cpp,unified
-
-Upstream commit message:
- Author: Lars Knoll <lars.knoll@digia.com>
- AuthorDate: 2014-04-24 15:33:27 +0200
- Commit: Lars Knoll <lars.knoll@digia.com>
- CommitDate: 2014-04-24 15:43:28 +0200
-
- Don't crash on broken GIF images
-
- Broken GIF images could set invalid width and height
- values inside the image, leading to Qt creating a null
- QImage for it. In that case we need to abort decoding
- the image and return an error.
-
- Initial patch by Rich Moore.
-
- Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
- Task-number: QTBUG-38367
- Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
- Security-advisory: CVE-2014-0190
-
---- src/gui/image/qgifhandler.cpp.orig 2014-04-10 18:37:12.000000000 +0000
-+++ src/gui/image/qgifhandler.cpp
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co
- memset(bits, 0, image->byteCount());
- }
-
-+ // Check if the previous attempt to create the image failed. If it
-+ // did then the image is broken and we should give up.
-+ if (image->isNull()) {
-+ state = Error;
-+ return -1;
-+ }
-+
- disposePrevious(image);
- disposed = false;
-
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index 20cff98046b..2fae2505ea8 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
+$NetBSD: patch-aq,v 1.16 2015/07/08 17:49:49 wiz Exp $
---- configure.orig 2014-04-10 18:37:08.000000000 +0000
+--- configure.orig 2015-05-07 14:14:56.000000000 +0000
+++ configure
-@@ -3223,13 +3223,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3227,13 +3227,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
CFG_HOST_ARCH=x86_64
fi
;;
@@ -13,12 +13,12 @@ $NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
fi
CFG_HOST_ARCH=powerpc
;;
-- *:*:ppc64)
+- *:*:ppc64*)
+ *:*:ppc64|*:*:powerpc64)
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit PowerPC (powerpc)"
fi
-@@ -3259,6 +3259,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3263,6 +3263,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
fi
CFG_HOST_ARCH=sparc
;;
@@ -38,7 +38,7 @@ $NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
QNX:*:*)
case "$UNAME_MACHINE" in
x86pc)
-@@ -3567,7 +3580,7 @@ fi
+@@ -3571,7 +3584,7 @@ fi
if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
# get the darwin version. 10.0.0 and up means snow leopard.
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -47,7 +47,7 @@ $NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
echo
echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
echo
-@@ -5074,7 +5087,7 @@ if true; then ###[ '!' -f "$outpath/bin/
+@@ -5078,7 +5091,7 @@ if true; then ###[ '!' -f "$outpath/bin/
done
QMAKE_BUILD_ERROR=no
@@ -56,7 +56,7 @@ $NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
[ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
[ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
[ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
-@@ -7198,7 +7211,7 @@ fi
+@@ -7203,7 +7216,7 @@ fi
# select Carbon on 10.4 Tiger.
if [ "$PLATFORM_MAC" = "yes" ]; then
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -65,16 +65,16 @@ $NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
CFG_MAC_COCOA="no";
CFG_MAC_CARBON="yes";
fi
-@@ -7729,7 +7742,7 @@ case "$XPLATFORM" in
- *-g++*)
+@@ -7713,7 +7726,7 @@ case "$XPLATFORM" in
+
# Check gcc's version
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
-- 4*|3.4*)
-+ 5*|4*|3.4*)
+- 4*)
++ 5*|4*)
;;
- 3.3*)
- canBuildWebKit="no"
-@@ -8475,7 +8488,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+ 3.4*)
+ canBuildQtXmlPatterns="no"
+@@ -8485,7 +8498,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
@@ -83,7 +83,7 @@ $NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
[ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
-@@ -8691,6 +8704,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
+@@ -8701,6 +8714,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
#configuration
CONFIG += $QTCONFIG_CONFIG
QT_ARCH = $CFG_ARCH
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h
deleted file mode 100644
index c483683dca2..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h,v 1.3 2014/08/10 17:36:09 wiz Exp $
-
-Fix build with clang.
-
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig 2014-04-10 18:37:12.000000000 +0000
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -78,7 +78,9 @@
- #elif OS(QNX)
- #include <atomic.h>
- #elif COMPILER(GCC) && !OS(SYMBIAN)
--#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-+#include <ciso646>
-+#ifdef _LIBCPP_VERSION
-+#elif (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
- #include <ext/atomicity.h>
- #else
- #include <bits/atomicity.h>
diff --git a/x11/qt4-libs/patches/patch-src_gui_image_qbmphandler.cpp b/x11/qt4-libs/patches/patch-src_gui_image_qbmphandler.cpp
deleted file mode 100644
index b3fec1509eb..00000000000
--- a/x11/qt4-libs/patches/patch-src_gui_image_qbmphandler.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_gui_image_qbmphandler.cpp,v 1.1 2015/03/24 21:43:52 bsiegert Exp $
-https://codereview.qt-project.org/#/c/107108/4
-
-Fix a division by zero when processing malformed BMP files.
-This fixes a division by 0 when processing a maliciously crafted BMP
-file. No impact beyond DoS.
---- src/gui/image/qbmphandler.cpp.orig 2015-03-24 20:09:44.000000000 +0000
-+++ src/gui/image/qbmphandler.cpp
-@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s
- }
- } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
- red_shift = calc_shift(red_mask);
-+ if (((red_mask >> red_shift) + 1) == 0)
-+ return false;
- red_scale = 256 / ((red_mask >> red_shift) + 1);
- green_shift = calc_shift(green_mask);
-+ if (((green_mask >> green_shift) + 1) == 0)
-+ return false;
- green_scale = 256 / ((green_mask >> green_shift) + 1);
- blue_shift = calc_shift(blue_mask);
-+ if (((blue_mask >> blue_shift) + 1) == 0)
-+ return false;
- blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
- } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
- blue_mask = 0x000000ff;
diff --git a/x11/qt4-libs/patches/patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm b/x11/qt4-libs/patches/patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm
deleted file mode 100644
index 2e351c4b322..00000000000
--- a/x11/qt4-libs/patches/patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm,v 1.1 2014/11/22 20:34:34 bsiegert Exp $
-
---- src/gui/kernel/qcocoaapplicationdelegate_mac.mm.orig 2014-04-10 18:37:12.000000000 +0000
-+++ src/gui/kernel/qcocoaapplicationdelegate_mac.mm
-@@ -122,7 +122,7 @@ static void cleanupCocoaApplicationDeleg
- [dockMenu release];
- [qtMenuLoader release];
- if (reflectionDelegate) {
-- [NSApp setDelegate:reflectionDelegate];
-+ [[NSApplication sharedApplication] setDelegate:reflectionDelegate];
- [reflectionDelegate release];
- }
- [super dealloc];
diff --git a/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp b/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp
deleted file mode 100644
index 33b9bea8fcd..00000000000
--- a/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp,v 1.1 2013/08/29 13:00:41 joerg Exp $
-
---- src/scripttools/debugging/qscriptdebuggerconsole.cpp.orig 2013-07-12 12:05:08.000000000 +0000
-+++ src/scripttools/debugging/qscriptdebuggerconsole.cpp
-@@ -489,7 +489,7 @@ QScriptDebuggerConsoleCommandJob *QScrip
- d->input += QLatin1Char('\n');
- QScriptSyntaxCheckResult check = QScriptEngine::checkSyntax(d->input);
- if (check.state() == QScriptSyntaxCheckResult::Intermediate)
-- return false;
-+ return 0;
- d->input.chop(1); // remove the last \n
- cmd = QString();
- cmd.append(d->commandPrefix);
diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile
index fcd30631bda..f6c39a7f527 100644
--- a/x11/qt4-mng/Makefile
+++ b/x11/qt4-mng/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.30 2015/07/08 17:49:49 wiz Exp $
PKGNAME= qt4-mng-${QTVERSION}
-PKGREVISION= 1
COMMENT= QT MNG image format plugin
.include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile
index 3efa93c3e9c..6ce314b9766 100644
--- a/x11/qt4-mysql/Makefile
+++ b/x11/qt4-mysql/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.38 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.39 2015/07/08 17:49:49 wiz Exp $
-PKGREVISION= 1
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-mysql-${QTVERSION}
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index da941bdb159..6ba2b015d1d 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.46 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2015/07/08 17:49:49 wiz Exp $
-PKGREVISION= 1
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-pgsql-${QTVERSION}
diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile
index b8ea795bb4c..193fd53e479 100644
--- a/x11/qt4-qdbus/Makefile
+++ b/x11/qt4-qdbus/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.39 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2015/07/08 17:49:49 wiz Exp $
-PKGREVISION= 1
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-qdbus-${QTVERSION}
diff --git a/x11/qt4-qscintilla/Makefile b/x11/qt4-qscintilla/Makefile
index 3c014e7802c..abe8e3f1501 100644
--- a/x11/qt4-qscintilla/Makefile
+++ b/x11/qt4-qscintilla/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.37 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.38 2015/07/08 17:49:49 wiz Exp $
-PKGREVISION= 1
.include "../../x11/qt4-qscintilla/Makefile.common"
PKGNAME= qt4-${DISTNAME:tl:S/-gpl-/-/}
diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile
index 6881d788858..f13bae9da3a 100644
--- a/x11/qt4-sqlite3/Makefile
+++ b/x11/qt4-sqlite3/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.44 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2015/07/08 17:49:49 wiz Exp $
-PKGREVISION= 2
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-sqlite3-${QTVERSION}
diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile
index 250dcbd4a1d..494a002515a 100644
--- a/x11/qt4-tiff/Makefile
+++ b/x11/qt4-tiff/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.37 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.38 2015/07/08 17:49:49 wiz Exp $
-PKGREVISION= 1
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-tiff-${QTVERSION}
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index aeff4c68775..b8af850de59 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2015/04/25 14:25:16 tnn Exp $
+# $NetBSD: Makefile,v 1.66 2015/07/08 17:49:50 wiz Exp $
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-tools-${QTVERSION}
-PKGREVISION= 3
COMMENT= QT GUI (WYSIWYG) builder and other tools
DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 42e7416bd40..84ff8362188 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2014/08/19 10:31:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2015/07/08 17:49:50 wiz Exp $
lib/pkgconfig/QtCLucene.pc
lib/pkgconfig/QtDesigner.pc
lib/pkgconfig/QtDesignerComponents.pc
@@ -564,14 +564,14 @@ qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
-qt4/mkspecs/unsupported/macx-clang/Info.plist.app
-qt4/mkspecs/unsupported/macx-clang/Info.plist.lib
-qt4/mkspecs/unsupported/macx-clang/qmake.conf
-qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h
qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.app
qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.lib
qt4/mkspecs/unsupported/macx-clang-libc++/qmake.conf
qt4/mkspecs/unsupported/macx-clang-libc++/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-clang/Info.plist.app
+qt4/mkspecs/unsupported/macx-clang/Info.plist.lib
+qt4/mkspecs/unsupported/macx-clang/qmake.conf
+qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h
qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf
qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h
qt4/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
@@ -637,6 +637,8 @@ qt4/mkspecs/win32-msvc2012/qmake.conf
qt4/mkspecs/win32-msvc2012/qplatformdefs.h
qt4/mkspecs/win32-msvc2013/qmake.conf
qt4/mkspecs/win32-msvc2013/qplatformdefs.h
+qt4/mkspecs/win32-msvc2015/qmake.conf
+qt4/mkspecs/win32-msvc2015/qplatformdefs.h
qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index 90f4db250b5..cd045dcf3a0 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.33 2014/07/22 17:01:51 wiz Exp $
+# $NetBSD: Makefile.common,v 1.34 2015/07/08 17:49:49 wiz Exp $
# used by x11/qt4-libs/Makefile.common
# used by x11/qt4-tools/Makefile
-QTVERSION= 4.8.6
+QTVERSION= 4.8.7
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE= http://qt-project.org/
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 16:48:08 +0000