cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixing update to qt-4.8.7.

Browse Source 
And use the new "qt.io" for HOMEPAGE / MASTER_SITES.

No fallout in a bulk build (ajacoutot@)

OK espie@ (maintainer)
This commit is contained in:
dcoppa 2015-06-03 07:28:01 +00:00
parent 728a7e12c5
commit cb2f2345d4
11 changed files with 45 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.126 2015/05/13 14:03:07 kettenis Exp $
# $OpenBSD: Makefile,v 1.127 2015/06/03 07:28:01 dcoppa Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SHARED_ONLY = Yes
@ -24,9 +24,6 @@ PKGNAME-main = qt4-${PKGVERSION}
PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
REVISION-main = 1
REVISION-mysql = 0
# XXX qmake include parser is bogus
DPB_PROPERTIES = parallel nojunk
@ -54,14 +51,14 @@ SHARED_LIBS = Qt3Support 8.0 \
QtDeclarative 0.0
VERSION = 4.8.6
PKGVERSION = 4.8.6
VERSION = 4.8.7
PKGVERSION = 4.8.7
DISTNAME = qt-everywhere-opensource-src-${VERSION}
CATEGORIES = x11
MASTER_SITES = http://download.qt-project.org/official_releases/qt/4.8/${VERSION}/
MASTER_SITES = http://download.qt.io/official_releases/qt/4.8/${VERSION}/
HOMEPAGE = http://qt-project.org/
HOMEPAGE = http://www.qt.io/
MAINTAINER = Marc Espie <espie@openbsd.org>
@ -117,7 +114,6 @@ CONFIGURE_ARGS += -platform openbsd-g++4
# XXX make sure those libraries gets written to libQtGui.la
QMAKE_LIBS_GUI = freetype SM ICE Xi Xrender Xinerama fontconfig Xext X11
#QMAKE_LIBS_GUI =
CONFIGURE_ENV = LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}" \
X11BASE=${X11BASE} QMAKE_LIBS_GUI="${QMAKE_LIBS_GUI:C/^/-l/}"

4
x11/qt4/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ixTdkbUoYuCbjmqWNQe3S8JYB4fRcf7aGXut+nA0Ayw=
SIZE (qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
SHA256 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 4ogilQl+R/4In4rHQalf70fgpzo/PN8htWmQY49ibqA=
SIZE (qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567

14
x11/qt4/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.26 2014/07/12 11:10:14 dcoppa Exp $
--- configure.orig Thu Apr 10 20:37:08 2014
+++ configure Tue May 13 11:25:23 2014
@@ -917,7 +917,7 @@ CFG_SILENT=no
$OpenBSD: patch-configure,v 1.27 2015/06/03 07:28:01 dcoppa Exp $
--- configure.orig Thu May 7 16:14:56 2015
+++ configure Sun May 31 13:28:28 2015
@@ -918,7 +918,7 @@ CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
CFG_ALSA=auto
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.26 2014/07/12 11:10:14 dcoppa Exp $
CFG_COREWLAN=auto
CFG_ICD=auto
CFG_NOPROCESS=no
@@ -2408,7 +2408,7 @@ while [ "$#" -gt 0 ]; do
@@ -2412,7 +2412,7 @@ while [ "$#" -gt 0 ]; do
v|verbose)
if [ "$VAL" = "yes" ]; then
if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.26 2014/07/12 11:10:14 dcoppa Exp $
else
OPT_VERBOSE=yes
fi
@@ -4965,7 +4965,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -4969,7 +4969,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
EXTRA_OBJS=
EXTRA_SRCS=
EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.26 2014/07/12 11:10:14 dcoppa Exp $
EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
@@ -5074,7 +5074,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -5078,7 +5078,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
done
QMAKE_BUILD_ERROR=no

8
x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v 1.4 2014/07/12 11:10:14 dcoppa Exp $
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig Thu Apr 10 20:37:12 2014
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h Tue May 13 11:25:32 2014
@@ -247,7 +247,7 @@ inline int atomicDecrement(int volatile* addend) { ret
$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v 1.5 2015/06/03 07:28:01 dcoppa Exp $
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig Thu May 7 16:14:48 2015
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h Sun May 31 13:28:28 2015
@@ -241,7 +241,7 @@ inline int atomicDecrement(int volatile* addend) { ret
inline int atomicIncrement(int volatile* addend) { return (int) atomic_add_value((unsigned volatile*)addend, 1); }
inline int atomicDecrement(int volatile* addend) { return (int) atomic_sub_value((unsigned volatile*)addend, 1); }

8
x11/qt4/patches/patch-src_corelib_global_qglobal_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.17 2014/07/12 11:10:14 dcoppa Exp $
--- src/corelib/global/qglobal.h.orig Thu Apr 10 20:37:11 2014
+++ src/corelib/global/qglobal.h Tue May 13 11:25:38 2014
@@ -2367,7 +2367,7 @@ typedef uint Flags;
$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.18 2015/06/03 07:28:01 dcoppa Exp $
--- src/corelib/global/qglobal.h.orig Thu May 7 16:14:48 2015
+++ src/corelib/global/qglobal.h Sun May 31 13:28:28 2015
@@ -2482,7 +2482,7 @@ typedef uint Flags;
#endif /* Q_NO_TYPESAFE_FLAGS */

33
x11/qt4/patches/patch-src_gui_image_qgifhandler_cpp
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-src_gui_image_qgifhandler_cpp,v 1.1 2014/07/12 11:10:14 dcoppa Exp $
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 Thu Apr 10 20:37:12 2014
+++ src/gui/image/qgifhandler.cpp Tue May 13 11:25:53 2014
@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buf
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;

8
x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.5 2014/07/12 11:10:14 dcoppa Exp $
--- src/gui/itemviews/qlistview.cpp.orig Thu Apr 10 20:37:12 2014
+++ src/gui/itemviews/qlistview.cpp Tue May 13 11:25:38 2014
@@ -2918,7 +2918,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.6 2015/06/03 07:28:01 dcoppa Exp $
--- src/gui/itemviews/qlistview.cpp.orig Thu May 7 16:14:43 2015
+++ src/gui/itemviews/qlistview.cpp Sun May 31 13:28:29 2015
@@ -2948,7 +2948,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
if (moved.count() != items.count())
moved.resize(items.count());

8
x11/qt4/patches/patch-src_network_ssl_qsslsocket_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_network_ssl_qsslsocket_cpp,v 1.3 2014/11/13 18:33:24 zhuk Exp $
$OpenBSD: patch-src_network_ssl_qsslsocket_cpp,v 1.4 2015/06/03 07:28:01 dcoppa Exp $
Enable picking up certs from /etc/ssl/certs.pem and its neighbors.
--- src/network/ssl/qsslsocket.cpp.orig Thu Apr 10 22:37:12 2014
+++ src/network/ssl/qsslsocket.cpp Tue Oct 21 12:36:11 2014
@@ -2325,7 +2325,8 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirec
--- src/network/ssl/qsslsocket.cpp.orig Thu May 7 16:14:44 2015
+++ src/network/ssl/qsslsocket.cpp Sun May 31 13:28:29 2015
@@ -2330,7 +2330,8 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirec
<< "/var/ssl/certs/" // AIX
<< "/usr/local/ssl/certs/" // Solaris
<< "/etc/openssl/certs/" // BlackBerry

8
x11/qt4/patches/patch-src_network_ssl_qsslsocket_openssl_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_cpp,v 1.1 2014/11/13 18:33:24 zhuk Exp $
$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_cpp,v 1.2 2015/06/03 07:28:01 dcoppa Exp $
Disable SSLv3 by default.
--- src/network/ssl/qsslsocket_openssl.cpp.orig Tue Oct 21 12:38:17 2014
+++ src/network/ssl/qsslsocket_openssl.cpp Tue Oct 21 12:39:14 2014
@@ -265,13 +265,13 @@ init_context:
--- src/network/ssl/qsslsocket_openssl.cpp.orig Thu May 7 16:14:44 2015
+++ src/network/ssl/qsslsocket_openssl.cpp Sun May 31 13:28:29 2015
@@ -269,13 +269,13 @@ init_context:
case QSsl::SslV3:
ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
break;

9
x11/qt4/patches/patch-src_tools_moc_main_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_tools_moc_main_cpp,v 1.3 2013/10/04 13:15:41 dcoppa Exp $
$OpenBSD: patch-src_tools_moc_main_cpp,v 1.4 2015/06/03 07:28:01 dcoppa Exp $
Workaround moc's inability to properly parse C++ macros within
some of Boost's headers. This issue may come up again with other
@ -7,13 +7,14 @@ C++ parser from Qt5's moc has been fixed.
https://bugreports.qt-project.org/browse/QTBUG-22829
--- src/tools/moc/main.cpp.orig Fri Jun 7 07:17:00 2013
+++ src/tools/moc/main.cpp Fri Sep 27 10:15:15 2013
@@ -190,6 +190,7 @@ int runMoc(int _argc, char **_argv)
--- src/tools/moc/main.cpp.orig Thu May 7 16:14:44 2015
+++ src/tools/moc/main.cpp Sun May 31 14:58:12 2015
@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
// Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
QByteArray filename;
QByteArray output;

7
x11/qt4/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.33 2014/07/12 11:10:14 dcoppa Exp $
@comment $OpenBSD: PLIST-main,v 1.34 2015/06/03 07:28:01 dcoppa Exp $
@pkgpath x11/qt4
@pkgpath x11/qt4,-phonon
@pkgpath x11/qt4,-sqlite
@ -2713,6 +2713,7 @@ include/X11/qt4/QtNetwork/qtcpsocket.h
include/X11/qt4/QtNetwork/qudpsocket.h
include/X11/qt4/QtNetwork/qurlinfo.h
include/X11/qt4/QtOpenGL/
include/X11/qt4/QtOpenGL/QGL
include/X11/qt4/QtOpenGL/QGLBuffer
include/X11/qt4/QtOpenGL/QGLColormap
include/X11/qt4/QtOpenGL/QGLContext
@ -3912,6 +3913,9 @@ lib/qt4/mkspecs/win32-msvc2012/qplatformdefs.h
lib/qt4/mkspecs/win32-msvc2013/
lib/qt4/mkspecs/win32-msvc2013/qmake.conf
lib/qt4/mkspecs/win32-msvc2013/qplatformdefs.h
lib/qt4/mkspecs/win32-msvc2015/
lib/qt4/mkspecs/win32-msvc2015/qmake.conf
lib/qt4/mkspecs/win32-msvc2015/qplatformdefs.h
lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/
lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
@ -4137,6 +4141,7 @@ lib/qt4/translations/linguist_cs.qm
lib/qt4/translations/linguist_de.qm
lib/qt4/translations/linguist_eu.qm
lib/qt4/translations/linguist_fr.qm
lib/qt4/translations/linguist_he.qm
lib/qt4/translations/linguist_hu.qm
lib/qt4/translations/linguist_ja.qm
lib/qt4/translations/linguist_ko.qm