diff options
Diffstat (limited to 'user/qt5-qttools')
| -rw-r--r-- | user/qt5-qttools/APKBUILD | 6 | ||||
| -rw-r--r-- | user/qt5-qttools/kde-lts.patch | 124 |
2 files changed, 128 insertions, 2 deletions
diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD index dc271f62b..f176f351c 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 -pkgver=5.15.4 +pkgver=5.15.17 pkgrel=0 pkgdesc="Tools for Qt development" url="https://www.qt.io/" @@ -13,6 +13,7 @@ makedepends="qt5-qtbase-dev" subpackages="$pkgname-dev qt5-assistant:_assistant qt5-qdbusviewer:_dbusviewer qdbus qtpaths" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-opensource-src-$pkgver.tar.xz + kde-lts.patch assistant-qt5.desktop designer-qt5.desktop linguist-qt5.desktop @@ -116,7 +117,8 @@ _dbusviewer() { done } -sha512sums="26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e qttools-everywhere-opensource-src-5.15.4.tar.xz +sha512sums="053ff805a95516753dca0d2bfa392469c7ea763b7a99755c6e7a3c6d59afd4bc704ef9a3edfc81bd7ea8c0c37cbd11447201f075a2353774ae177cbba88ea679 qttools-everywhere-opensource-src-5.15.17.tar.xz +00f93b6e9db8d808a6d7b07b9f6a2bd8ae604847cc91520a2475ba48c28fff628201e8b50c369f8e866f139e1dc87e1a149f58d2fd4aa9cc21a42d67b48615d1 kde-lts.patch d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/user/qt5-qttools/kde-lts.patch b/user/qt5-qttools/kde-lts.patch new file mode 100644 index 000000000..8d7134af5 --- /dev/null +++ b/user/qt5-qttools/kde-lts.patch @@ -0,0 +1,124 @@ +From 0dabe2dd2492553c33eb62f94712e668c3ec2d8c Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Thu, 16 Jun 2022 09:52:54 +0200 +Subject: [PATCH 1/3] Ensure FileAttributeSetTable is filled ordered so we get + the same qch file each time + +This is part of making all of Qt reproducible + +Change-Id: I1a4120cab6844887fb4b48edb238b8f1b55f0eb9 +Reviewed-by: Kai Koehne <kai.koehne@qt.io> +Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> +(cherry picked from commit 45dc9fa0221a3aadc9925eead484f012a62a6a58) +--- + src/assistant/qhelpgenerator/helpgenerator.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp +index feab1e2d5..cbfb82507 100644 +--- a/src/assistant/qhelpgenerator/helpgenerator.cpp ++++ b/src/assistant/qhelpgenerator/helpgenerator.cpp +@@ -445,7 +445,9 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString & + if (filterSetId < 0) + return false; + ++filterSetId; +- for (int attId : qAsConst(filterAtts)) { ++ QList<int> attValues = filterAtts.values(); ++ std::sort(attValues.begin(), attValues.end()); ++ for (int attId : qAsConst(attValues)) { + m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable " + "VALUES(?, ?)")); + m_query->bindValue(0, filterSetId); +-- +2.49.0 + +From 3512c3ac72abce0c44fdfe1657a8e32a8603efe7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 18 Mar 2022 12:43:18 +0100 +Subject: [PATCH 2/3] Drop superfluous network dependency from + assistant/{help,qhelpgenerator}.pro + +Upstream's cmake equivalent commit is a9804f1a6496eccb79fb006fe4c9247eee1c4cec + +See also: +https://codereview.qt-project.org/gitweb?p=qt%2Fqttools.git;a=commit;h=a9804f1a6496eccb79fb006fe4c9247eee1c4cec + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/assistant/help/help.pro | 1 - + src/assistant/qhelpgenerator/qhelpgenerator.pro | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro +index 800c4a38d..7556f451b 100644 +--- a/src/assistant/help/help.pro ++++ b/src/assistant/help/help.pro +@@ -1,7 +1,6 @@ + TARGET = QtHelp + + QT = core-private gui widgets sql +-QT_PRIVATE = network + + DEFINES += QHELP_LIB + +diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro +index bb22000c8..415347a00 100644 +--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro ++++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro +@@ -1,4 +1,4 @@ +-QT += network help-private ++QT += help-private + + QTPLUGIN.platforms = qminimal + QTPLUGIN.sqldrivers = qsqlite +-- +2.49.0 + +From e02ce0dfa692913bd5dcc50917f7e21f5a41cd2b Mon Sep 17 00:00:00 2001 +From: Topi Reinio <topi.reinio@qt.io> +Date: Mon, 16 Jan 2023 09:31:24 +0000 +Subject: [PATCH 3/3] qdoc: Ensure the generated temporary header file is + closed properly + +Use the correct scope for the QFile object used for writing the +temporary header file; this ensures that the associated QTextStream +object is destroyed first and its contents flushed before destroying +the QFile, potentially leading to truncated writes to the file. + +Pick-to: 6.5 6.4 6.2 5.15 +Done-with: Simon Geisseler +Fixes: QTBUG-109614 +Change-Id: Ic6a68c0b52219ce607a5116c730862ee0cb37f04 +Reviewed-by: Luca Di Sera <luca.disera@qt.io> +(cherry picked from commit 0d8837c4103f941297adc3c76cb0ae6f67b6e34b) +--- + src/qdoc/clangcodeparser.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp +index 539a603da..a41b99cec 100644 +--- a/src/qdoc/clangcodeparser.cpp ++++ b/src/qdoc/clangcodeparser.cpp +@@ -1395,8 +1395,7 @@ void ClangCodeParser::buildPCH() + args_.push_back("-xc++"); + CXTranslationUnit tu; + QString tmpHeader = pchFileDir_->path() + "/" + module; +- QFile tmpHeaderFile(tmpHeader); +- if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) { ++ { QFile tmpHeaderFile(tmpHeader); if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) { + QTextStream out(&tmpHeaderFile); + if (header.isEmpty()) { + for (auto it = allHeaders_.constKeyValueBegin(); +@@ -1421,8 +1420,7 @@ void ClangCodeParser::buildPCH() + out << line << "\n"; + } + } +- tmpHeaderFile.close(); +- } ++ } } + if (printParsingErrors_ == 0) + qCWarning(lcQdoc) << "clang not printing errors; include paths were guessed"; + CXErrorCode err = +-- +2.49.0 + |