diff options
25 files changed, 221 insertions, 138 deletions
diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 8e51ff124..3f5bc413b 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtbase _pkgname=qtbase-everywhere-src -pkgver=5.12.6 -pkgrel=2 +pkgver=5.12.9 +pkgrel=0 pkgdesc="Cross-platform application and UI framework" url="https://www.qt.io/" arch="all" @@ -27,8 +27,7 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu link-to-execinfo.patch qt-musl-iconv-no-bom.patch time64.patch - CVE-2020-0569.patch - CVE-2020-0570.patch + CVE-2020-17507.patch section-header.patch " @@ -42,6 +41,10 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu # 5.12.6-r1: # - CVE-2020-0569 # - CVE-2020-0570 +# 5.12.9-r0: +# - CVE-2015-9541 +# - CVE-2020-13962 +# - CVE-2020-17507 _qt5_prefix=/usr/lib/qt5 _qt5_datadir=/usr/share/qt5 @@ -95,7 +98,7 @@ build() { -system-zlib \ -translationdir "$_qt5_datadir"/translations \ -no-reduce-relocations \ - -debug -optimize-debug -force-debug-info \ + -force-debug-info \ $ARCH_OPTS make } @@ -177,11 +180,10 @@ x11() { return 0 } -sha512sums="5fb82d903b0db95c23c55785047722dea7979e7f94ecaaf374e0c73b4787aabd768a1c79482a091b8b11f61d7bd4fb891675a6842b90cdc9caaa3b393a3187c6 qtbase-everywhere-src-5.12.6.tar.xz +sha512sums="40916f73e44dbcab2a3196063d491d5563ec3de583436dac25ecf219aea6e7eb55c46ce8b1c761980f90495b91c89bd5239bd081636054311fee6420750319b0 qtbase-everywhere-src-5.12.9.tar.xz d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c big-endian-scroll-wheel.patch ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch 436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch -ddeb0a59cf0901b38669314fd2f14dffba63c6cbd06a3d864cd329081cc2b10323ec52053a6ffe7baf5ee8a1e137331acfe5d874c03596660630dd151828da56 CVE-2020-0569.patch -b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch +9ebf15139025d76ff103a1ae77973136b2f883a38dc54febfa44f08060f41ee13016668c96a29c62dcc458125516ba8bdb899b1ab5604dc976b4f72e513bb682 CVE-2020-17507.patch 47b2973561965e3ef906f03480b3877ad0018f32d31fecb4c410abe22c68ccad7d232cfe68804b70111616e15b979fb26642225b984d8fdbfc6cf6899ad63a0d section-header.patch" diff --git a/user/qt5-qtbase/CVE-2020-0569.patch b/user/qt5-qtbase/CVE-2020-0569.patch deleted file mode 100644 index fa0efdce3..000000000 --- a/user/qt5-qtbase/CVE-2020-0569.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <ogoffart@woboq.com> -Date: Fri, 8 Nov 2019 11:30:40 +0100 -Subject: Do not load plugin from the $PWD - -I see no reason why this would make sense to look for plugins in the current -directory. And when there are plugins there, it may actually be wrong - -Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/plugin/qpluginloader.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index cadff4f32b..c2443dbdda 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName) - paths.append(fileName.left(slash)); // don't include the '/' - } else { - paths = QCoreApplication::libraryPaths(); -- paths.prepend(QStringLiteral(".")); // search in current dir first - } - - for (const QString &path : qAsConst(paths)) { --- -cgit v1.2.1 - diff --git a/user/qt5-qtbase/CVE-2020-0570.patch b/user/qt5-qtbase/CVE-2020-0570.patch deleted file mode 100644 index dcf507c0d..000000000 --- a/user/qt5-qtbase/CVE-2020-0570.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Fri, 10 Jan 2020 09:26:27 -0800 -Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD - -I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to -find libraries in a haswell/ subdir of the main path, but we only need -to do that transformation if the library is contains at least one -directory seprator. That is, if the user asks to load "lib/foo", then we -should try "lib/haswell/foo" (often, the path prefix will be absolute). - -When the library name the user requested has no directory separators, we -let dlopen() do the transformation for us. Testing on Linux confirms -glibc does so: - -$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor - 1972475: find library=libXcursor.so.1 [0]; searching - 1972475: trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1 - 1972475: trying file=/usr/lib64/haswell/libXcursor.so.1 - 1972475: trying file=/usr/lib64/libXcursor.so.1 - 1972475: calling init: /usr/lib64/libXcursor.so.1 - 1972475: calling fini: /usr/lib64/libXcursor.so.1 [0] - -Fixes: QTBUG-81272 -Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/plugin/qlibrary_unix.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp -index f0de1010d7..135b82cd37 100644 ---- a/src/corelib/plugin/qlibrary_unix.cpp -+++ b/src/corelib/plugin/qlibrary_unix.cpp -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2018 Intel Corporation -+** Copyright (C) 2020 Intel Corporation - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -218,6 +218,8 @@ bool QLibraryPrivate::load_sys() - for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) { - if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix))) - continue; -+ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/'))) -+ continue; - if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix))) - continue; - if (loadHints & QLibrary::LoadArchiveMemberHint) { --- -cgit v1.2.1 - diff --git a/user/qt5-qtbase/CVE-2020-17507.patch b/user/qt5-qtbase/CVE-2020-17507.patch new file mode 100644 index 000000000..126b55c96 --- /dev/null +++ b/user/qt5-qtbase/CVE-2020-17507.patch @@ -0,0 +1,159 @@ +From 5b2f75388424995925a0e45654a0d509b290aaa0 Mon Sep 17 00:00:00 2001 +From: Robert Loehning <robert.loehning@qt.io> +Date: Thu, 9 Jul 2020 13:33:34 +0200 +Subject: [PATCH] Fix buffer overflow + +Fixes: oss-fuzz-23988 +Change-Id: I4efdbfc3c0a96917c0c8224642896088ade99f35 +Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> +(cherry picked from commit e80be8a43da78b9544f12fbac47e92c7f1f64366) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + src/gui/image/qxpmhandler.cpp | 2 +- + tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm | 1 + + tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 8 ++++++++ + 3 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm + +diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp +index 17272ffe69b..417dab7ce3f 100644 +--- a/src/gui/image/qxpmhandler.cpp ++++ b/src/gui/image/qxpmhandler.cpp +@@ -973,7 +973,7 @@ static bool read_xpm_body( + } else { + char b[16]; + b[cpp] = '\0'; +- for (x=0; x<w && d<end; x++) { ++ for (x=0; x<w && d+cpp<end; x++) { + memcpy(b, (char *)d, cpp); + *p++ = (uchar)colorMap[xpmHash(b)]; + d += cpp; +diff --git a/tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm b/tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm +new file mode 100644 +index 00000000000..7e6c1e4ca2e +--- /dev/null ++++ b/tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm +@@ -0,0 +1 @@ ++/* XPM "20 8 1 7"" ÿÿ c ÿ" " ÿÿÿÿÿÿÿ " +\ No newline at end of file +diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +index 1eee2f273ef..0135e48c7df 100644 +--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp ++++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +@@ -167,6 +167,8 @@ private slots: + void devicePixelRatio_data(); + void devicePixelRatio(); + ++ void xpmBufferOverflow(); ++ + private: + QString prefix; + QTemporaryDir m_temporaryDir; +@@ -2002,5 +2004,11 @@ void tst_QImageReader::devicePixelRatio() + QCOMPARE(img.devicePixelRatio(), dpr); + } + ++void tst_QImageReader::xpmBufferOverflow() ++{ ++ // Please note that the overflow only showed when Qt was configured with "-sanitize address". ++ QImageReader(":/images/oss-fuzz-23988.xpm").read(); ++} ++ + QTEST_MAIN(tst_QImageReader) + #include "tst_qimagereader.moc" +-- +2.16.3 + +From 35ecd0b69d58bcc8113afc5e449aef841c73e26c Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Thu, 23 Jul 2020 11:48:48 +0200 +Subject: [PATCH] Fix buffer overflow in XBM parser + +Avoid parsing over the buffer limit, or interpreting non-hex +as hex. + +This still leaves parsing of lines longer than 300 chars +unreliable + +Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb +Reviewed-by: Robert Loehning <robert.loehning@qt.io> +Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> +(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211) +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +--- + src/gui/image/qxbmhandler.cpp | 4 ++- + .../gui/image/qimagereader/tst_qimagereader.cpp | 37 ++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 1 deletion(-) + +diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp +index 7ba44049b48..8c4be4f0eda 100644 +--- a/src/gui/image/qxbmhandler.cpp ++++ b/src/gui/image/qxbmhandler.cpp +@@ -158,7 +158,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage) + w = (w+7)/8; // byte width + + while (y < h) { // for all encoded bytes... +- if (p) { // p = "0x.." ++ if (p && p < (buf + readBytes - 3)) { // p = "0x.." ++ if (!isxdigit(p[2]) || !isxdigit(p[3])) ++ return false; + *b++ = hex2byte(p+2); + p += 2; + if (++x == w && ++y < h) { +diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +index 0135e48c7df..61b11a77794 100644 +--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp ++++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +@@ -168,6 +168,7 @@ private slots: + void devicePixelRatio(); + + void xpmBufferOverflow(); ++ void xbmBufferHandling(); + + private: + QString prefix; +@@ -2010,5 +2011,41 @@ void tst_QImageReader::xpmBufferOverflow() + QImageReader(":/images/oss-fuzz-23988.xpm").read(); + } + ++void tst_QImageReader::xbmBufferHandling() ++{ ++ uint8_t original_buffer[256]; ++ for (int i = 0; i < 256; ++i) ++ original_buffer[i] = i; ++ ++ QImage image(original_buffer, 256, 8, QImage::Format_MonoLSB); ++ image.setColorTable({0xff000000, 0xffffffff}); ++ ++ QByteArray buffer; ++ { ++ QBuffer buf(&buffer); ++ QImageWriter writer(&buf, "xbm"); ++ writer.write(image); ++ } ++ ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++ ++ auto i = buffer.indexOf(','); ++ buffer.insert(i + 1, " "); ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++ buffer.insert(i + 1, " "); ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++ buffer.insert(i + 1, " "); ++#if 0 // Lines longer than 300 chars not supported currently ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++#endif ++ ++ i = buffer.lastIndexOf("\n "); ++ buffer.truncate(i + 1); ++ buffer.append(QByteArray(297, ' ')); ++ buffer.append("0x"); ++ // Only check we get no buffer overflow ++ QImage::fromData(buffer, "xbm"); ++} ++ + QTEST_MAIN(tst_QImageReader) + #include "tst_qimagereader.moc" +-- +2.16.3 + diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index 30256ff68..828732868 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtdeclarative _pkgname=${pkgname#qt5-}-everywhere-src -pkgver=5.12.6 -pkgrel=1 +pkgver=5.12.9 +pkgrel=0 pkgdesc="Qt Declarative and Qt Quick 2" url="https://www.qt.io/" arch="all" @@ -36,7 +36,7 @@ package() { done } -sha512sums="b60537dd10bc2c91c7a40035248d898733fbf1486ae2e00f8d8de37af965dcb1ee48828f82704441370656f0821896b09acf7f06dd0a7c398a2a9497ce4f0250 qtdeclarative-everywhere-src-5.12.6.tar.xz +sha512sums="5357cdc56c0835c3c5d397839faf07ac61af4ed3067765edd32122aecd204849ce4b9a3b1eb5e631efdf832994c682851f43025796fb1bd56b32061a1c048bc8 qtdeclarative-everywhere-src-5.12.9.tar.xz 065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch d21720d9d26fa323e769f5edb97f17b189e07d98ea825aad7d4d39dabd7293e49ce6a2d79a7997f4f0c825d3ac84ac148c68261d1f24629f5f4026a5cd733076 disable-jit-pmmx.patch bb39564f2d68e5635141f3de950ff7ec8174d2c972d066049153039268154de1cad7fcb82d191e325db0a0317ed90eb869431432e32494fa52584af1536f1990 python3.patch" diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD index 57e85b5b0..6dbafa5c0 100644 --- a/user/qt5-qtgraphicaleffects/APKBUILD +++ b/user/qt5-qtgraphicaleffects/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtgraphicaleffects _pkgname=qtgraphicaleffects-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Pre-made visual effects for QML" url="https://www.qt.io/" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="54bd457e47aaff799eb92d91b7aab5692420556493ee39ff34dca496f8ab24dab84c8a638a71b74c201454db4e306b12dad4c8b300ce6c254cdc0c2d7b3a9c8a qtgraphicaleffects-everywhere-src-5.12.6.tar.xz" +sha512sums="ab20fd691dc4f3ffd2f7b167aa4189b8ee1f65167ce433ecb5e44b9d0db254c7626ae6e6bcc361ca45fb141ffa2bb575942bcdc531a2f7a433aacc30a41c068c qtgraphicaleffects-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtimageformats/APKBUILD b/user/qt5-qtimageformats/APKBUILD index 92ab99eb8..49c3feb3d 100644 --- a/user/qt5-qtimageformats/APKBUILD +++ b/user/qt5-qtimageformats/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtimageformats _pkgname=qtimageformats-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Image handling plugin for Qt" url="https://www.qt.io/" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="0f8c481f647d6047b66564247b604a741f16c2758e96245abd0ef190ba50c937b6c713c7a466b911dd8e074174a7b30e6ad1ed0cd7ed915c4cda9dc4dccd8ab9 qtimageformats-everywhere-src-5.12.6.tar.xz" +sha512sums="5f4e694aa0ebe3cdebdae6807c062c0de749ea77e78339922d5cac62ac69066df38b2977e1a3cddfae48dc9486bb89384297efda1833c8886bf4d0462f59f00a qtimageformats-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD index 204a01047..262152418 100644 --- a/user/qt5-qtmultimedia/APKBUILD +++ b/user/qt5-qtmultimedia/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtmultimedia _pkgname=qtmultimedia-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Audio, video, radio, and camera libraries for Qt 5" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="e72768c9b392dcaaefafb63b26cdf1a44b554c545c3f42bd12b0817c251cd495291e06bda97fa303c522c2f34e0483db428684f4053db52753929c57fa257470 qtmultimedia-everywhere-src-5.12.6.tar.xz" +sha512sums="add2115e3bc69027778d4cc995c692f9c4b401a7852a2080151da36c149aee99e3032cc9823471e3e2296f16dcc7942c9348bb5a8c81b56445a7958266decabb qtmultimedia-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtnetworkauth/APKBUILD b/user/qt5-qtnetworkauth/APKBUILD index 59ace6b90..eab69c25c 100644 --- a/user/qt5-qtnetworkauth/APKBUILD +++ b/user/qt5-qtnetworkauth/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtnetworkauth _pkgname=qtnetworkauth-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Network authentication module for Qt" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="d66aac84310e8afa734613f8baf3bba830ed3562336f00f143cbb13dc831f58108da95a1a5c09ec5d26efb653c98ffedc83b62a2f0ec01ff14f6fc51b7c8f6ed qtnetworkauth-everywhere-src-5.12.6.tar.xz" +sha512sums="bce116d399ad19d76dbf2d0e110fb110f8dce29c9d0d3d83f74e22287fc2ebe76351e587d8e20b96add8f0fb5140e4d52d8494b6642a89c765227d4a5ce6c59a qtnetworkauth-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index 47b957554..e5f595783 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtpositioning _pkgname=qtlocation-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Geolocation services for Qt 5" url="https://www.qt.io/" @@ -31,5 +31,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="89fa4ea878331423dba90dd3bad7340991b7b24b66b2b1947f53d3a7fe0bdc6465a5cd085d25c6fa0018be5d0931ddb5da021c0c3eb6b5f5eddd5499641b4b4b qtlocation-everywhere-src-5.12.6.tar.xz +sha512sums="060a35b27c0ea6f67f49bab18f967ac4df59a72a07b56709d367b5abd889729772c021728d31087954b9331b2f59693b9629194bd0de41cc2e7843c6bc31a10b qtlocation-everywhere-src-5.12.9.tar.xz 8590335ae90ade1c685ff99fb4319d1b7448d2ae15ba999e3dc9a29e62eda3db587d8ee366dc68fad6eb9e0872532d50f0bdc74f4689a554ca095ad24967418c no-getting-thread-names.patch" diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD index 9468c6bf8..8825bc993 100644 --- a/user/qt5-qtquickcontrols/APKBUILD +++ b/user/qt5-qtquickcontrols/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols _pkgname=qtquickcontrols-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Controls for use with Qt Quick" url="https://www.qt.io/" @@ -25,4 +25,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="901bcf7c800406f2749ebc251a7b0419fdbab4599881475aae7f74ce4eac5347837f5e667f78774ad914a1c3fbf42e144606c9592bff3f34e899870709fb4c87 qtquickcontrols-everywhere-src-5.12.6.tar.xz" +sha512sums="8fd51fc3597b01fa792c0d75663b62c0dab6572ee6e5b112c0be8b1052fd444da87a2d8de51f36db3ac285b37cf63d37ec6f1d003ffcc62a8edad234e555613b qtquickcontrols-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD index 4a0593d05..90bffad28 100644 --- a/user/qt5-qtquickcontrols2/APKBUILD +++ b/user/qt5-qtquickcontrols2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols2 _pkgname=qtquickcontrols2-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt Quick Controls 2.0" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="89cd9dc3589367d6c5687426e347d8b51cc3f74777ff2538236d8cee8fbf255d7cbf0d7f0eef584e29750d3d7cb1a34325782112bd0d1a2a70973e3c5feefd25 qtquickcontrols2-everywhere-src-5.12.6.tar.xz" +sha512sums="1a56a7f11d4a0cb119633dd0eba332604799dbc4055e96f8f72f6acf1fe866319d6cb329780d39c31870b2546c4cf56c7161d1ee7e08ad88c2f5c3a96462a080 qtquickcontrols2-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD index 1b22dbc9c..e2b6cc3bc 100644 --- a/user/qt5-qtscript/APKBUILD +++ b/user/qt5-qtscript/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtscript _pkgname=qtscript-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Deprecated scripting framework for Qt applications" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="31fdcd008c68ab1b17d0a648441e97bba2186a93c8f0e13381e655125a1b1c282682f9db24428c4bb84b28ab5da0dfd7cbea63d326855580a206d81387a2fcc8 qtscript-everywhere-src-5.12.6.tar.xz" +sha512sums="65f6e70bf9cfae5441d53a7c547e32cfa0ef459edfab92a159e8fb04d07d07639fa0b706c7cb9ac73b6aef07eb3f40164e2dbe869cb3ce36df686ba1b519205d qtscript-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD index 1a4abe625..1f8952f4b 100644 --- a/user/qt5-qtsensors/APKBUILD +++ b/user/qt5-qtsensors/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsensors _pkgname=qtsensors-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Library for interfacing with sensors using Qt" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="82921de2fac2e0dcccd7b8ce2a0f5ce83d0e6d9a92a5294a59bc3d5a498de0fd644e284ba69f1ddf61c6f467627ef37bedfa0b8b6890b509cb7755109f444a49 qtsensors-everywhere-src-5.12.6.tar.xz" +sha512sums="344e8e5cf54c59c15065491c06782a5c9322eca49f6238bb4ee19f67c9e6d731273de9c5d03c1b0c6e0b45ee60aa1d9ec3fd20d4c659a19bac7d902809164a99 qtsensors-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD index c90c7eee9..22baa41e0 100644 --- a/user/qt5-qtserialport/APKBUILD +++ b/user/qt5-qtserialport/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtserialport _pkgname=qtserialport-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Connect Qt applications to serial ports" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="5994ddfafbe21438b5c79667ff32ff19bc9c4a09c798801698584baf5709968ad3e33aec5fac3064769270d94331ae99d223349220610f577ee8b00fcf950403 qtserialport-everywhere-src-5.12.6.tar.xz" +sha512sums="9deeff64110b27e4ea304d58a5fd8caaa94359b63be23687b5bf691098559e9b5b409a24a7e046ccbab7a1680c5a222c292f3b84388f00df803bac7fe7966679 qtserialport-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtspeech/APKBUILD b/user/qt5-qtspeech/APKBUILD index e6b368602..4b7588b8d 100644 --- a/user/qt5-qtspeech/APKBUILD +++ b/user/qt5-qtspeech/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtspeech _pkgname=qtspeech-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc=" Library for speech processing and Text-to-Speech (TTS) in Qt" url="https://www.qt.io/" @@ -26,5 +26,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="f2355de53e10d6ec9dcbc6371bfde73c2a69e5b3dbf1d97c840c665c9f38efd62d70aa2912f0000813efb072d15291037e4f8eb2edbeaa7549b0e2c348bd918a qtspeech-everywhere-src-5.12.6.tar.xz +sha512sums="14fcdb9ba798c846c53066c6913d174838dbeaf790600392c242d0b44a77038fd73d30b422087ad21d94555470e9043b5972e0614878bc1ee890df1198dcb10f qtspeech-everywhere-src-5.12.9.tar.xz 7bce4bd52aa0b60fbd0ec781fc18ac518a8fe76c99e61be03170f00d27747e989b1562a45435be78d0d166ab0fdf523055620ba7c63f49e328704e1cd6aa4718 fix-linking-order.patch" diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD index ec6aaa074..4c95a8d2e 100644 --- a/user/qt5-qtsvg/APKBUILD +++ b/user/qt5-qtsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsvg _pkgname=qtsvg-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt SVG rendering library" url="https://www.qt.io/" @@ -25,4 +25,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a0200f38566ba526a9366c0b240d4e3e0ba0662209fa1225145d3c2f2f371c77ba804239f96a6d351f117413240adce17c53f16205285d6aed6978bc5435a942 qtsvg-everywhere-src-5.12.6.tar.xz" +sha512sums="30e32772d9be1f7cec7cef905686dd861bb974dc74230575f9b2cd4aa2b28da5af3083b67872573f54976c5560486c5469b3fa1acb5ef86fe439367453c368f0 qtsvg-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD index 876fecd91..ec35142d5 100644 --- a/user/qt5-qttools/APKBUILD +++ b/user/qt5-qttools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qttools _pkgname=qttools-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Tools for Qt development" url="https://www.qt.io/" @@ -96,22 +96,27 @@ dev() { _assistant() { pkgdesc="Documentation browser for Qt 5" - # workaround for weird shell bug??? + _mv_files usr/bin/assist* \ $_qt5_prefix/bin/assist* \ - usr/share/applications/*assistant* \ - usr/share/icons/hicolor/{32x32,128x128}/apps/assistant* + usr/share/applications/*assistant* + for icon_size in 32x32 128x128; do + _mv_files usr/share/icons/hicolor/${icon_size}/apps/assistant* + done } _dbusviewer() { pkgdesc="Qt 5 D-Bus debugger and viewer" + _mv_files usr/bin/qdbusviewer* \ $_qt5_prefix/bin/qdbusviewer* \ - usr/share/applications/qdbusviewer* \ - usr/share/icons/hicolor/{32x32,128x128}/apps/qdbusviewer* + usr/share/applications/qdbusviewer* + for icon_size in 32x32 128x128; do + _mv_files usr/share/icons/hicolor/${icon_size}/apps/qdbusviewer* + done } -sha512sums="fd35a9dad9f797657121ce9daf916483f81fcc9dc2cd8ee30333d3614a17376579278f993ed2b96c578c64c7cdad0003151ed350c129263d377e0f1b0a34f787 qttools-everywhere-src-5.12.6.tar.xz +sha512sums="16ade87f053405a16d124a3a11ba04df028167729c0d731905630e78adbad472df586019e1e71af2fd06588d9495e5b6cb71eee7212870f9873c8d8e727626ce qttools-everywhere-src-5.12.9.tar.xz d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/user/qt5-qtvirtualkeyboard/APKBUILD b/user/qt5-qtvirtualkeyboard/APKBUILD index 98c1a2abc..60dc9d2f6 100644 --- a/user/qt5-qtvirtualkeyboard/APKBUILD +++ b/user/qt5-qtvirtualkeyboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtvirtualkeyboard _pkgname=qtvirtualkeyboard-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="On-screen keyboard module for Qt 5" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="9ddac64a6a688333ac7250ce3be38e0909cab4c25ebc1574da30f472df557d9898674cc8b7ad408877b01e7635897c72e45f6b88002134e0e48cff378c066208 qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz" +sha512sums="3467ce16e4d1351e27f3b519a25d01939cbfb211a3e63deff1a2b0ea7497dd25cb41ee679672ebef7bba647f457fd46083036e9705637e7d8f36e09f92ec5e8a qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD index daea318a5..92e9e59db 100644 --- a/user/qt5-qtwayland/APKBUILD +++ b/user/qt5-qtwayland/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwayland _pkgname=qtwayland-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Unstable Qt platform module for experimental Wayland display system" url="https://www.qt.io/" @@ -42,4 +42,4 @@ tools() { mv "$pkgdir"/usr/lib/qt5/bin "$subpkgdir"/usr/lib/qt5/ } -sha512sums="6d066d2f65f2727b9a1c7e71b973c81f8a8d2e6210c4c998403fcbb9e4cca2543fa11160b573c0646967a3351d33504c9f44ed98b1bb282735bf17e82808a4f4 qtwayland-everywhere-src-5.12.6.tar.xz" +sha512sums="9a1b37736cc87da09123ce3b21709ea34d1171c35c27636b90c5c18e95bfa8a1ac2807c6b54e7672d967cd81cff90461f56de86aad8d5fa647434016f5fb7e12 qtwayland-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD index b1e793132..1ed8fd199 100644 --- a/user/qt5-qtwebchannel/APKBUILD +++ b/user/qt5-qtwebchannel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebchannel _pkgname=qtwebchannel-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Connect Qt applications to WebSockets" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="3f0a1732cd81506c2e5aa467e0233a909e6241943ed973ce12f6c8f1d1a8bf61b2a9bae7f5ea0655c071e6832f5a767554124ac27950597b146c36273e9e189e qtwebchannel-everywhere-src-5.12.6.tar.xz" +sha512sums="d906875bb1a164d7abfeb079b0efcdd321cf345b87e5dd1fbc3a2bc58bbfea43779cf844addb24036cf8bd2c24256aed835418038ad460e46f5b6be5b6d5e0e2 qtwebchannel-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD index 45f739573..d2962d50a 100644 --- a/user/qt5-qtwebkit/APKBUILD +++ b/user/qt5-qtwebkit/APKBUILD @@ -57,6 +57,7 @@ build() { -DENABLE_JIT=OFF \ -DENABLE_PRINT_SUPPORT=ON \ -DENABLE_QT_WEBCHANNEL=ON \ + -DENABLE_SAMPLING_PROFILER=OFF \ -DPORT=Qt \ -DUSE_SYSTEM_MALLOC=ON \ -DUSE_WOFF2=OFF \ diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD index d324d58e5..1b87062af 100644 --- a/user/qt5-qtwebsockets/APKBUILD +++ b/user/qt5-qtwebsockets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebsockets _pkgname=qtwebsockets-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt implementation of WebSockets" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="1d7de6e642869eb0863bea219183ed66c94e172d67d7c6d5d607b43368ef1f4f47f994aad5a56df35294f6dcd541474e7fec04691da17cee16df59d799b64e40 qtwebsockets-everywhere-src-5.12.6.tar.xz" +sha512sums="4ee2f150ac89845231c8dce22eef72d1b1dbfe7bd48d8f7b6cf49d7f06d07319811502cfd86a338d4ad3747b4a377225a04593981d46412921906a343b8a2d8b qtwebsockets-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD index 259faa328..b7989d0db 100644 --- a/user/qt5-qtx11extras/APKBUILD +++ b/user/qt5-qtx11extras/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtx11extras _pkgname=qtx11extras-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt 5 libraries for X11 support" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="b0ad7bf9d9fa9a30abc7bab16cb71a904e7c93d280fcb3306623b0edc56aef72d0ec9fe904571df381c76c6dd15eb8e043ce27957a370432fcf6e09c2f4e1ee5 qtx11extras-everywhere-src-5.12.6.tar.xz" +sha512sums="54f8c63b87cf91da8feb23ee4d5913dd678f5fa6a4232e776e2b9016c047960860997be9a63f04b5c9c4c753aca860b964d5e43c2b1d86c7695844ee98b19c1a qtx11extras-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD index 90b79fc96..f7ab1aa30 100644 --- a/user/qt5-qtxmlpatterns/APKBUILD +++ b/user/qt5-qtxmlpatterns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtxmlpatterns _pkgname=qtxmlpatterns-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt support library for XPath, XQuery, XSLT, and XML schema validation" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="ae59abcb01ddeeb521f0966df818c933e997a5a98b95d6254d3ea964eddcdb437ad497aa59b1b9cb70246026afd4973234bb3690d4f1cfbbc7e538cde968e5c0 qtxmlpatterns-everywhere-src-5.12.6.tar.xz" +sha512sums="8151f3aa91dd7d0d9ab1fe82696f065b3e7ae837dfcf4c021cd2975e63ccbdf9d6ca80af1b099e2b369c394db9bebfc395f2b2d77060277b04e227e15c2e2c9a qtxmlpatterns-everywhere-src-5.12.9.tar.xz" |