gentoo auto-resync : 07:06:2024 - 00:08:01

3 files changed, 4 insertions, 35 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index e8a1998bede0..a52610b02d34 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,9 +1,8 @@
 AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4
 AUX qt-creator-12.0.0-musl-no-malloc-trim.patch 343 BLAKE2B 9c4b87a0de20616dc8cf5da4523c347f963c3459efdd9a716387690775f96abe0bb60bf0e147dd01ded79a110d1222b4009b17cece71998b46d62dd8b83eeac6 SHA512 6a0807bab971a795a156f974dab2b12699a4c90a6c7380e2dd0a136ba44354791ef7a178f79e61100c3165ec7667a72d6ca7f3c43f4958ccf9e8611995ca191d
-AUX qt-creator-13.0.0-qt671.patch 1479 BLAKE2B b649ab2c9eb00bc3528a3b8177db883f7bba4b5ed9dae69e59d2199b50719c4e253c96351a3ae026506a5ed47b58db8a9d7c76576d03a18c3b30ec3e22a47035 SHA512 c774bb3dda78984b1157919fe21aeb5f05f1b34cc0d0cc017b588e03fe84c9700b267d895f47bd984a35310a3413ae8acd5adb21ac0fb3e34e986d433379d1a1
-DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786 SHA512 26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345
 DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4
-EBUILD qt-creator-13.0.0.ebuild 7531 BLAKE2B 933ea6183a7d58655fbd412a21f408e943b5e20dfa5e1be3ddebf57b6792d7c8a10c3666c569635a98bc5ec8f7e45b1d444c2afbe507f30b82509f933208b820 SHA512 37a1c0b7f227e4cb85b7819621624b85a9bd7f4d23725be256db50682c6305f23716982752c21b4a97adf0a760aa3c51bdca19dd69e4e5942b596659c7b88a7c
+DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
 EBUILD qt-creator-13.0.1.ebuild 7499 BLAKE2B 3f03a6e75042dc6f52cfe4ddba578e3c23317bb86adb3ebe88e57b38fa29dac5ac8740c62de8fce20e768e26df33bdea83f7a7a732a9c1dea95a18f4b318bb17 SHA512 4549ba4991d8c415318f3785b05080c5c2daf5502de820cc3ecaa7e8c899e87076123775d0c8111f1215d24a117fa0443f963430be8e2041d65c0d85abc8b78e
+EBUILD qt-creator-13.0.2.ebuild 7500 BLAKE2B 6f4677cff1cd7f1912a9ac4557bd4192b93855d010f3eeba5cccdab208b7eeeaa66d337b26be3bd82795812f5f4d2eb0bf1860c72f5d136be4d1c5ddcb2e25c3 SHA512 0567fe0941633f97da6e9a84c79d64e4a26ebe0282c123ff5caca0f528dfca2acf79266ee5d85d1d6e4aea4422a4640bab1f07ed86c64ef485184b89b3233b1c
 EBUILD qt-creator-9999.ebuild 7500 BLAKE2B 6f4677cff1cd7f1912a9ac4557bd4192b93855d010f3eeba5cccdab208b7eeeaa66d337b26be3bd82795812f5f4d2eb0bf1860c72f5d136be4d1c5ddcb2e25c3 SHA512 0567fe0941633f97da6e9a84c79d64e4a26ebe0282c123ff5caca0f528dfca2acf79266ee5d85d1d6e4aea4422a4640bab1f07ed86c64ef485184b89b3233b1c
 MISC metadata.xml 1241 BLAKE2B 0d68bad4f8bdf857a44107e1b22299ce2e1ac84c2b2197f33e5f3c99562e4cd1d68982a2048961bd1d469a497f4cf4942005cdfb7876a6cdc720ed19e81e7a6d SHA512 33e3e7021d07f83f2ddd39120ac695394963978c80acdd8e2f0713e7cd485ac705ba11168276bb43f3f80b9c1122dd98a5359f342c2c075c2fd8ebddb93084b6
diff --git a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
deleted file mode 100644
index 986f328fa8eb..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Building with Qt6.7.1 needs [1] and a part of [2]+[3]. [2] was intended
-to fix building with Qt6.8 but turned out part of it was needed for 6.7.1
-and this was adjusted in [3]. [2] does not apply cleanly so only taking
-the bit needed given 6.8 can wait for a proper release.
-
-[1] https://github.com/qt-creator/qt-creator/commit/041727fb2
-[2] https://github.com/qt-creator/qt-creator/commit/6babc022d
-[3] https://github.com/qt-creator/qt-creator/commit/fcf2d2064
---- a/src/libs/utils/fsengine/fsengine_impl.h
-+++ b/src/libs/utils/fsengine/fsengine_impl.h
-@@ -52,4 +52,7 @@
-     uint ownerId(FileOwner) const override;
-     QString owner(FileOwner) const override;
-+    #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1)
-+        using FileTime = QFile::FileTime;
-+    #endif
-     bool setFileTime(const QDateTime &newDate, FileTime time) override;
-     QDateTime fileTime(FileTime time) const override;
---- a/src/plugins/languageclient/languageclientutils.cpp
-+++ b/src/plugins/languageclient/languageclientutils.cpp
-@@ -236,6 +236,6 @@
-     Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument());
- 
--    ClientExtras *extras = widget->findChild<ClientExtras *>(clientExtrasName,
--                                                             Qt::FindDirectChildrenOnly);
-+    ClientExtras *extras = dynamic_cast<ClientExtras *>(
-+        widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly));
-     if (!extras) {
-         if (!client)
diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 12edbaa8754c..68c8cfe8e35c 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -25,7 +25,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="amd64"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
@@ -88,7 +88,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-	"${FILESDIR}"/${P}-qt671.patch
 )
 
 pkg_setup() {