Wed Jul 8 17:49:50 2015 UTC ()
Update qt4 to 4.8.7.

I am happy to announce release of Qt 4.8.7 today bringing over 150
improvements and bug fixes. Qt 4.8.7 provides important security
updates, better support for Mac OS X 10.10 and many requested error
corrections. As a patch release, it does not add new functionality
and maintains full compatibility with previous Qt 4.8.x releases.

Highlights of Qt 4.8.7 are:

    Security fix for DoS vulnerability in the BMP image handler
    (CVE-2015-0295) as well as security fixes for vulnerabilities
    in image handling of BMP (CVE-2015-1858), ICO (CVE-2015-1859)
    and GIF (CVE-2015-1860)
    Update 3rd party libpng to version 1.6.17 to address known
    vulnerabilities in previous version
    Update 3rd party libtiff to version 4.0.3 to address known
    vulnerabilities in previous version
    Better support for running Qt 4.8 applications on Mac OS X
    10.10 Yosemite
    Many customer requested bug fixes


(wiz)
diff -r1.33 -r1.34 pkgsrc/x11/qt4/Makefile.common
diff -r1.34 -r1.35 pkgsrc/x11/qt4-docs/Makefile
diff -r1.106 -r1.107 pkgsrc/x11/qt4-libs/Makefile
diff -r1.100 -r1.101 pkgsrc/x11/qt4-libs/distinfo
diff -r1.1 -r0 pkgsrc/x11/qt4-libs/patches/patch-CVE-2014-0190
diff -r1.1 -r0 pkgsrc/x11/qt4-libs/patches/patch-src_gui_image_qbmphandler.cpp
diff -r1.1 -r0 pkgsrc/x11/qt4-libs/patches/patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm
diff -r1.1 -r0 pkgsrc/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp
diff -r1.15 -r1.16 pkgsrc/x11/qt4-libs/patches/patch-aq
diff -r1.3 -r0 pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h
diff -r1.29 -r1.30 pkgsrc/x11/qt4-mng/Makefile
diff -r1.38 -r1.39 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.46 -r1.47 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.39 -r1.40 pkgsrc/x11/qt4-qdbus/Makefile
diff -r1.37 -r1.38 pkgsrc/x11/qt4-qscintilla/Makefile
diff -r1.44 -r1.45 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.37 -r1.38 pkgsrc/x11/qt4-tiff/Makefile
diff -r1.65 -r1.66 pkgsrc/x11/qt4-tools/Makefile
diff -r1.35 -r1.36 pkgsrc/x11/qt4-tools/PLIST
cvs diff -r1.33 -r1.34 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2014/07/22 17:01:51 1.33
+++ pkgsrc/x11/qt4/Makefile.common 2015/07/08 17:49:49 1.34
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.common,v 1.33 2014/07/22 17:01:51 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.34 2015/07/08 17:49:49 wiz Exp $
2# used by x11/qt4-libs/Makefile.common 2# used by x11/qt4-libs/Makefile.common
3# used by x11/qt4-tools/Makefile 3# used by x11/qt4-tools/Makefile
4 4
5QTVERSION= 4.8.6 5QTVERSION= 4.8.7
6 6
7MAINTAINER?= pkgsrc-users@NetBSD.org 7MAINTAINER?= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://qt-project.org/ 8HOMEPAGE= http://qt-project.org/
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3
cvs diff -r1.34 -r1.35 pkgsrc/x11/qt4-docs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-docs/Makefile 2015/04/25 14:25:16 1.34
+++ pkgsrc/x11/qt4-docs/Makefile 2015/07/08 17:49:49 1.35
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.34 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.35 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGNAME= qt4-docs-${QTVERSION} 3PKGNAME= qt4-docs-${QTVERSION}
4PKGREVISION= 1 
5COMMENT= Documentation for the QT C++ X GUI toolkit 4COMMENT= Documentation for the QT C++ X GUI toolkit
6 5
7.include "../../x11/qt4-libs/Makefile.common" 6.include "../../x11/qt4-libs/Makefile.common"
8NO_CONFIGURE= yes 7NO_CONFIGURE= yes
9NO_BUILD= yes 8NO_BUILD= yes
10PLIST_SRC= ${WRKDIR}/PLIST 9PLIST_SRC= ${WRKDIR}/PLIST
11 10
12INSTALLATION_DIRS= ${QTPREFIX} 11INSTALLATION_DIRS= ${QTPREFIX}
13 12
14do-install: 13do-install:
15 cp -R ${WRKSRC}/doc ${DESTDIR}${QTPREFIX} 14 cp -R ${WRKSRC}/doc ${DESTDIR}${QTPREFIX}
16 cd ${DESTDIR}${PREFIX}; find qt4/doc -type f -print > ${WRKDIR}/PLIST 15 cd ${DESTDIR}${PREFIX}; find qt4/doc -type f -print > ${WRKDIR}/PLIST
17 16
cvs diff -r1.106 -r1.107 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2015/06/25 08:02:25 1.106
+++ pkgsrc/x11/qt4-libs/Makefile 2015/07/08 17:49:49 1.107
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.106 2015/06/25 08:02:25 joerg Exp $ 1# $NetBSD: Makefile,v 1.107 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGNAME= qt4-libs-${QTVERSION} 3PKGNAME= qt4-libs-${QTVERSION}
4PKGREVISION= 7 
5COMMENT= C++ X GUI toolkit 4COMMENT= C++ X GUI toolkit
6 5
7.include "../../x11/qt4-libs/Makefile.common" 6.include "../../x11/qt4-libs/Makefile.common"
8 7
9# XXX this is to test what really gets installed when 'do-install' is disabled 8# XXX this is to test what really gets installed when 'do-install' is disabled
10INSTALL_DIRS+= src 9INSTALL_DIRS+= src
11 10
12BUILD_TARGET= sub-src 11BUILD_TARGET= sub-src
13 12
14PTHREAD_OPTS+= require 13PTHREAD_OPTS+= require
15UNLIMIT_RESOURCES= datasize 14UNLIMIT_RESOURCES= datasize
16BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} 15BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
17 16
cvs diff -r1.100 -r1.101 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2015/06/29 21:06:14 1.100
+++ pkgsrc/x11/qt4-libs/distinfo 2015/07/08 17:49:49 1.101
@@ -1,78 +1,73 @@ @@ -1,78 +1,73 @@
1$NetBSD: distinfo,v 1.100 2015/06/29 21:06:14 markd Exp $ 1$NetBSD: distinfo,v 1.101 2015/07/08 17:49:49 wiz Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6 3SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
4RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 4RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
5Size (qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667 bytes 5Size (qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567 bytes
6SHA1 (patch-CVE-2014-0190) = 1e0b283cb0959caa3cb9b44694b3a61c77631593 
7SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609 6SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
8SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d 7SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
9SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 8SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
10SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b 9SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b
11SHA1 (patch-ae) = 132e25722f2d78249e76c6d748cd671105e329de 10SHA1 (patch-ae) = 132e25722f2d78249e76c6d748cd671105e329de
12SHA1 (patch-af) = 86bab4c9090a346d44f378a00f4f434da9ded714 11SHA1 (patch-af) = 86bab4c9090a346d44f378a00f4f434da9ded714
13SHA1 (patch-ag) = 8ba8839a110375c7343c42225945138c5a378e8b 12SHA1 (patch-ag) = 8ba8839a110375c7343c42225945138c5a378e8b
14SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
15SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47 14SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47
16SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 15SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
17SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4 16SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4
18SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d 17SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d
19SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54 18SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
20SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 19SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
21SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91 20SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
22SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
23SHA1 (patch-aq) = 44dcc5b8445776ddd5dd9ee4580ab6ed4e51bd74 22SHA1 (patch-aq) = 587adf2777f1b915c410908c08c6ba62034b89ec
24SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 23SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
25SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 24SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b 25SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
27SHA1 (patch-av) = a79dbf65e6b88ac22d48514cca01c0baa6dec880 26SHA1 (patch-av) = a79dbf65e6b88ac22d48514cca01c0baa6dec880
28SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f 27SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f
29SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94 28SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
30SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9 29SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
31SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5 30SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
32SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773 31SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773
33SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd 32SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd
34SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557 33SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557
35SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019 34SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019
36SHA1 (patch-bg) = 50d10a94b98b2e0cd8aa1a05dfc1e002c0f2ef2f 35SHA1 (patch-bg) = 50d10a94b98b2e0cd8aa1a05dfc1e002c0f2ef2f
37SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 36SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
38SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31 37SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
39SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64 38SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
40SHA1 (patch-src_3rdparty_clucene_src_CLucene_config_repl__tchar.h) = 3f19ae44da341afc4ebfe32a2eb80e38c3307648 39SHA1 (patch-src_3rdparty_clucene_src_CLucene_config_repl__tchar.h) = 3f19ae44da341afc4ebfe32a2eb80e38c3307648
41SHA1 (patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8f43ece880786f7dc9352322d922c7fff652a36f 40SHA1 (patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8f43ece880786f7dc9352322d922c7fff652a36f
42SHA1 (patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 4f03369a9e5681f5babe8f6d5f8aaf560f45a855 41SHA1 (patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 4f03369a9e5681f5babe8f6d5f8aaf560f45a855
43SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f3809acb7bd82fe7e098e2abb8 42SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f3809acb7bd82fe7e098e2abb8
44SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) = 93d5de2e9aff4dcc2e8317296801fac7e16ec613 43SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) = 93d5de2e9aff4dcc2e8317296801fac7e16ec613
45SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41 44SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41
46SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6 45SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6
47SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a 46SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a
48SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h) = 375e5ed9af891b3511a4d5fe940e4080d5ff95c2 
49SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da 47SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da
50SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d 48SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
51SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64 49SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64
52SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = bf748efe8d150fe636cbc5b20dcd9a7d4945c8c9 50SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = bf748efe8d150fe636cbc5b20dcd9a7d4945c8c9
53SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h) = 67fd733023de92878ed067df0258c3e0c5ccfa5d 51SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h) = 67fd733023de92878ed067df0258c3e0c5ccfa5d
54SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04 52SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
55SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 95eb0e9aa01aedf148bd0ad53a59a1418081e623 53SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 95eb0e9aa01aedf148bd0ad53a59a1418081e623
56SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f60a63090aadabbe2fa399a911449cd8 54SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f60a63090aadabbe2fa399a911449cd8
57SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029 55SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029
58SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e 56SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
59SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 3c1dbd49e236669fe9849918e571eed58980421b 57SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 3c1dbd49e236669fe9849918e571eed58980421b
60SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8 58SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8
61SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61 59SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61
62SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7 60SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7
63SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = fa7519ef6ac04cd13be085783f663c329e4a14be 61SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = fa7519ef6ac04cd13be085783f663c329e4a14be
64SHA1 (patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 90fd6a884f9fd058210c3011bea2ce695011d2e3 62SHA1 (patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 90fd6a884f9fd058210c3011bea2ce695011d2e3
65SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84 63SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
66SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1 64SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
67SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp) = 51b6bddf81978fd7ae6580132a74aeaec84b724f 65SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp) = 51b6bddf81978fd7ae6580132a74aeaec84b724f
68SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp) = a0a3d9d066aa6ae3c42cee198287b10e46e7f25d 66SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp) = a0a3d9d066aa6ae3c42cee198287b10e46e7f25d
69SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5 67SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
70SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a 68SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
71SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268 69SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
72SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191fa5fa4d4184b1 70SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191fa5fa4d4184b1
73SHA1 (patch-src_gui_image_qbmphandler.cpp) = efe717ee805f808dc8a1ce7c56b3872bc3d75f69 
74SHA1 (patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm) = 0caa9b006b3ffee4ab747fca9fd224c7c49211c9 
75SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566 71SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
76SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80 72SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
77SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a 73SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
78SHA1 (patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp) = eea948f07fd9e595c7813aa485e985407dfcfbf9 
File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-CVE-2014-0190
File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-src_gui_image_qbmphandler.cpp
File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-src_gui_kernel_qcocoaapplicationdelegate__mac.mm
File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp
cvs diff -r1.15 -r1.16 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2015/06/29 21:06:14 1.15
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2015/07/08 17:49:49 1.16
@@ -1,93 +1,93 @@ @@ -1,93 +1,93 @@
1$NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $ 1$NetBSD: patch-aq,v 1.16 2015/07/08 17:49:49 wiz Exp $
2 2
3--- configure.orig 2014-04-10 18:37:08.000000000 +0000 3--- configure.orig 2015-05-07 14:14:56.000000000 +0000
4+++ configure 4+++ configure
5@@ -3223,13 +3223,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then 5@@ -3227,13 +3227,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
6 CFG_HOST_ARCH=x86_64 6 CFG_HOST_ARCH=x86_64
7 fi 7 fi
8 ;; 8 ;;
9- *:*:ppc) 9- *:*:ppc)
10+ *:*:ppc|*:*:powerpc) 10+ *:*:ppc|*:*:powerpc)
11 if [ "$OPT_VERBOSE" = "yes" ]; then 11 if [ "$OPT_VERBOSE" = "yes" ]; then
12 echo " 32-bit PowerPC (powerpc)" 12 echo " 32-bit PowerPC (powerpc)"
13 fi 13 fi
14 CFG_HOST_ARCH=powerpc 14 CFG_HOST_ARCH=powerpc
15 ;; 15 ;;
16- *:*:ppc64) 16- *:*:ppc64*)
17+ *:*:ppc64|*:*:powerpc64) 17+ *:*:ppc64|*:*:powerpc64)
18 if [ "$OPT_VERBOSE" = "yes" ]; then 18 if [ "$OPT_VERBOSE" = "yes" ]; then
19 echo " 64-bit PowerPC (powerpc)" 19 echo " 64-bit PowerPC (powerpc)"
20 fi 20 fi
21@@ -3259,6 +3259,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then 21@@ -3263,6 +3263,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
22 fi 22 fi
23 CFG_HOST_ARCH=sparc 23 CFG_HOST_ARCH=sparc
24 ;; 24 ;;
25+ NetBSD:*:sparc) 25+ NetBSD:*:sparc)
26+ if [ "$OPT_VERBOSE" = "yes" ]; then 26+ if [ "$OPT_VERBOSE" = "yes" ]; then
27+ echo " NetBSD on SPARC" 27+ echo " NetBSD on SPARC"
28+ fi 28+ fi
29+ CFG_HOST_ARCH=sparc 29+ CFG_HOST_ARCH=sparc
30+ ;; 30+ ;;
31+ NetBSD:*:sparc64) 31+ NetBSD:*:sparc64)
32+ if [ "$OPT_VERBOSE" = "yes" ]; then 32+ if [ "$OPT_VERBOSE" = "yes" ]; then
33+ echo " NetBSD on SPARC64" 33+ echo " NetBSD on SPARC64"
34+ fi 34+ fi
35+ CFG_HOST_ARCH=sparc 35+ CFG_HOST_ARCH=sparc
36+ CFG_HOST_BITSIZE=64 36+ CFG_HOST_BITSIZE=64
37+ ;; 37+ ;;
38 QNX:*:*) 38 QNX:*:*)
39 case "$UNAME_MACHINE" in 39 case "$UNAME_MACHINE" in
40 x86pc) 40 x86pc)
41@@ -3567,7 +3580,7 @@ fi 41@@ -3571,7 +3584,7 @@ fi
42 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then 42 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
43 # get the darwin version. 10.0.0 and up means snow leopard. 43 # get the darwin version. 10.0.0 and up means snow leopard.
44 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` 44 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
45- if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then 45- if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then
46+ if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then 46+ if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then
47 echo 47 echo
48 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " 48 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
49 echo 49 echo
50@@ -5074,7 +5087,7 @@ if true; then ###[ '!' -f "$outpath/bin/ 50@@ -5078,7 +5091,7 @@ if true; then ###[ '!' -f "$outpath/bin/
51 done 51 done
52  52
53 QMAKE_BUILD_ERROR=no 53 QMAKE_BUILD_ERROR=no
54- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes 54- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
55+ (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes 55+ (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes
56 [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake 56 [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
57 [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h 57 [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
58 [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 58 [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
59@@ -7198,7 +7211,7 @@ fi 59@@ -7203,7 +7216,7 @@ fi
60 # select Carbon on 10.4 Tiger. 60 # select Carbon on 10.4 Tiger.
61 if [ "$PLATFORM_MAC" = "yes" ]; then 61 if [ "$PLATFORM_MAC" = "yes" ]; then
62 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` 62 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
63- if [ "$VERSION" == 8 ]; then 63- if [ "$VERSION" == 8 ]; then
64+ if [ "$VERSION" = 8 ]; then 64+ if [ "$VERSION" = 8 ]; then
65 CFG_MAC_COCOA="no"; 65 CFG_MAC_COCOA="no";
66 CFG_MAC_CARBON="yes"; 66 CFG_MAC_CARBON="yes";
67 fi 67 fi
68@@ -7729,7 +7742,7 @@ case "$XPLATFORM" in 68@@ -7713,7 +7726,7 @@ case "$XPLATFORM" in
69 *-g++*) 69
70 # Check gcc's version 70 # Check gcc's version
71 case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in 71 case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
72- 4*|3.4*) 72- 4*)
73+ 5*|4*|3.4*) 73+ 5*|4*)
74 ;; 74 ;;
75 3.3*) 75 3.4*)
76 canBuildWebKit="no" 76 canBuildQtXmlPatterns="no"
77@@ -8475,7 +8488,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 77@@ -8485,7 +8498,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
78 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" 78 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
79 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 79 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
80 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 80 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
81-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 81-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
82+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 82+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
83  83
84 if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then 84 if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
85 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" 85 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
86@@ -8691,6 +8704,7 @@ cat >>"$QTCONFIG.tmp" <<EOF 86@@ -8701,6 +8714,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
87 #configuration 87 #configuration
88 CONFIG += $QTCONFIG_CONFIG 88 CONFIG += $QTCONFIG_CONFIG
89 QT_ARCH = $CFG_ARCH 89 QT_ARCH = $CFG_ARCH
90+QT_HOST_BITSIZE = $CFG_HOST_BITSIZE 90+QT_HOST_BITSIZE = $CFG_HOST_BITSIZE
91 QT_EDITION = $Edition 91 QT_EDITION = $Edition
92 QT_CONFIG += $QT_CONFIG 92 QT_CONFIG += $QT_CONFIG
93  93
File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h
cvs diff -r1.29 -r1.30 pkgsrc/x11/qt4-mng/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mng/Makefile 2015/04/25 14:25:16 1.29
+++ pkgsrc/x11/qt4-mng/Makefile 2015/07/08 17:49:49 1.30
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.29 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.30 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGNAME= qt4-mng-${QTVERSION} 3PKGNAME= qt4-mng-${QTVERSION}
4PKGREVISION= 1 
5COMMENT= QT MNG image format plugin 4COMMENT= QT MNG image format plugin
6 5
7.include "../../x11/qt4-libs/Makefile.common" 6.include "../../x11/qt4-libs/Makefile.common"
8CONFIGURE_ARGS+= -I${QTDIR}/include 7CONFIGURE_ARGS+= -I${QTDIR}/include
9CONFIGURE_ARGS+= -L${QTDIR}/lib 8CONFIGURE_ARGS+= -L${QTDIR}/lib
10 9
11BUILD_QT4= yes 10BUILD_QT4= yes
12 11
13do-build: 12do-build:
14 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 13 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 14 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
16 cd ${WRKSRC}/src/plugins/imageformats/mng && env ${MAKE_ENV} ${GMAKE} 15 cd ${WRKSRC}/src/plugins/imageformats/mng && env ${MAKE_ENV} ${GMAKE}
17 16
cvs diff -r1.38 -r1.39 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2015/04/25 14:25:16 1.38
+++ pkgsrc/x11/qt4-mysql/Makefile 2015/07/08 17:49:49 1.39
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.38 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.39 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
5 4
6PKGNAME= qt4-mysql-${QTVERSION} 5PKGNAME= qt4-mysql-${QTVERSION}
7COMMENT= QT mysql driver 6COMMENT= QT mysql driver
8 7
9CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
10CONFIGURE_ARGS+= -L${QTDIR}/lib 9CONFIGURE_ARGS+= -L${QTDIR}/lib
11 10
12BUILD_QT4= yes 11BUILD_QT4= yes
13 12
14do-build: 13do-build:
15 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 14 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
16 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
cvs diff -r1.46 -r1.47 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2015/04/25 14:25:16 1.46
+++ pkgsrc/x11/qt4-pgsql/Makefile 2015/07/08 17:49:49 1.47
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.46 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.47 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
5 4
6PKGNAME= qt4-pgsql-${QTVERSION} 5PKGNAME= qt4-pgsql-${QTVERSION}
7COMMENT= QT postgresql driver 6COMMENT= QT postgresql driver
8 7
9CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
10CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server 9CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server
11CONFIGURE_ARGS+= -L${QTDIR}/lib 10CONFIGURE_ARGS+= -L${QTDIR}/lib
12 11
13BUILD_QT4= yes 12BUILD_QT4= yes
14 13
15do-build: 14do-build:
16 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 15 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
cvs diff -r1.39 -r1.40 pkgsrc/x11/qt4-qdbus/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/Makefile 2015/04/25 14:25:16 1.39
+++ pkgsrc/x11/qt4-qdbus/Makefile 2015/07/08 17:49:49 1.40
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.39 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.40 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
5 4
6PKGNAME= qt4-qdbus-${QTVERSION} 5PKGNAME= qt4-qdbus-${QTVERSION}
7COMMENT= QT DBus support 6COMMENT= QT DBus support
8 7
9CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 8CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
10CONFIGURE_ARGS+= -qdbus 9CONFIGURE_ARGS+= -qdbus
11 10
12USE_TOOLS+= pkg-config 11USE_TOOLS+= pkg-config
13 12
14BUILD_QT4= yes 13BUILD_QT4= yes
15 14
16post-configure: 15post-configure:
cvs diff -r1.37 -r1.38 pkgsrc/x11/qt4-qscintilla/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qscintilla/Attic/Makefile 2015/04/25 14:25:16 1.37
+++ pkgsrc/x11/qt4-qscintilla/Attic/Makefile 2015/07/08 17:49:49 1.38
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.37 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.38 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../x11/qt4-qscintilla/Makefile.common" 3.include "../../x11/qt4-qscintilla/Makefile.common"
5 4
6PKGNAME= qt4-${DISTNAME:tl:S/-gpl-/-/} 5PKGNAME= qt4-${DISTNAME:tl:S/-gpl-/-/}
7COMMENT= Scintilla C++ editor class for Qt 6COMMENT= Scintilla C++ editor class for Qt
8 7
9WRKSRC= ${WRKDIR}/${DISTNAME}/Qt4Qt5 8WRKSRC= ${WRKDIR}/${DISTNAME}/Qt4Qt5
10 9
11USE_TOOLS+= gmake 10USE_TOOLS+= gmake
12MAKE_ENV+= QTPREFIX=${QTDIR} 11MAKE_ENV+= QTPREFIX=${QTDIR}
13INSTALLATION_DIRS= ${QTDIR}/lib ${QTDIR}/include 12INSTALLATION_DIRS= ${QTDIR}/lib ${QTDIR}/include
14 13
15do-configure: 14do-configure:
16 (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro) 15 (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro)
cvs diff -r1.44 -r1.45 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2015/04/25 14:25:16 1.44
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2015/07/08 17:49:49 1.45
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.44 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.45 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGREVISION= 2 
4.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
5 4
6PKGNAME= qt4-sqlite3-${QTVERSION} 5PKGNAME= qt4-sqlite3-${QTVERSION}
7COMMENT= Qt4 sqlite3 driver 6COMMENT= Qt4 sqlite3 driver
8 7
9CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
10CONFIGURE_ARGS+= -L${QTDIR}/lib 9CONFIGURE_ARGS+= -L${QTDIR}/lib
11CONFIGURE_ARGS+= -system-sqlite 10CONFIGURE_ARGS+= -system-sqlite
12 11
13BUILD_QT4= yes 12BUILD_QT4= yes
14USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
15 14
16do-build: 15do-build:
cvs diff -r1.37 -r1.38 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2015/04/25 14:25:16 1.37
+++ pkgsrc/x11/qt4-tiff/Makefile 2015/07/08 17:49:49 1.38
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.37 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.38 2015/07/08 17:49:49 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
5 4
6PKGNAME= qt4-tiff-${QTVERSION} 5PKGNAME= qt4-tiff-${QTVERSION}
7COMMENT= QT TIFF image format plugin 6COMMENT= QT TIFF image format plugin
8 7
9CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
10CONFIGURE_ARGS+= -L${QTDIR}/lib 9CONFIGURE_ARGS+= -L${QTDIR}/lib
11 10
12BUILD_QT4= yes 11BUILD_QT4= yes
13 12
14do-build: 13do-build:
15 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 14 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
16 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
cvs diff -r1.65 -r1.66 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2015/04/25 14:25:16 1.65
+++ pkgsrc/x11/qt4-tools/Makefile 2015/07/08 17:49:50 1.66
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.65 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: Makefile,v 1.66 2015/07/08 17:49:50 wiz Exp $
2 2
3.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
4 4
5PKGNAME= qt4-tools-${QTVERSION} 5PKGNAME= qt4-tools-${QTVERSION}
6PKGREVISION= 3 
7COMMENT= QT GUI (WYSIWYG) builder and other tools 6COMMENT= QT GUI (WYSIWYG) builder and other tools
8 7
9DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 8DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 10CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
12CONFIGURE_ARGS+= -DQT_NO_DBUS 11CONFIGURE_ARGS+= -DQT_NO_DBUS
13 12
14# XXX this is to test what really gets installed when 'do-install' is disabled 13# XXX this is to test what really gets installed when 'do-install' is disabled
15INSTALL_DIRS+= tools 14INSTALL_DIRS+= tools
16 15
17BUILD_TARGET= sub-tools-bootstrap sub-tools 16BUILD_TARGET= sub-tools-bootstrap sub-tools
18 17
19BUILD_QT4= yes 18BUILD_QT4= yes
cvs diff -r1.35 -r1.36 pkgsrc/x11/qt4-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/PLIST 2014/08/19 10:31:14 1.35
+++ pkgsrc/x11/qt4-tools/PLIST 2015/07/08 17:49:50 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.35 2014/08/19 10:31:14 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.36 2015/07/08 17:49:50 wiz Exp $
2lib/pkgconfig/QtCLucene.pc 2lib/pkgconfig/QtCLucene.pc
3lib/pkgconfig/QtDesigner.pc 3lib/pkgconfig/QtDesigner.pc
4lib/pkgconfig/QtDesignerComponents.pc 4lib/pkgconfig/QtDesignerComponents.pc
5lib/pkgconfig/QtHelp.pc 5lib/pkgconfig/QtHelp.pc
6lib/pkgconfig/QtUiTools.pc 6lib/pkgconfig/QtUiTools.pc
7qt4/bin/assistant 7qt4/bin/assistant
8qt4/bin/designer 8qt4/bin/designer
9qt4/bin/lconvert 9qt4/bin/lconvert
10qt4/bin/linguist 10qt4/bin/linguist
11qt4/bin/lrelease 11qt4/bin/lrelease
12qt4/bin/lupdate 12qt4/bin/lupdate
13${PLIST.mac}qt4/bin/macdeployqt 13${PLIST.mac}qt4/bin/macdeployqt
14qt4/bin/pixeltool 14qt4/bin/pixeltool
@@ -554,34 +554,34 @@ qt4/mkspecs/tru64-g++/qmake.conf @@ -554,34 +554,34 @@ qt4/mkspecs/tru64-g++/qmake.conf
554qt4/mkspecs/tru64-g++/qplatformdefs.h 554qt4/mkspecs/tru64-g++/qplatformdefs.h
555qt4/mkspecs/unixware-cc/qmake.conf 555qt4/mkspecs/unixware-cc/qmake.conf
556qt4/mkspecs/unixware-cc/qplatformdefs.h 556qt4/mkspecs/unixware-cc/qplatformdefs.h
557qt4/mkspecs/unixware-g++/qmake.conf 557qt4/mkspecs/unixware-g++/qmake.conf
558qt4/mkspecs/unixware-g++/qplatformdefs.h 558qt4/mkspecs/unixware-g++/qplatformdefs.h
559qt4/mkspecs/unsupported/linux-armcc/qmake.conf 559qt4/mkspecs/unsupported/linux-armcc/qmake.conf
560qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h 560qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h
561qt4/mkspecs/unsupported/linux-clang/qmake.conf 561qt4/mkspecs/unsupported/linux-clang/qmake.conf
562qt4/mkspecs/unsupported/linux-clang/qplatformdefs.h 562qt4/mkspecs/unsupported/linux-clang/qplatformdefs.h
563qt4/mkspecs/unsupported/linux-host-g++/qmake.conf 563qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
564qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h 564qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
565qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf 565qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
566qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h 566qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
567qt4/mkspecs/unsupported/macx-clang/Info.plist.app 
568qt4/mkspecs/unsupported/macx-clang/Info.plist.lib 
569qt4/mkspecs/unsupported/macx-clang/qmake.conf 
570qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h 
571qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.app 567qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.app
572qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.lib 568qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.lib
573qt4/mkspecs/unsupported/macx-clang-libc++/qmake.conf 569qt4/mkspecs/unsupported/macx-clang-libc++/qmake.conf
574qt4/mkspecs/unsupported/macx-clang-libc++/qplatformdefs.h 570qt4/mkspecs/unsupported/macx-clang-libc++/qplatformdefs.h
 571qt4/mkspecs/unsupported/macx-clang/Info.plist.app
 572qt4/mkspecs/unsupported/macx-clang/Info.plist.lib
 573qt4/mkspecs/unsupported/macx-clang/qmake.conf
 574qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h
575qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf 575qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf
576qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h 576qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h
577qt4/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf 577qt4/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
578qt4/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h 578qt4/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h
579qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf 579qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf
580qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h 580qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h
581qt4/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf 581qt4/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf
582qt4/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h 582qt4/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h
583qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf 583qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf
584qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h 584qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h
585qt4/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf 585qt4/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf
586qt4/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h 586qt4/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h
587qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf 587qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf
@@ -627,26 +627,28 @@ qt4/mkspecs/win32-icc/qmake.conf @@ -627,26 +627,28 @@ qt4/mkspecs/win32-icc/qmake.conf
627qt4/mkspecs/win32-icc/qplatformdefs.h 627qt4/mkspecs/win32-icc/qplatformdefs.h
628qt4/mkspecs/win32-msvc2003/qmake.conf 628qt4/mkspecs/win32-msvc2003/qmake.conf
629qt4/mkspecs/win32-msvc2003/qplatformdefs.h 629qt4/mkspecs/win32-msvc2003/qplatformdefs.h
630qt4/mkspecs/win32-msvc2005/qmake.conf 630qt4/mkspecs/win32-msvc2005/qmake.conf
631qt4/mkspecs/win32-msvc2005/qplatformdefs.h 631qt4/mkspecs/win32-msvc2005/qplatformdefs.h
632qt4/mkspecs/win32-msvc2008/qmake.conf 632qt4/mkspecs/win32-msvc2008/qmake.conf
633qt4/mkspecs/win32-msvc2008/qplatformdefs.h 633qt4/mkspecs/win32-msvc2008/qplatformdefs.h
634qt4/mkspecs/win32-msvc2010/qmake.conf 634qt4/mkspecs/win32-msvc2010/qmake.conf
635qt4/mkspecs/win32-msvc2010/qplatformdefs.h 635qt4/mkspecs/win32-msvc2010/qplatformdefs.h
636qt4/mkspecs/win32-msvc2012/qmake.conf 636qt4/mkspecs/win32-msvc2012/qmake.conf
637qt4/mkspecs/win32-msvc2012/qplatformdefs.h 637qt4/mkspecs/win32-msvc2012/qplatformdefs.h
638qt4/mkspecs/win32-msvc2013/qmake.conf 638qt4/mkspecs/win32-msvc2013/qmake.conf
639qt4/mkspecs/win32-msvc2013/qplatformdefs.h 639qt4/mkspecs/win32-msvc2013/qplatformdefs.h
 640qt4/mkspecs/win32-msvc2015/qmake.conf
 641qt4/mkspecs/win32-msvc2015/qplatformdefs.h
640qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf 642qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
641qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf 643qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
642qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h 644qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
643qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf 645qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf
644qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf 646qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf
645qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h 647qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
646qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf 648qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf
647qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf 649qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf
648qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h 650qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
649qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf 651qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf
650qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf 652qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf
651qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h 653qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
652qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf 654qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf