Tue Mar 24 20:38:03 2020 UTC ()
Drop webkit check from GCC, we don't care about such ancient versions
here and it actually breaks with recent clang versions.


(joerg)
diff -r1.117 -r1.118 pkgsrc/x11/qt4-libs/distinfo
diff -r1.19 -r1.20 pkgsrc/x11/qt4-libs/patches/patch-aq
cvs diff -r1.117 -r1.118 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2019/12/01 13:28:09 1.117
+++ pkgsrc/x11/qt4-libs/distinfo 2020/03/24 20:38:03 1.118
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: distinfo,v 1.117 2019/12/01 13:28:09 adam Exp $ 1$NetBSD: distinfo,v 1.118 2020/03/24 20:38:03 joerg Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666 3SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
4RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166 4RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
5SHA512 (qt-everywhere-opensource-src-4.8.7.tar.gz) = f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 5SHA512 (qt-everywhere-opensource-src-4.8.7.tar.gz) = f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
6Size (qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567 bytes 6Size (qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567 bytes
7SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609 7SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
8SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d 8SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
9SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 9SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
10SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b 10SHA1 (patch-ad) = ca1dfb801ea16ba4b10797e4121fa05f585fd87b
11SHA1 (patch-ae) = 132e25722f2d78249e76c6d748cd671105e329de 11SHA1 (patch-ae) = 132e25722f2d78249e76c6d748cd671105e329de
12SHA1 (patch-af) = 86bab4c9090a346d44f378a00f4f434da9ded714 12SHA1 (patch-af) = 86bab4c9090a346d44f378a00f4f434da9ded714
13SHA1 (patch-ag) = 8ba8839a110375c7343c42225945138c5a378e8b 13SHA1 (patch-ag) = 8ba8839a110375c7343c42225945138c5a378e8b
14SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 14SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
15SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47 15SHA1 (patch-ai) = 5ae8d5516b577e017ea61bce8faa774da8c96f47
16SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 16SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
17SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4 17SHA1 (patch-ak) = a16e2ae20e0568f2a50eb390c4fbd480c0223ad4
18SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d 18SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d
19SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54 19SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
20SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 20SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
21SHA1 (patch-ao) = 981b506bdf5d9d21940880308318d6ac3f59742d 21SHA1 (patch-ao) = 981b506bdf5d9d21940880308318d6ac3f59742d
22SHA1 (patch-ap) = f18e8d0c70bfc31a91d1b8660513ece38646b79c 22SHA1 (patch-ap) = f18e8d0c70bfc31a91d1b8660513ece38646b79c
23SHA1 (patch-aq) = 7533741c81086cd1992d3e96a47c28d9ade27cbc 23SHA1 (patch-aq) = d22c825680592ccca51a255fcfbc78fcf9169eac
24SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 24SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
25SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 25SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b 26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
27SHA1 (patch-av) = a79dbf65e6b88ac22d48514cca01c0baa6dec880 27SHA1 (patch-av) = a79dbf65e6b88ac22d48514cca01c0baa6dec880
28SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f 28SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f
29SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94 29SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
30SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9 30SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
31SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5 31SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
32SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773 32SHA1 (patch-bc) = 5df34d2d6bb2f93e511cdfb2d9371e1646f5a773
33SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd 33SHA1 (patch-bd) = 013dd17149e4ed60072adfd226f7e6b3ea8eb5cd
34SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557 34SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557
35SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019 35SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019
36SHA1 (patch-bg) = 50d10a94b98b2e0cd8aa1a05dfc1e002c0f2ef2f 36SHA1 (patch-bg) = 50d10a94b98b2e0cd8aa1a05dfc1e002c0f2ef2f
cvs diff -r1.19 -r1.20 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2018/01/17 18:37:34 1.19
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2020/03/24 20:38:03 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aq,v 1.19 2018/01/17 18:37:34 markd Exp $ 1$NetBSD: patch-aq,v 1.20 2020/03/24 20:38:03 joerg Exp $
2 2
3--- configure.orig 2015-05-07 14:14:56.000000000 +0000 3--- configure.orig 2015-05-07 14:14:56.000000000 +0000
4+++ configure 4+++ configure
5@@ -3227,13 +3227,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
@@ -82,57 +82,69 @@ $NetBSD: patch-aq,v 1.19 2018/01/17 18:3 @@ -82,57 +82,69 @@ $NetBSD: patch-aq,v 1.19 2018/01/17 18:3
82+*macx-llvm,yes) 82+*macx-llvm,yes)
83 # Avoid overriding the default configuration setting when building with clang/libc++ 83 # Avoid overriding the default configuration setting when building with clang/libc++
84 ;; 84 ;;
85 macx*,yes) 85 macx*,yes)
86@@ -7713,7 +7726,7 @@ case "$XPLATFORM" in 86@@ -7713,7 +7726,7 @@ case "$XPLATFORM" in
87  87
88 # Check gcc's version 88 # Check gcc's version
89 case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in 89 case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
90- 4*) 90- 4*)
91+ 6*|5*|4*) 91+ 6*|5*|4*)
92 ;; 92 ;;
93 3.4*) 93 3.4*)
94 canBuildQtXmlPatterns="no" 94 canBuildQtXmlPatterns="no"
95@@ -7734,7 +7747,7 @@ case "$XPLATFORM" in 95@@ -7731,20 +7744,6 @@ case "$XPLATFORM" in
96 *-g++*) 96 canBuildWebKit="no"
97 # Check gcc's version 97 canBuildQtXmlPatterns="no"
98 case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in 98 ;;
 99- *-g++*)
 100- # Check gcc's version
 101- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
99- 5*|4*|3.4*) 102- 5*|4*|3.4*)
100+ [4-9]*|3.4*) 103- ;;
101 ;; 104- 3.3*)
102 3.3*) 105- canBuildWebKit="no"
103 canBuildWebKit="no" 106- ;;
104@@ -7981,7 +7994,7 @@ fi 107- *)
 108- canBuildWebKit="no"
 109- canBuildQtXmlPatterns="no"
 110- ;;
 111- esac
 112- ;;
 113 solaris-cc*)
 114 # Check the compiler version
 115 case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
 116@@ -7981,7 +7980,7 @@ fi
105 # env. variable. 117 # env. variable.
106 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ]; then 118 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ]; then
107 case "$PLATFORM" in 119 case "$PLATFORM" in
108- *macx-clang-libc++) 120- *macx-clang-libc++)
109+ *macx-llvm) 121+ *macx-llvm)
110 # Avoid overriding the default settings when building clang/libc++. 122 # Avoid overriding the default settings when building clang/libc++.
111 ;; 123 ;;
112 *) 124 *)
113@@ -8050,7 +8063,7 @@ g++*) 125@@ -8050,7 +8049,7 @@ g++*)
114 3.*) 126 3.*)
115 COMPILER_VERSION="3.*" 127 COMPILER_VERSION="3.*"
116 ;; 128 ;;
117- 5*|4.*) 129- 5*|4.*)
118+ 6*|5*|4.*) 130+ 6*|5*|4.*)
119 COMPILER_VERSION="4" 131 COMPILER_VERSION="4"
120 ;; 132 ;;
121 *) 133 *)
122@@ -8485,7 +8498,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 134@@ -8485,7 +8484,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
123 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" 135 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
124 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 136 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
125 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 137 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
126-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 138-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
127+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 139+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
128  140
129 if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then 141 if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
130 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" 142 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
131@@ -8701,6 +8714,7 @@ cat >>"$QTCONFIG.tmp" <<EOF 143@@ -8701,6 +8700,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
132 #configuration 144 #configuration
133 CONFIG += $QTCONFIG_CONFIG 145 CONFIG += $QTCONFIG_CONFIG
134 QT_ARCH = $CFG_ARCH 146 QT_ARCH = $CFG_ARCH
135+QT_HOST_BITSIZE = $CFG_HOST_BITSIZE 147+QT_HOST_BITSIZE = $CFG_HOST_BITSIZE
136 QT_EDITION = $Edition 148 QT_EDITION = $Edition
137 QT_CONFIG += $QT_CONFIG 149 QT_CONFIG += $QT_CONFIG
138  150