View | Details | Raw Unified | Return to bug 213530 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.qt.mk (-3 / +2 lines)
Lines 27-33 Link Here
27
# Qt versions currently supported by the framework.
27
# Qt versions currently supported by the framework.
28
_QT_SUPPORTED?=	4 5
28
_QT_SUPPORTED?=	4 5
29
QT4_VERSION?=	4.8.7
29
QT4_VERSION?=	4.8.7
30
QT5_VERSION?=	5.6.1
30
QT5_VERSION?=	5.6.2
31
31
32
QT_PREFIX?=		${LOCALBASE}
32
QT_PREFIX?=		${LOCALBASE}
33
33
Lines 181-188 Link Here
181
.  if ${_QT_VERSION:M4*}
181
.  if ${_QT_VERSION:M4*}
182
_EXTRA_PATCHES_QT4=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
182
_EXTRA_PATCHES_QT4=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
183
.  else
183
.  else
184
_EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
184
_EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h
185
			${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests_unix_libdl_libdl.pro
186
.  endif
185
.  endif
187
EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
186
EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
188
		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
187
		${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
(-)devel/qmake5/Makefile (-15 lines)
Lines 37-58 Link Here
37
# Prevent qconfig.pri from being module dependent.
37
# Prevent qconfig.pri from being module dependent.
38
	@${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \
38
	@${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \
39
		${WRKSRC}/configure
39
		${WRKSRC}/configure
40
# Write the file location paths into mkspecs/common/freebsd.conf
41
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
42
		${WRKSRC}/mkspecs/common/freebsd.conf
43
	@${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \
44
		${WRKSRC}/mkspecs/freebsd-icc/qmake.conf
45
# Add mkspec for g++. The clang is now the officially supported compiler for
46
# Qt>=5.6.0 on FreeBSD.
47
	@${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-g++ \
48
		${WRKSRC}/mkspecs/freebsd-g++
49
	@${REINPLACE_CMD} -e 's|(../|(|g' \
50
		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
51
	@${REINPLACE_CMD} -e 's|"../|"|g' \
52
		${WRKSRC}/mkspecs/freebsd-g++/qplatformdefs.h
53
# Clean up files created by patching
54
	@${RM} ${WRKSRC}/mkspecs/*/*.orig
40
	@${RM} ${WRKSRC}/mkspecs/*/*.orig
55
	@${RM} -Rf ${WRKSRC}/mkspecs/unsupported/freebsd-g++46
56
41
57
post-build:
42
post-build:
58
# Complete configure stage to generate *.pri files.
43
# Complete configure stage to generate *.pri files.
(-)devel/qmake5/files/patch-configure (-28 / +1 lines)
Lines 1-24 Link Here
1
The first two hunks make sure only qmake is build, as the rest of Qt is built
1
Make sure only qmake is built, as the rest of Qt is built
2
in other ports.
2
in other ports.
3
3
4
The last hunk is backported from upstream:
5
6
commit a9474d1260a8c8cc9eae14f2984098919d9684e5
7
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
8
Date:   Tue Aug 23 20:25:14 2016 +0200
9
10
    configure: Correctly detect clang's version on FreeBSD
11
12
    "clang -v" on FreeBSD reports something like "FreeBSD clang version
13
    x.y.z [...]" instead of just "clang version x.y.z [...]", which fails to
14
    match the sed pattern in the configure script, resulting in qconfig.pri
15
    having no clang version defined.
16
17
    Augment the pattern so that both version strings match.
18
19
    Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035
20
    Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
21
22
--- configure.orig	2016-08-24 08:18:37 UTC
4
--- configure.orig	2016-08-24 08:18:37 UTC
23
+++ configure
5
+++ configure
24
@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
6
@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
Lines 44-55 Link Here
44
 
26
 
45
     if [ "$OPT_VERBOSE" = yes ]; then
27
     if [ "$OPT_VERBOSE" = yes ]; then
46
         # Show the output of make
28
         # Show the output of make
47
@@ -6691,7 +6689,7 @@ case "$QMAKE_CONF_COMPILER" in
48
     # Clang
49
     COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E '
50
 /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;}
51
-/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'`
52
+/^(FreeBSD )?clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'`
53
     eval "$COMPILER_VERSION"
54
     ;;
55
 *icpc)
(-)devel/qmake5/files/patch-mkspecs__common__freebsd.conf (-43 lines)
Lines 1-43 Link Here
1
--- ./mkspecs/common/freebsd.conf.orig	2013-12-05 17:36:29.064198097 +0000
2
+++ ./mkspecs/common/freebsd.conf	2013-12-05 17:38:34.413200492 +0000
3
@@ -0,0 +1,40 @@
4
+#
5
+# qmake configuration for FreeBSD
6
+#
7
+
8
+MAKEFILE_GENERATOR      = UNIX
9
+QMAKE_PLATFORM          = freebsd bsd
10
+
11
+QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
12
+
13
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
14
+
15
+# Addon software goes into /usr/local on the BSDs, by default we will look there
16
+QMAKE_INCDIR            = %%LOCALBASE%%/include
17
+QMAKE_LIBDIR            = %%LOCALBASE%%/lib
18
+
19
+# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h.
20
+QMAKE_INCDIR_OPENGL     = %%LOCALBASE%%/include
21
+QMAKE_LIBDIR_OPENGL     = %%LOCALBASE%%/lib
22
+
23
+QMAKE_LFLAGS_NOUNDEF    = -Wl,--no-undefined
24
+QMAKE_LFLAGS_THREAD     = -pthread
25
+
26
+QMAKE_LIBS              =
27
+QMAKE_LIBS_DYNLOAD      =
28
+QMAKE_LIBS_EXECINFO     = -lexecinfo
29
+QMAKE_LIBS_X11          = -lXext -lX11 -lm
30
+QMAKE_LIBS_OPENGL       = -lGL
31
+QMAKE_LIBS_THREAD       =
32
+
33
+QMAKE_AR                = ar cqs
34
+QMAKE_OBJCOPY           = objcopy
35
+QMAKE_NM                = nm -P
36
+QMAKE_RANLIB            =
37
+
38
+QMAKE_STRIP             = strip
39
+QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
40
+QMAKE_INSTALL_FILE      = install -m 644 -p
41
+QMAKE_INSTALL_PROGRAM   = install -m 755 -p
42
+
43
+include(unix.conf)
(-)devel/qmake5/files/patch-mkspecs_freebsd-clang_qmake.conf (-38 lines)
Lines 1-38 Link Here
1
--- mkspecs/freebsd-clang/qmake.conf.orig	2016-04-13 18:43:04 UTC
2
+++ mkspecs/freebsd-clang/qmake.conf
3
@@ -2,34 +2,7 @@
4
 # qmake configuration for freebsd-clang
5
 #
6
 
7
-MAKEFILE_GENERATOR      = UNIX
8
-QMAKE_PLATFORM          = freebsd bsd
9
-
10
-include(../common/unix.conf)
11
-
12
-QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
13
-
14
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
15
-
16
-# Addon software goes into /usr/local on the BSDs, by default we will look there
17
-QMAKE_INCDIR            = /usr/local/include
18
-QMAKE_LIBDIR            = /usr/local/lib
19
-
20
-QMAKE_LFLAGS_NOUNDEF    = -Wl,--no-undefined
21
-QMAKE_LFLAGS_THREAD     = -pthread
22
-
23
-QMAKE_LIBS              =
24
-QMAKE_LIBS_DYNLOAD      =
25
-QMAKE_LIBS_EXECINFO     = -lexecinfo
26
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
27
-QMAKE_LIBS_OPENGL       = -lGL
28
-QMAKE_LIBS_THREAD       =
29
-
30
-QMAKE_AR                = ar cqs
31
-QMAKE_OBJCOPY           = objcopy
32
-QMAKE_NM                = nm -P
33
-QMAKE_RANLIB            =
34
-
35
+include(../common/freebsd.conf)
36
 include(../common/gcc-base-unix.conf)
37
 include(../common/clang.conf)
38
 
(-)devel/qmake5/files/patch-mkspecs_unsupported_freebsd-g++_qmake.conf (-37 lines)
Lines 1-37 Link Here
1
--- mkspecs/unsupported/freebsd-g++/qmake.conf.orig	2016-04-13 18:41:57 UTC
2
+++ mkspecs/unsupported/freebsd-g++/qmake.conf
3
@@ -2,33 +2,7 @@
4
 # qmake configuration for freebsd-g++
5
 #
6
 
7
-MAKEFILE_GENERATOR      = UNIX
8
-QMAKE_PLATFORM          = freebsd bsd
9
-
10
-include(../../common/unix.conf)
11
-
12
-QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
13
-
14
-QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
15
-
16
-# Addon software goes into /usr/local on the BSDs, by default we will look there
17
-QMAKE_INCDIR            = /usr/local/include
18
-QMAKE_LIBDIR            = /usr/local/lib
19
-
20
-QMAKE_LFLAGS_THREAD     = -pthread
21
-
22
-QMAKE_LIBS              =
23
-QMAKE_LIBS_DYNLOAD      =
24
-QMAKE_LIBS_EXECINFO     = -lexecinfo
25
-QMAKE_LIBS_X11          = -lXext -lX11 -lm
26
-QMAKE_LIBS_OPENGL       = -lGL
27
-QMAKE_LIBS_THREAD       =
28
-
29
-QMAKE_AR                = ar cqs
30
-QMAKE_OBJCOPY           = objcopy
31
-QMAKE_NM                = nm -P
32
-QMAKE_RANLIB            =
33
-
34
+include(../../common/freebsd.conf)
35
 include(../../common/gcc-base-unix.conf)
36
 include(../../common/g++-unix.conf)
37
 load(qt_config)
(-)devel/qmake5/pkg-plist (-3 / +16 lines)
Lines 7-12 Link Here
7
%%QT_MKSPECDIR%%/aix-xlc-64/qplatformdefs.h
7
%%QT_MKSPECDIR%%/aix-xlc-64/qplatformdefs.h
8
%%QT_MKSPECDIR%%/aix-xlc/qmake.conf
8
%%QT_MKSPECDIR%%/aix-xlc/qmake.conf
9
%%QT_MKSPECDIR%%/aix-xlc/qplatformdefs.h
9
%%QT_MKSPECDIR%%/aix-xlc/qplatformdefs.h
10
%%QT_MKSPECDIR%%/android-clang/qmake.conf
11
%%QT_MKSPECDIR%%/android-clang/qplatformdefs.h
10
%%QT_MKSPECDIR%%/android-g++/qmake.conf
12
%%QT_MKSPECDIR%%/android-g++/qmake.conf
11
%%QT_MKSPECDIR%%/android-g++/qplatformdefs.h
13
%%QT_MKSPECDIR%%/android-g++/qplatformdefs.h
12
%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf
14
%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf
Lines 14-25 Link Here
14
%%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf
16
%%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf
15
%%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h
17
%%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h
16
%%QT_MKSPECDIR%%/common/aix/qplatformdefs.h
18
%%QT_MKSPECDIR%%/common/aix/qplatformdefs.h
19
%%QT_MKSPECDIR%%/common/android-base-head.conf
20
%%QT_MKSPECDIR%%/common/android-base-tail.conf
17
%%QT_MKSPECDIR%%/common/android/qplatformdefs.h
21
%%QT_MKSPECDIR%%/common/android/qplatformdefs.h
18
%%QT_MKSPECDIR%%/common/angle.conf
22
%%QT_MKSPECDIR%%/common/angle.conf
23
%%QT_MKSPECDIR%%/common/bsd/bsd.conf
24
%%QT_MKSPECDIR%%/common/bsd/qplatformdefs.h
19
%%QT_MKSPECDIR%%/common/c89/qplatformdefs.h
25
%%QT_MKSPECDIR%%/common/c89/qplatformdefs.h
20
%%QT_MKSPECDIR%%/common/clang-mac.conf
26
%%QT_MKSPECDIR%%/common/clang-mac.conf
21
%%QT_MKSPECDIR%%/common/clang.conf
27
%%QT_MKSPECDIR%%/common/clang.conf
22
%%QT_MKSPECDIR%%/common/freebsd.conf
23
%%QT_MKSPECDIR%%/common/g++-base.conf
28
%%QT_MKSPECDIR%%/common/g++-base.conf
24
%%QT_MKSPECDIR%%/common/g++-macx.conf
29
%%QT_MKSPECDIR%%/common/g++-macx.conf
25
%%QT_MKSPECDIR%%/common/g++-unix.conf
30
%%QT_MKSPECDIR%%/common/g++-unix.conf
Lines 44-50 Link Here
44
%%QT_MKSPECDIR%%/common/nacl/nacl-base.conf
49
%%QT_MKSPECDIR%%/common/nacl/nacl-base.conf
45
%%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h
50
%%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h
46
%%QT_MKSPECDIR%%/common/posix/qplatformdefs.h
51
%%QT_MKSPECDIR%%/common/posix/qplatformdefs.h
52
%%QT_MKSPECDIR%%/common/qcc-base-qnx-aarch64le.conf
47
%%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf
53
%%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf
54
%%QT_MKSPECDIR%%/common/qcc-base-qnx-x86-64.conf
48
%%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf
55
%%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf
49
%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf
56
%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf
50
%%QT_MKSPECDIR%%/common/qcc-base.conf
57
%%QT_MKSPECDIR%%/common/qcc-base.conf
Lines 109-114 Link Here
109
%%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h
116
%%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h
110
%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qmake.conf
117
%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qmake.conf
111
%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qplatformdefs.h
118
%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qplatformdefs.h
119
%%QT_MKSPECDIR%%/devices/linux-rpi3-vc4-g++/qmake.conf
120
%%QT_MKSPECDIR%%/devices/linux-rpi3-vc4-g++/qplatformdefs.h
112
%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
121
%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
113
%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h
122
%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h
114
%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
123
%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
Lines 241-246 Link Here
241
%%QT_MKSPECDIR%%/features/win32/qt_dll.prf
250
%%QT_MKSPECDIR%%/features/win32/qt_dll.prf
242
%%QT_MKSPECDIR%%/features/win32/rtti.prf
251
%%QT_MKSPECDIR%%/features/win32/rtti.prf
243
%%QT_MKSPECDIR%%/features/win32/rtti_off.prf
252
%%QT_MKSPECDIR%%/features/win32/rtti_off.prf
253
%%QT_MKSPECDIR%%/features/win32/separate_debug_info.prf
244
%%QT_MKSPECDIR%%/features/win32/stl.prf
254
%%QT_MKSPECDIR%%/features/win32/stl.prf
245
%%QT_MKSPECDIR%%/features/win32/stl_off.prf
255
%%QT_MKSPECDIR%%/features/win32/stl_off.prf
246
%%QT_MKSPECDIR%%/features/win32/windeployqt.prf
256
%%QT_MKSPECDIR%%/features/win32/windeployqt.prf
Lines 254-261 Link Here
254
%%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h
264
%%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h
255
%%QT_MKSPECDIR%%/freebsd-g++/qmake.conf
265
%%QT_MKSPECDIR%%/freebsd-g++/qmake.conf
256
%%QT_MKSPECDIR%%/freebsd-g++/qplatformdefs.h
266
%%QT_MKSPECDIR%%/freebsd-g++/qplatformdefs.h
257
%%QT_MKSPECDIR%%/freebsd-icc/qmake.conf
258
%%QT_MKSPECDIR%%/freebsd-icc/qplatformdefs.h
259
%%QT_MKSPECDIR%%/haiku-g++/qmake.conf
267
%%QT_MKSPECDIR%%/haiku-g++/qmake.conf
260
%%QT_MKSPECDIR%%/haiku-g++/qplatformdefs.h
268
%%QT_MKSPECDIR%%/haiku-g++/qplatformdefs.h
261
%%QT_MKSPECDIR%%/hpux-acc-64/qmake.conf
269
%%QT_MKSPECDIR%%/hpux-acc-64/qmake.conf
Lines 366-371 Link Here
366
%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase_targets.prf
374
%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase_targets.prf
367
%%QT_MKSPECDIR%%/macx-ios-clang/features/xcodebuild.prf
375
%%QT_MKSPECDIR%%/macx-ios-clang/features/xcodebuild.prf
368
%%QT_MKSPECDIR%%/macx-ios-clang/ios_destinations.sh
376
%%QT_MKSPECDIR%%/macx-ios-clang/ios_destinations.sh
377
%%QT_MKSPECDIR%%/macx-ios-clang/ios_devices.pl
369
%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
378
%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
370
%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
379
%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
371
%%QT_MKSPECDIR%%/macx-ios-clang/xcodebuild.mk
380
%%QT_MKSPECDIR%%/macx-ios-clang/xcodebuild.mk
Lines 387-394 Link Here
387
%%QT_MKSPECDIR%%/qdevice.pri
396
%%QT_MKSPECDIR%%/qdevice.pri
388
%%QT_MKSPECDIR%%/qfeatures.pri
397
%%QT_MKSPECDIR%%/qfeatures.pri
389
%%QT_MKSPECDIR%%/qmodule.pri
398
%%QT_MKSPECDIR%%/qmodule.pri
399
%%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qmake.conf
400
%%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qplatformdefs.h
390
%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf
401
%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf
391
%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h
402
%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h
403
%%QT_MKSPECDIR%%/qnx-x86-64-qcc/qmake.conf
404
%%QT_MKSPECDIR%%/qnx-x86-64-qcc/qplatformdefs.h
392
%%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf
405
%%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf
393
%%QT_MKSPECDIR%%/qnx-x86-qcc/qplatformdefs.h
406
%%QT_MKSPECDIR%%/qnx-x86-qcc/qplatformdefs.h
394
%%QT_MKSPECDIR%%/sco-cc/qmake.conf
407
%%QT_MKSPECDIR%%/sco-cc/qmake.conf
(-)devel/qt5/distinfo (-45 / +45 lines)
Lines 1-45 Link Here
1
TIMESTAMP = 1467701519
1
TIMESTAMP = 1476003740
2
SHA256 (KDE/Qt/5.6.1/qt3d-opensource-src-5.6.1.tar.xz) = ad93015165b1ab1a8b458e08503c8f4c8450c2b58024a3ac074281a1a90ea80d
2
SHA256 (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941
3
SIZE (KDE/Qt/5.6.1/qt3d-opensource-src-5.6.1.tar.xz) = 19763900
3
SIZE (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = 19763124
4
SHA256 (KDE/Qt/5.6.1/qtbase-opensource-src-5.6.1.tar.xz) = d01cc1ee2be9ecdb169be3aea9dc9fc019c1c6d0bb87e0c88bb95b5b3dce7264
4
SHA256 (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
5
SIZE (KDE/Qt/5.6.1/qtbase-opensource-src-5.6.1.tar.xz) = 46791688
5
SIZE (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 46825164
6
SHA256 (KDE/Qt/5.6.1/qtcanvas3d-opensource-src-5.6.1.tar.xz) = 191e2cde0ac8b1ef6616263aac27f12f40335fed2bd60e29987724242b872760
6
SHA256 (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad
7
SIZE (KDE/Qt/5.6.1/qtcanvas3d-opensource-src-5.6.1.tar.xz) = 10836280
7
SIZE (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = 10836672
8
SHA256 (KDE/Qt/5.6.1/qtconnectivity-opensource-src-5.6.1.tar.xz) = 5a35abf6b515091e4b181b78d0ed82249972bf93f227d52c70531417c448d919
8
SHA256 (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9
9
SIZE (KDE/Qt/5.6.1/qtconnectivity-opensource-src-5.6.1.tar.xz) = 2630248
9
SIZE (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 2639772
10
SHA256 (KDE/Qt/5.6.1/qtdeclarative-opensource-src-5.6.1.tar.xz) = 12fcfd4bc4bad469f07f8c5404d98646f88f61200b014d4fbcb3a0d9e70942b4
10
SHA256 (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da
11
SIZE (KDE/Qt/5.6.1/qtdeclarative-opensource-src-5.6.1.tar.xz) = 18803076
11
SIZE (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 18813016
12
SHA256 (KDE/Qt/5.6.1/qtgraphicaleffects-opensource-src-5.6.1.tar.xz) = 57e97155da33a8a4023d1b33bc6f7bdef68a64640d04f45ef3db9dec721311d8
12
SHA256 (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e
13
SIZE (KDE/Qt/5.6.1/qtgraphicaleffects-opensource-src-5.6.1.tar.xz) = 14751076
13
SIZE (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 14751100
14
SHA256 (KDE/Qt/5.6.1/qtimageformats-opensource-src-5.6.1.tar.xz) = 74f3bce4f9df0f1a94d41877a91405560ce79e4359fc831ee97f0c8248081b08
14
SHA256 (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4
15
SIZE (KDE/Qt/5.6.1/qtimageformats-opensource-src-5.6.1.tar.xz) = 1909092
15
SIZE (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 1909556
16
SHA256 (KDE/Qt/5.6.1/qtlocation-opensource-src-5.6.1.tar.xz) = d3b5768cf68945cd00c9df32fb87ca3bf85f5364dc2e441780840e2bd4d15061
16
SHA256 (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a
17
SIZE (KDE/Qt/5.6.1/qtlocation-opensource-src-5.6.1.tar.xz) = 3046500
17
SIZE (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 3148448
18
SHA256 (KDE/Qt/5.6.1/qtmultimedia-opensource-src-5.6.1.tar.xz) = d24b5b5fc9f296cc8446c27f1306a47ce5699b65cf1b821d6a43652cd8100515
18
SHA256 (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf
19
SIZE (KDE/Qt/5.6.1/qtmultimedia-opensource-src-5.6.1.tar.xz) = 3485964
19
SIZE (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = 3492628
20
SHA256 (KDE/Qt/5.6.1/qtquickcontrols-opensource-src-5.6.1.tar.xz) = 012aa6c4a697f352a9dc1373d8c1f37e33a6d956b6d14be7d1f9e4637d46a691
20
SHA256 (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c
21
SIZE (KDE/Qt/5.6.1/qtquickcontrols-opensource-src-5.6.1.tar.xz) = 5952340
21
SIZE (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5952696
22
SHA256 (KDE/Qt/5.6.1/qtquickcontrols2-opensource-src-5.6.1.tar.xz) = bba0ddcf1a66c8dec3faeb9c84119992bb1ead09a674aae475d19c35cc8eeb8f
22
SHA256 (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1
23
SIZE (KDE/Qt/5.6.1/qtquickcontrols2-opensource-src-5.6.1.tar.xz) = 882000
23
SIZE (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 882160
24
SHA256 (KDE/Qt/5.6.1/qtscript-opensource-src-5.6.1.tar.xz) = 1cb2ef87aeff3d8d05685279b521c332b752e4559f8e2138fd36d3eb682bf79f
24
SHA256 (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e
25
SIZE (KDE/Qt/5.6.1/qtscript-opensource-src-5.6.1.tar.xz) = 2587832
25
SIZE (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = 2587484
26
SHA256 (KDE/Qt/5.6.1/qtsensors-opensource-src-5.6.1.tar.xz) = c724cd14efc62d935ca822147bf9771e735995032c7b3b13e2e8156d283d942e
26
SHA256 (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427
27
SIZE (KDE/Qt/5.6.1/qtsensors-opensource-src-5.6.1.tar.xz) = 1973308
27
SIZE (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = 1973888
28
SHA256 (KDE/Qt/5.6.1/qtserialbus-opensource-src-5.6.1.tar.xz) = bf453fd114131ff64b7ff9a412ef13f6e158d1b5cbebf8fa6b5938bb671bc8c0
28
SHA256 (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826
29
SIZE (KDE/Qt/5.6.1/qtserialbus-opensource-src-5.6.1.tar.xz) = 233600
29
SIZE (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = 234612
30
SHA256 (KDE/Qt/5.6.1/qtserialport-opensource-src-5.6.1.tar.xz) = 0b74a2e85e34163c92b076a9af2bbb2c832516839f060266f0465f881f1be6c2
30
SHA256 (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376
31
SIZE (KDE/Qt/5.6.1/qtserialport-opensource-src-5.6.1.tar.xz) = 256724
31
SIZE (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = 256852
32
SHA256 (KDE/Qt/5.6.1/qtsvg-opensource-src-5.6.1.tar.xz) = f12e4fd4f169123f7648e45c593b2c5a4556a9b2db3a798467aa9c67c82b8a21
32
SHA256 (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e
33
SIZE (KDE/Qt/5.6.1/qtsvg-opensource-src-5.6.1.tar.xz) = 1723160
33
SIZE (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = 1723056
34
SHA256 (KDE/Qt/5.6.1/qttools-opensource-src-5.6.1.tar.xz) = 77a38895ee2d3fe2d0df4a5e1bbef4d3f8870fe20cd3b2cea27bd2d380c17f71
34
SHA256 (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7
35
SIZE (KDE/Qt/5.6.1/qttools-opensource-src-5.6.1.tar.xz) = 9819124
35
SIZE (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = 9794512
36
SHA256 (KDE/Qt/5.6.1/qttranslations-opensource-src-5.6.1.tar.xz) = 69d52da2691e4c2be7bd5d5a39bdd948bc9dd1c118d417af09e1e30ac0f41c01
36
SHA256 (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421
37
SIZE (KDE/Qt/5.6.1/qttranslations-opensource-src-5.6.1.tar.xz) = 1202688
37
SIZE (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 1204148
38
SHA256 (KDE/Qt/5.6.1/qtwebchannel-opensource-src-5.6.1.tar.xz) = f82cb5d1bc7af79453da8327464d800469dc40d92446051b4404047542020807
38
SHA256 (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52
39
SIZE (KDE/Qt/5.6.1/qtwebchannel-opensource-src-5.6.1.tar.xz) = 98196
39
SIZE (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 119792
40
SHA256 (KDE/Qt/5.6.1/qtwebsockets-opensource-src-5.6.1.tar.xz) = 551e3a6b8d945a3b1d707755c3d4d5fd6a86808ced492709aecf444fa228723a
40
SHA256 (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35
41
SIZE (KDE/Qt/5.6.1/qtwebsockets-opensource-src-5.6.1.tar.xz) = 170968
41
SIZE (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 171004
42
SHA256 (KDE/Qt/5.6.1/qtx11extras-opensource-src-5.6.1.tar.xz) = e8eb1bd1b963576b1d360341903cb4065e4d361ce6f76304b4b929f42336e350
42
SHA256 (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced
43
SIZE (KDE/Qt/5.6.1/qtx11extras-opensource-src-5.6.1.tar.xz) = 33648
43
SIZE (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 33640
44
SHA256 (KDE/Qt/5.6.1/qtxmlpatterns-opensource-src-5.6.1.tar.xz) = 64f46e22aa17f26fe0542069932efdef84ce5d846a5db40ad8e7ad3eb6148160
44
SHA256 (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc
45
SIZE (KDE/Qt/5.6.1/qtxmlpatterns-opensource-src-5.6.1.tar.xz) = 1324348
45
SIZE (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 1323576
(-)devel/qt5-core/Makefile (-1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	core
3
PORTNAME=	core
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
6
CATEGORIES=	devel
5
CATEGORIES=	devel
7
PKGNAMEPREFIX=	qt5-
6
PKGNAMEPREFIX=	qt5-
8
7
(-)devel/qt5-core/files/patch-git_680ec54a (-68 lines)
Lines 1-68 Link Here
1
commit 680ec54a76eaf63375f648819ac9f98c915e5c43
2
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3
Date:   Mon Aug 22 19:55:10 2016 +0200
4
5
    QMutex: Make freelist() return a real global static
6
7
    Since Qt 5.6.0, some applications such as Kate (built with clang, libc++
8
    and libcxxrt) on FreeBSD occasionally crash with the following error
9
    message on exit:
10
11
        QMutex::lock(): sem_wait failure: Invalid argument
12
        [or pthread_cond_wait in the 5.6 branch]
13
14
    Investigation by Gleb Popov, Thiago Macieira and Olivier Goffart has
15
    shown that this is caused by the fact that QDBusConnectionManager is a
16
    Q_GLOBAL_STATIC (so it will be destroyed with all the other
17
    Q_GLOBAL_STATICs in the reverse order of construction). In the
18
    Q_COMPILER_THREADSAFE_STATICS case, freelist() also returns a
19
    function-level static that is constructed on first use, so it may be
20
    destroyed earlier than the QDBusConnectionManager object, making it
21
    impossible to lock a contended mutex.
22
23
    We now make freelist() return a global static, so that it is always
24
    destroyed after QDBusConnectionManager and other function-static
25
    variables.
26
27
    Change-Id: I210fa7c18dbdf2345863da49141b9a85cffdef52
28
    Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
29
30
--- src/corelib/thread/qmutex.cpp
31
+++ src/corelib/thread/qmutex.cpp
32
@@ -571,34 +571,11 @@ const int FreeListConstants::Sizes[FreeListConstants::BlockCount] = {
33
 
34
 typedef QFreeList<QMutexPrivate, FreeListConstants> FreeList;
35
 // We cannot use Q_GLOBAL_STATIC because it uses QMutex
36
-#if defined(Q_COMPILER_THREADSAFE_STATICS)
37
+static FreeList freeList_;
38
 FreeList *freelist()
39
 {
40
-    static FreeList list;
41
-    return &list;
42
+    return &freeList_;
43
 }
44
-#else
45
-static QBasicAtomicPointer<FreeList> freeListPtr;
46
-
47
-FreeList *freelist()
48
-{
49
-    FreeList *local = freeListPtr.loadAcquire();
50
-    if (!local) {
51
-        local = new FreeList;
52
-        if (!freeListPtr.testAndSetRelease(0, local)) {
53
-            delete local;
54
-            local = freeListPtr.loadAcquire();
55
-        }
56
-    }
57
-    return local;
58
-}
59
-
60
-static void qFreeListDeleter()
61
-{
62
-    delete freeListPtr.load();
63
-}
64
-Q_DESTRUCTOR_FUNCTION(qFreeListDeleter)
65
-#endif
66
 }
67
 
68
 QMutexPrivate *QMutexPrivate::allocate()
(-)devel/qt5-core/files/patch-git_bfa53e1c6 (-25 lines)
Lines 1-25 Link Here
1
From bfa53e1c67eddb14887cda37d7c89c76f4cce378 Mon Sep 17 00:00:00 2001
2
From: Ralf Nolden <nolden@kde.org>
3
Date: Tue, 10 May 2016 16:34:37 +0200
4
Subject: [PATCH] Compile fix: remove _POSIX_C_SOURCE usage
5
6
Remove _POSIX_C_SOURCE usage as the reason why it was added is not
7
clear anymore and it causes compile errors on BSD systems if not
8
circumvented by adding further defines to re-enable function calls
9
hidden by the _POSIX_C_SOURCE define. (__BSD_VISIBLE on FreeBSD/OpenBSD
10
and _NETBSD_SOURCE on NetBSD)
11
12
Change-Id: Ic6b49ddcd6c481b0f2acd598cea5470604e00507
13
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
14
--- src/corelib/tools/qelapsedtimer_unix.cpp.orig	2016-02-24 20:16:34 UTC
15
+++ src/corelib/tools/qelapsedtimer_unix.cpp
16
@@ -31,9 +31,6 @@
17
 **
18
 ****************************************************************************/
19
 
20
-// ask for the latest POSIX, just in case
21
-#define _POSIX_C_SOURCE 200809L
22
-
23
 #include "qelapsedtimer.h"
24
 #if defined(Q_OS_VXWORKS)
25
 #include "qfunctions_vxworks.h"
(-)devel/qt5-core/files/patch-git_c9998b8a (-26 lines)
Lines 1-26 Link Here
1
From c9998b8af39bcf990f4ef9a0ff87b65574a86bfd Mon Sep 17 00:00:00 2001
2
From: Thiago Macieira <thiago.macieira@intel.com>
3
Date: Mon, 9 May 2016 11:19:27 -0700
4
Subject: [PATCH] Fix build with GCC <= 4.2 (FreeBSD 9.x)
5
6
15b42af11123f9d1eb4bbd79870185585103ea8d changed the qt_cpu_features
7
variable to be an array and never fixed this #if branch of the code.
8
9
Change-Id: Id69569111e7d4e619e22ffff144cf930f86f478e
10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
11
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
12
--- src/corelib/tools/qsimd.cpp.orig    2016-04-13 20:53:43 UTC
13
+++ src/corelib/tools/qsimd.cpp
14
@@ -666,7 +666,11 @@ void qDetectCpuFeatures()
15
     // contains all the features that the code required. Qt 4 ran for years
16
     // like that, so it shouldn't be a problem.
17
18
-    qt_cpu_features.store(minFeature | quint32(QSimdInitialized));
19
+    qt_cpu_features[0].store(minFeature | quint32(QSimdInitialized));
20
+#ifndef Q_ATOMIC_INT64_IS_SUPPORTED
21
+    qt_cpu_features[1].store(minFeature >> 32);
22
+#endif
23
+
24
     return;
25
 # endif
26
 #endif
(-)devel/qt5-qdoc/Makefile (-1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	qdoc
3
PORTNAME=	qdoc
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	1
6
CATEGORIES=	devel textproc
5
CATEGORIES=	devel textproc
7
PKGNAMEPREFIX=	qt5-
6
PKGNAMEPREFIX=	qt5-
8
7
(-)devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp (-5 / +5 lines)
Lines 8-21 Link Here
8
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59391
8
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59391
9
[2] https://bugreports.qt.io/browse/QTBUG-43057
9
[2] https://bugreports.qt.io/browse/QTBUG-43057
10
10
11
--- src/qdoc/qdocindexfiles.cpp.orig	2016-10-02 07:52:39 UTC
11
--- src/qdoc/qdocindexfiles.cpp.orig    2016-10-09 21:13:42.831072000 +0200
12
+++ src/qdoc/qdocindexfiles.cpp
12
+++ src/qdoc/qdocindexfiles.cpp 2016-10-09 21:13:56.153968000 +0200
13
@@ -1476,7 +1476,7 @@ void QDocIndexFiles::generateIndexSectio
13
@@ -1412,7 +1412,7 @@
14
             const Aggregate* inner = static_cast<const Aggregate*>(node);
14
             const Aggregate* inner = static_cast<const Aggregate*>(node);
15
15
16
             NodeList cnodes = inner->childNodes();
16
             NodeList cnodes = inner->childNodes();
17
-            std::sort(cnodes.begin(), cnodes.end(), compareNodes);
17
-            std::sort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan);
18
+            qSort(cnodes.begin(), cnodes.end(), compareNodes);
18
+            qSort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan);
19
19
20
             foreach (Node* child, cnodes) {
20
             foreach (Node* child, cnodes) {
21
                 generateIndexSections(writer, child, generateInternalNodes);
21
                 generateIndexSections(writer, child, generateInternalNodes);
(-)devel/qt5-testlib/pkg-plist (+1 lines)
Lines 19-24 Link Here
19
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
19
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
20
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
20
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
21
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
21
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
22
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h
22
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
23
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
23
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
24
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
24
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
25
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
(-)lang/qt5-qml/files/patch-git_9b1231ca (-34 lines)
Lines 1-34 Link Here
1
This patch is the only change between Qt 5.6.1 and 5.6.1-1. It is easier to
2
just ship the patch separately.
3
4
[We left out the part concerning the tests/ subdirectory we do not care about]
5
6
From 9b1231ca3d21ade574a8a7cf3f0805a8b520bcd5 Mon Sep 17 00:00:00 2001
7
From: Ulf Hermann <ulf.hermann@qt.io>
8
Date: Wed, 8 Jun 2016 17:32:32 +0200
9
Subject: [PATCH] QML: Only release types if they aren't referenced anymore
10
11
Just checking for references on m_compiledData is not enough. The
12
actual component can also be referenced. Thus it won't be deleted
13
on release(), but cannot be found in the type cache anymore.
14
15
Task-number: QTBUG-53761
16
Change-Id: I8567af8e75a078598e4fed31e4717134e1332278
17
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
18
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
19
(cherry picked from commit 2ac19881f92c94f4e9427bd9ff513210675f259e)
20
--- src/qml/qml/qqmltypeloader.cpp
21
+++ src/qml/qml/qqmltypeloader.cpp
22
@@ -1961,7 +1961,8 @@ void QQmlTypeLoader::trimCache()
23
         QList<TypeCache::Iterator> unneededTypes;
24
         for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end; ++iter)  {
25
             QQmlTypeData *typeData = iter.value();
26
-            if (typeData->m_compiledData && typeData->m_compiledData->count() == 1) {
27
+            if (typeData->m_compiledData && typeData->count() == 1
28
+                    && typeData->m_compiledData->count() == 1) {
29
                 // There are no live objects of this type
30
                 unneededTypes.append(iter);
31
             }
32
--
33
2.8.4
34
(-)misc/qt4-l10n/pkg-plist (+1 lines)
Lines 87-92 Link Here
87
%%QT_L10NDIR%%/qtconfig_uk.qm
87
%%QT_L10NDIR%%/qtconfig_uk.qm
88
%%QT_L10NDIR%%/qtconfig_zh_CN.qm
88
%%QT_L10NDIR%%/qtconfig_zh_CN.qm
89
%%QT_L10NDIR%%/qtconfig_zh_TW.qm
89
%%QT_L10NDIR%%/qtconfig_zh_TW.qm
90
%%QT_L10NDIR%%/qtquickcontrols2_en.qm
90
%%QT_L10NDIR%%/qtscript_eu.qm
91
%%QT_L10NDIR%%/qtscript_eu.qm
91
%%QT_L10NDIR%%/qvfb_eu.qm
92
%%QT_L10NDIR%%/qvfb_eu.qm
92
%%QT_L10NDIR%%/qvfb_hu.qm
93
%%QT_L10NDIR%%/qvfb_hu.qm
(-)misc/qt5-doc/Makefile (-1 / +1 lines)
Lines 4-10 Link Here
4
PORTNAME=	doc
4
PORTNAME=	doc
5
DISTVERSION=	${QT5_VERSION}
5
DISTVERSION=	${QT5_VERSION}
6
CATEGORIES=	misc
6
CATEGORIES=	misc
7
MASTER_SITES=	QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/${QT5_SUBDIR}/single
7
MASTER_SITES=	QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single
8
PKGNAMEPREFIX=	qt5-
8
PKGNAMEPREFIX=	qt5-
9
DISTNAME=	qt-everywhere-opensource-src-${QT5_VERSION}
9
DISTNAME=	qt-everywhere-opensource-src-${QT5_VERSION}
10
DIST_SUBDIR=	KDE/Qt/${QT5_VERSION}
10
DIST_SUBDIR=	KDE/Qt/${QT5_VERSION}
(-)misc/qt5-doc/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1467055722
1
TIMESTAMP = 1476004270
2
SHA256 (KDE/Qt/5.6.1/qt-everywhere-opensource-src-5.6.1.tar.xz) = 0d3cc75d2368ad988c9ec6bcbed6362dbaa8e03fdfd04e679284f4b9af91e565
2
SHA256 (KDE/Qt/5.6.2/qt-everywhere-opensource-src-5.6.2.tar.xz) = 83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3
3
SIZE (KDE/Qt/5.6.1/qt-everywhere-opensource-src-5.6.1.tar.xz) = 297805000
3
SIZE (KDE/Qt/5.6.2/qt-everywhere-opensource-src-5.6.2.tar.xz) = 297863804
(-)misc/qt5-doc/pkg-plist (-5 / +9 lines)
Lines 3598-3604 Link Here
3598
%%QT_DOCDIR%%/qtdoc/qmlapplications.html
3598
%%QT_DOCDIR%%/qtdoc/qmlapplications.html
3599
%%QT_DOCDIR%%/qtdoc/qmlbasictypes.html
3599
%%QT_DOCDIR%%/qtdoc/qmlbasictypes.html
3600
%%QT_DOCDIR%%/qtdoc/qmlfirststeps.html
3600
%%QT_DOCDIR%%/qtdoc/qmlfirststeps.html
3601
%%QT_DOCDIR%%/qtdoc/qmlmodules.html
3602
%%QT_DOCDIR%%/qtdoc/qmltypes.html
3601
%%QT_DOCDIR%%/qtdoc/qmltypes.html
3603
%%QT_DOCDIR%%/qtdoc/qpa.html
3602
%%QT_DOCDIR%%/qtdoc/qpa.html
3604
%%QT_DOCDIR%%/qtdoc/qt-activex.html
3603
%%QT_DOCDIR%%/qtdoc/qt-activex.html
Lines 5311-5317 Link Here
5311
%%QT_DOCDIR%%/qtlinguist/style/offline.css
5310
%%QT_DOCDIR%%/qtlinguist/style/offline.css
5312
%%QT_DOCDIR%%/qtlocation.qch
5311
%%QT_DOCDIR%%/qtlocation.qch
5313
%%QT_DOCDIR%%/qtlocation/examples-manifest.xml
5312
%%QT_DOCDIR%%/qtlocation/examples-manifest.xml
5314
%%QT_DOCDIR%%/qtlocation/images/api-map.png
5315
%%QT_DOCDIR%%/qtlocation/images/api-mapcircle.png
5313
%%QT_DOCDIR%%/qtlocation/images/api-mapcircle.png
5316
%%QT_DOCDIR%%/qtlocation/images/api-mappolygon.png
5314
%%QT_DOCDIR%%/qtlocation/images/api-mappolygon.png
5317
%%QT_DOCDIR%%/qtlocation/images/api-mappolyline.png
5315
%%QT_DOCDIR%%/qtlocation/images/api-mappolyline.png
Lines 5330-5335 Link Here
5330
%%QT_DOCDIR%%/qtlocation/images/ico_out.png
5328
%%QT_DOCDIR%%/qtlocation/images/ico_out.png
5331
%%QT_DOCDIR%%/qtlocation/images/logo.png
5329
%%QT_DOCDIR%%/qtlocation/images/logo.png
5332
%%QT_DOCDIR%%/qtlocation/images/mapviewer.png
5330
%%QT_DOCDIR%%/qtlocation/images/mapviewer.png
5331
%%QT_DOCDIR%%/qtlocation/images/minimal_map.png
5333
%%QT_DOCDIR%%/qtlocation/images/places.png
5332
%%QT_DOCDIR%%/qtlocation/images/places.png
5334
%%QT_DOCDIR%%/qtlocation/images/places_list.png
5333
%%QT_DOCDIR%%/qtlocation/images/places_list.png
5335
%%QT_DOCDIR%%/qtlocation/images/places_map.png
5334
%%QT_DOCDIR%%/qtlocation/images/places_map.png
Lines 5532-5537 Link Here
5532
%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-mainmenu-qml.html
5531
%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-mainmenu-qml.html
5533
%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-mappopupmenu-qml.html
5532
%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-mappopupmenu-qml.html
5534
%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-markerpopupmenu-qml.html
5533
%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-menus-markerpopupmenu-qml.html
5534
%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-example.html
5535
%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-main-cpp.html
5536
%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-main-qml.html
5537
%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-minimal-map-pro.html
5538
%%QT_DOCDIR%%/qtlocation/qtlocation-minimal-map-qml-qrc.html
5535
%%QT_DOCDIR%%/qtlocation/qtlocation-module.html
5539
%%QT_DOCDIR%%/qtlocation/qtlocation-module.html
5536
%%QT_DOCDIR%%/qtlocation/qtlocation-places-example.html
5540
%%QT_DOCDIR%%/qtlocation/qtlocation-places-example.html
5537
%%QT_DOCDIR%%/qtlocation/qtlocation-places-forms-message-qml.html
5541
%%QT_DOCDIR%%/qtlocation/qtlocation-places-forms-message-qml.html
Lines 10056-10061 Link Here
10056
%%QT_DOCDIR%%/qtwebchannel/images/btn_prev.png
10060
%%QT_DOCDIR%%/qtwebchannel/images/btn_prev.png
10057
%%QT_DOCDIR%%/qtwebchannel/images/bullet_dn.png
10061
%%QT_DOCDIR%%/qtwebchannel/images/bullet_dn.png
10058
%%QT_DOCDIR%%/qtwebchannel/images/bullet_sq.png
10062
%%QT_DOCDIR%%/qtwebchannel/images/bullet_sq.png
10063
%%QT_DOCDIR%%/qtwebchannel/images/chatclient-html.png
10064
%%QT_DOCDIR%%/qtwebchannel/images/chatclient-qml.png
10065
%%QT_DOCDIR%%/qtwebchannel/images/chatserver-cpp.png
10059
%%QT_DOCDIR%%/qtwebchannel/images/home.png
10066
%%QT_DOCDIR%%/qtwebchannel/images/home.png
10060
%%QT_DOCDIR%%/qtwebchannel/images/ico_note.png
10067
%%QT_DOCDIR%%/qtwebchannel/images/ico_note.png
10061
%%QT_DOCDIR%%/qtwebchannel/images/ico_note_attention.png
10068
%%QT_DOCDIR%%/qtwebchannel/images/ico_note_attention.png
Lines 12512-12518 Link Here
12512
%%QT_DOCDIR%%/qtwinextras/images/taskbar-progress-stopped.png
12519
%%QT_DOCDIR%%/qtwinextras/images/taskbar-progress-stopped.png
12513
%%QT_DOCDIR%%/qtwinextras/images/taskbar-progress.png
12520
%%QT_DOCDIR%%/qtwinextras/images/taskbar-progress.png
12514
%%QT_DOCDIR%%/qtwinextras/images/thumbbar.png
12521
%%QT_DOCDIR%%/qtwinextras/images/thumbbar.png
12515
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/musicplayer/images/musicplayer.png
12516
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-pause-16.png
12522
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-pause-16.png
12517
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-pause-32.png
12523
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-pause-32.png
12518
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-play-16.png
12524
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-play-16.png
Lines 12520-12526 Link Here
12520
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-seek-backward-32.png
12526
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-seek-backward-32.png
12521
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-seek-forward-32.png
12527
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-seek-forward-32.png
12522
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-stop-32.png
12528
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/media-stop-32.png
12523
%%QT_DOCDIR%%/qtwinextras/images/used-in-examples/quickplayer/images/quickplayer.png
12524
%%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-dwmfeatures-members.html
12529
%%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-dwmfeatures-members.html
12525
%%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-dwmfeatures.html
12530
%%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-dwmfeatures.html
12526
%%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-jumplist-members.html
12531
%%QT_DOCDIR%%/qtwinextras/qml-qtwinextras-jumplist-members.html
Lines 12550-12556 Link Here
12550
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-cpp.html
12555
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-cpp.html
12551
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-h.html
12556
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-h.html
12552
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-pro.html
12557
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-pro.html
12553
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-musicplayer-qrc.html
12554
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-volumebutton-cpp.html
12558
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-volumebutton-cpp.html
12555
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-volumebutton-h.html
12559
%%QT_DOCDIR%%/qtwinextras/qtwinextras-musicplayer-volumebutton-h.html
12556
%%QT_DOCDIR%%/qtwinextras/qtwinextras-overview.html
12560
%%QT_DOCDIR%%/qtwinextras/qtwinextras-overview.html
(-)misc/qt5-examples/Makefile (-2 / +3 lines)
Lines 4-16 Link Here
4
PORTNAME=	examples
4
PORTNAME=	examples
5
DISTVERSION=	${QT5_VERSION}
5
DISTVERSION=	${QT5_VERSION}
6
CATEGORIES=	misc
6
CATEGORIES=	misc
7
MASTER_SITES=	QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/${QT5_SUBDIR}/single/
7
MASTER_SITES=	QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single
8
8
PKGNAMEPREFIX=	qt5-
9
PKGNAMEPREFIX=	qt5-
9
DISTNAME=	qt-everywhere-opensource-src-${QT5_VERSION}
10
DISTNAME=	qt-everywhere-opensource-src-${QT5_VERSION}
10
DIST_SUBDIR=	KDE/Qt/${QT5_VERSION}
11
DIST_SUBDIR=	KDE/Qt/${QT5_VERSION}
11
12
12
MAINTAINER=	kde@FreeBSD.org
13
MAINTAINER=	kde@FreeBSD.org
13
COMMENT=	Qt 5 examples sourcecodes
14
COMMENT=	Qt 5 examples sourcecode
14
15
15
NO_ARCH=	yes
16
NO_ARCH=	yes
16
NO_BUILD=	yes
17
NO_BUILD=	yes
(-)misc/qt5-examples/pkg-plist (-2 / +9 lines)
Lines 794-799 Link Here
794
%%QT_EXAMPLEDIR%%/location/mapviewer/resources/marker.png
794
%%QT_EXAMPLEDIR%%/location/mapviewer/resources/marker.png
795
%%QT_EXAMPLEDIR%%/location/mapviewer/resources/scale.png
795
%%QT_EXAMPLEDIR%%/location/mapviewer/resources/scale.png
796
%%QT_EXAMPLEDIR%%/location/mapviewer/resources/scale_end.png
796
%%QT_EXAMPLEDIR%%/location/mapviewer/resources/scale_end.png
797
%%QT_EXAMPLEDIR%%/location/minimal_map/doc/images/minimal_map.png
798
%%QT_EXAMPLEDIR%%/location/minimal_map/doc/src/minimal_map.qdoc
799
%%QT_EXAMPLEDIR%%/location/minimal_map/main.cpp
800
%%QT_EXAMPLEDIR%%/location/minimal_map/main.qml
801
%%QT_EXAMPLEDIR%%/location/minimal_map/minimal_map.pro
802
%%QT_EXAMPLEDIR%%/location/minimal_map/qml.qrc
797
%%QT_EXAMPLEDIR%%/location/places/doc/images/places.png
803
%%QT_EXAMPLEDIR%%/location/places/doc/images/places.png
798
%%QT_EXAMPLEDIR%%/location/places/doc/src/places.qdoc
804
%%QT_EXAMPLEDIR%%/location/places/doc/src/places.qdoc
799
%%QT_EXAMPLEDIR%%/location/places/forms/Message.qml
805
%%QT_EXAMPLEDIR%%/location/places/forms/Message.qml
Lines 2763-2769 Link Here
2763
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
2769
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
2764
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
2770
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
2765
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/script/script.js
2771
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/PhotoViewerCore/script/script.js
2766
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/deployment.pri
2767
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png
2772
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png
2768
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/doc/src/photoviewer.qdoc
2773
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/doc/src/photoviewer.qdoc
2769
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/i18n/qml_de.qm
2774
%%QT_EXAMPLEDIR%%/quick/demos/photoviewer/i18n/qml_de.qm
Lines 3180-3186 Link Here
3180
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png
3185
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png
3181
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc
3186
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc
3182
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/main.cpp
3187
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/main.cpp
3183
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/qtquickwidgets-example.png
3184
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.pro
3188
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.pro
3185
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.qrc
3189
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.qrc
3186
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/rotatingsquare.qml
3190
%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/rotatingsquare.qml
Lines 4416-4428 Link Here
4416
%%QT_EXAMPLEDIR%%/uitools/uitools.pro
4420
%%QT_EXAMPLEDIR%%/uitools/uitools.pro
4417
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient-html.pro
4421
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient-html.pro
4418
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html
4422
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html
4423
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/images/chatclient-html.png
4419
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
4424
%%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
4420
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/chatclient-qml.pro
4425
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/chatclient-qml.pro
4426
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/images/chatclient-qml.png
4421
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
4427
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
4422
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/qmlchatclient.qml
4428
%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/qmlchatclient.qml
4423
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver-cpp.pro
4429
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver-cpp.pro
4424
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver.cpp
4430
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver.cpp
4425
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver.h
4431
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/chatserver.h
4432
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/doc/images/chatserver-cpp.png
4426
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc
4433
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc
4427
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/main.cpp
4434
%%QT_EXAMPLEDIR%%/webchannel/chatserver-cpp/main.cpp
4428
%%QT_EXAMPLEDIR%%/webchannel/exampleassets.pri
4435
%%QT_EXAMPLEDIR%%/webchannel/exampleassets.pri
(-)misc/qt5-l10n/pkg-plist (+1 lines)
Lines 173-178 Link Here
173
%%QT_L10NDIR%%/qtquick1_ru.qm
173
%%QT_L10NDIR%%/qtquick1_ru.qm
174
%%QT_L10NDIR%%/qtquick1_sk.qm
174
%%QT_L10NDIR%%/qtquick1_sk.qm
175
%%QT_L10NDIR%%/qtquick1_uk.qm
175
%%QT_L10NDIR%%/qtquick1_uk.qm
176
%%QT_L10NDIR%%/qtquickcontrols2_en.qm
176
%%QT_L10NDIR%%/qtquickcontrols2_uk.qm
177
%%QT_L10NDIR%%/qtquickcontrols2_uk.qm
177
%%QT_L10NDIR%%/qtquickcontrols_de.qm
178
%%QT_L10NDIR%%/qtquickcontrols_de.qm
178
%%QT_L10NDIR%%/qtquickcontrols_en.qm
179
%%QT_L10NDIR%%/qtquickcontrols_en.qm
(-)multimedia/qt5-multimedia/files/patch-git_1df147d5 (-26 lines)
Lines 1-26 Link Here
1
From 1df147d5337622ea979eb1319c97d8278b70d864 Mon Sep 17 00:00:00 2001
2
From: Ralf Nolden <nolden@kde.org>
3
Date: Tue, 17 May 2016 12:47:59 +0200
4
Subject: [PATCH] Make qtmultimedia 5.6 branch compile without c++11:nullptr
5
 usage
6
7
5.6 should not require c++11 features, however, nullptr slipped in here.
8
Replace nullptr with Q_NULLPTR for initialization.
9
10
Change-Id: Icf62618657b5bb725bd4c8f924853fa191f6e413
11
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
12
13
URL: https://codereview.qt-project.org/#/c/159342/
14
--- src/gsttools/qgstreamerbushelper.cpp
15
+++ src/gsttools/qgstreamerbushelper.cpp
16
@@ -52,7 +52,7 @@ public:
17
         m_tag(0),
18
         m_bus(bus),
19
         m_helper(parent),
20
-        m_intervalTimer(nullptr)
21
+        m_intervalTimer(Q_NULLPTR)
22
     {
23
         // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher
24
         QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();
25
-- 
26
2.8.1
(-)net/qt5-network/files/patch-src_network_socket_qnativesocketengine__unix.cpp (-16 lines)
Lines 1-16 Link Here
1
Fix the build on FreeBSD 9, which does not have LLINDEX.
2
--- src/network/socket/qnativesocketengine_unix.cpp.orig	2016-04-13 21:57:35 UTC
3
+++ src/network/socket/qnativesocketengine_unix.cpp
4
@@ -904,8 +904,11 @@ qint64 QNativeSocketEnginePrivate::nativ
5
             if (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_RECVIF
6
                     && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(sockaddr_dl))) {
7
                 sockaddr_dl *sdl = reinterpret_cast<sockaddr_dl *>(CMSG_DATA(cmsgptr));
8
-
9
+#    if !defined(LLINDEX)
10
+                header->ifindex = sdl->sdl_index;
11
+#    else
12
                 header->ifindex = LLINDEX(sdl);
13
+#    endif
14
             }
15
 #  endif
16
 #endif
(-)net/qt5-network/pkg-plist (-1 lines)
Lines 44-50 Link Here
44
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h
44
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h
45
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h
45
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h
46
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h
46
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h
47
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplynsurlconnectionimpl_p.h
48
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h
47
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h
49
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h
48
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h
50
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h
49
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h
(-)www/webkit-qt5/Makefile (-1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	webkit
3
PORTNAME=	webkit
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	2
6
CATEGORIES=	www
5
CATEGORIES=	www
7
MASTER_SITE_SUBDIR=	community_releases/${QT5_VERSION:R}/${QT5_VERSION}/
6
MASTER_SITE_SUBDIR=	community_releases/${QT5_VERSION:R}/${QT5_VERSION}/
8
PKGNAMEPREFIX=	qt5-
7
PKGNAMEPREFIX=	qt5-
(-)www/webkit-qt5/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1465382905
1
TIMESTAMP = 1476277006
2
SHA256 (KDE/Qt/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz) = f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa
2
SHA256 (KDE/Qt/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz) = 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966
3
SIZE (KDE/Qt/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz) = 35306084
3
SIZE (KDE/Qt/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz) = 35306252
(-)x11-toolkits/qt5-gui/Makefile (+4 lines)
Lines 82-87 Link Here
82
CXXFLAGS+=	-flax-vector-conversions
82
CXXFLAGS+=	-flax-vector-conversions
83
.endif
83
.endif
84
84
85
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
86
EXTRA_PATCHES+=  ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp
87
.endif
88
85
post-build:
89
post-build:
86
.for d in ${MORE_WRKSRCS}
90
.for d in ${MORE_WRKSRCS}
87
	@cd ${WRKSRC}/${d} && \
91
	@cd ${WRKSRC}/${d} && \
(-)x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp (+20 lines)
Line 0 Link Here
1
On FreeBSD 9.3 with gcc-4.2 we need to mark the constant as an unsigned long long. 
2
Else the compiler will choke on it being too large:
3
4
c++ -c -O2 -pipe [...] itemmodels/qstandarditemmodel.cpp
5
painting/qcolor.cpp:527: error: integer constant is too large for 'long' type
6
*** [.obj/qcolor.o] Error code 1
7
1 error
8
9
10
--- src/gui/painting/qcolor.cpp.orig	2016-10-10 16:17:59 UTC
11
+++ src/gui/painting/qcolor.cpp
12
@@ -524,7 +524,7 @@ QString QColor::name(NameFormat format) 
13
         return QLatin1Char('#') + QString::number(rgba() | 0x1000000, 16).rightRef(6);
14
     case HexArgb:
15
         // it's called rgba() but it does return AARRGGBB
16
-        return QLatin1Char('#') + QString::number(rgba() | 0x100000000, 16).rightRef(8);
17
+        return QLatin1Char('#') + QString::number(rgba() | 0x100000000ULL, 16).rightRef(8);
18
     }
19
     return QString();
20
 }

Return to bug 213530