subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-qt\/qt\-creator\/"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-03-21 Thread Ionen Wolkens

commit: e0b87e8e3e033b1e696df31e8743160afb4b7549
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Mar 22 02:44:51 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 22 04:54:19 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b87e8e

dev-qt/qt-creator: depend on libarchive in live

wrt multilib thing in bug #951495, seem like it was a transcient
upstream issue and it (now) links with system's and does not install
libarchive.

Closes: https://bugs.gentoo.org/951495
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index fb14d7b90fe1..a5d54e1c873c 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -49,6 +49,7 @@ QT_PV=6.5.4:6
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
+   app-arch/libarchive:=
dev-cpp/yaml-cpp:=
>=dev-qt/qt5compat-${QT_PV}
>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-03-13 Thread Ionen Wolkens

commit: 94853814248c5d0461f82d2649eafa49cc629c15
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Mar 13 13:34:45 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Mar 13 22:06:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94853814

dev-qt/qt-creator: add 16.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   2 +
 dev-qt/qt-creator/qt-creator-16.0.0.ebuild | 306 +
 2 files changed, 308 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 77e62a70703e..7ef08a39e162 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,4 @@
 DIST qt-creator-opensource-src-15.0.1-vendor.tar.xz 508860 BLAKE2B 
c5a7eef8250c6f21b482a262dee912f704573e96400291a81b61251c7cb19139748761f56bea0a832830dadbd3035729d040b92ba00eb3f1c96c0eace220387a
 SHA512 
a334182b844e98c238fbe271fea6a169de54cd7b12dd9dea3a3d165bf1c0286fafd980e0e4e842db0b65298d92214abe618f94081756beafd2bd64398aa4d788
 DIST qt-creator-opensource-src-15.0.1.tar.xz 53250336 BLAKE2B 
f59160c113122d5c10935c7d088f57d36b41245587faf996244b6edde2b200536616247f8edaf0096f5e91750045c02b66bbcb68ee232b5e02e947e891ab6292
 SHA512 
fb3d75187607c57438beb9ec65c932e3abfd15566d8d11d612b7aa087b9df44d12d18138fbd61ece61ebc29be6d14d1ded3cd1deb1d946bd7d96f2ef2060f853
+DIST qt-creator-opensource-src-16.0.0-vendor.tar.xz 510400 BLAKE2B 
87fae175ef0542f809e501b6427a08debbbaef35adf64938e39ff07d959174008bbd2f0bad562b7001cab5562207badd70e23cdbe680f635ff2a19e268f0f560
 SHA512 
f07f253b6d5ac05f7ccea1cde4e01050974b91be1754d8d50e8d1ddf02ce965b817fb75ce0a3f6766061969b7287a045892b8b1e615a1a3a0df30fec1ae35615
+DIST qt-creator-opensource-src-16.0.0.tar.xz 53476596 BLAKE2B 
14ea5d5cb531b233d3dc831b687789713356a996ccb7574ca1ef9e66a3b6ddb8d25c058658ca74b0c732df3f878a4957c38bfc5fdb14c9b77b268296df77dd04
 SHA512 
7e1b2a621cb8840f3d8efdf6511104d1a80706764903ed71fdee7788d7b286022e0c7ca06c9ac8951656b8d3b65a5d6fcb43d0695a9b363e27a0fcf5475f

diff --git a/dev-qt/qt-creator/qt-creator-16.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-16.0.0.ebuild
new file mode 100644
index ..53bc7e70cd40
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-16.0.0.ebuild
@@ -0,0 +1,306 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..20} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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
+   cmdbridge-server? ( 
https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
+   "
+   S=${WORKDIR}/${QTC_P}
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
+SLOT="0"
+IUSE="
+   +clang cmdbridge-server designer doc +help keyring plugin-dev
+   qmldesigner serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.7.3:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   $(llvm_gen_dep '
+   llvm-core/clang:${LLVM_SLOT}=
+   llvm-core/llvm:${LLVM_SLOT}=
+   ')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   >=dev-qt/qtwebsockets-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfu

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-03-06 Thread Ionen Wolkens

commit: 5beed344f78199fbb9934fd924dc28213e79c07a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Mar  6 05:28:09 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Mar  6 09:19:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5beed344

dev-qt/qt-creator: enable llvm_slot_20

15.0.1 also seems fine with it from a quick try and running tests.

Closes: https://bugs.gentoo.org/950654
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
index f1fa5cb24af9..1e96622ad6c9 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..19} )
+LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 0b150a349399..fb14d7b90fe1 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..19} )
+LLVM_COMPAT=( {15..20} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

2025-02-25 Thread Ionen Wolkens

commit: 8eccbe3102ffc99bcbdea9545cb56f13e00efc6b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Feb 25 16:46:12 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb 25 16:57:42 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eccbe31

dev-qt/qt-creator: rebase execinfo patch in live

Not really tested but should work. It seems that the 2nd execinfo.h
is unused now (included for nothing), so can just drop the other
hunks given the code is gone assuming that not overlooking anything
elsewhere.

Closes: https://bugs.gentoo.org/950276
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qt-creator-16.0.0-musl-no-execinfo.patch | 26 ++
 dev-qt/qt-creator/qt-creator-.ebuild   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch 
b/dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch
new file mode 100644
index ..289f68f4c3aa
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-16.0.0-musl-no-execinfo.patch
@@ -0,0 +1,26 @@
+execinfo is unavailable with musl (unless opt to package+use libexecinfo)
+--- a/src/libs/utils/qtcassert.cpp
 b/src/libs/utils/qtcassert.cpp
+@@ -9,5 +9,5 @@
+ #include 
+ 
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -30,5 +30,5 @@
+ if (maxdepth < 0 || maxdepth > ArraySize)
+ maxdepth = ArraySize;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ void *bt[ArraySize] = {nullptr};
+ int size = backtrace(bt, maxdepth);
+--- a/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
 b/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
+@@ -4,5 +4,5 @@
+ #include "exception.h"
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include 
+ #include 

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 731691c88d92..0b150a349399 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -100,7 +100,7 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-16.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2025-02-21 Thread Ionen Wolkens

commit: f3ff2e72d7be20008d7f9a1967f83dee69203930
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 21 16:14:26 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 21 17:34:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ff2e72

dev-qt/qt-creator: drop 15.0.0-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   2 -
 .../files/qt-creator-14.0.1-clang19.patch  |  24 --
 dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild  | 298 -
 3 files changed, 324 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index be4e63ea08b8..77e62a70703e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,2 @@
-DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 
7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0
 SHA512 
52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
-DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B 
bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05
 SHA512 
0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
 DIST qt-creator-opensource-src-15.0.1-vendor.tar.xz 508860 BLAKE2B 
c5a7eef8250c6f21b482a262dee912f704573e96400291a81b61251c7cb19139748761f56bea0a832830dadbd3035729d040b92ba00eb3f1c96c0eace220387a
 SHA512 
a334182b844e98c238fbe271fea6a169de54cd7b12dd9dea3a3d165bf1c0286fafd980e0e4e842db0b65298d92214abe618f94081756beafd2bd64398aa4d788
 DIST qt-creator-opensource-src-15.0.1.tar.xz 53250336 BLAKE2B 
f59160c113122d5c10935c7d088f57d36b41245587faf996244b6edde2b200536616247f8edaf0096f5e91750045c02b66bbcb68ee232b5e02e947e891ab6292
 SHA512 
fb3d75187607c57438beb9ec65c932e3abfd15566d8d11d612b7aa087b9df44d12d18138fbd61ece61ebc29be6d14d1ded3cd1deb1d946bd7d96f2ef2060f853

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
deleted file mode 100644
index e296f5bf68be..
--- a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/937600
-
-qt-creator has a workaround for clang (formerly) lacking an implementation
-for __cpp_template_template_args, but the workaround causes issues now that
-it is available.
-
-https://github.com/llvm/llvm-project/pull/89807
-https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1
 a/src/libs/utils/algorithm.h
-+++ b/src/libs/utils/algorithm.h
-@@ -259,5 +259,5 @@
-  typename ResultContainer = C>
- Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
--#ifdef Q_CC_CLANG
-+#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
- // "Matching of template template-arguments excludes compatible templates"
- // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html 
(P0522R0)
-@@ -810,5 +810,5 @@
- }
- 
--#ifdef Q_CC_CLANG
-+#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
- template class C, // result container type
-  typename SC,  // input container type

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
deleted file mode 100644
index 7bdeffec0681..
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..19} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
-inherit python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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
-   cmdbridge-server? ( 
https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
-   "
-   S=${WORKDIR}/${QTC_P}
-   KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-LICENSE+=" BSD MIT

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-02-21 Thread Ionen Wolkens

commit: 8b5444ee4b91d8ac3a9a481dc8c82406860aa448
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 21 16:18:58 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 21 17:35:25 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5444ee

dev-qt/qt-creator: skip building manual tests

Reduces total amount of compile units by ~160 when tests are enabled
that were ultimately unused (we run tests/auto).

...but haven't really gotten to the bottom of bug #950010 nor attempted
to reproduce, and issue may possibly occur in other (not-skipped) files
still, will see if it comes back.

Closes: https://bugs.gentoo.org/950010
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.1.ebuild | 3 +++
 dev-qt/qt-creator/qt-creator-.ebuild   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
index 13cd21f43e32..f1fa5cb24af9 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
@@ -126,6 +126,9 @@ src_prepare() {
# avoid stripping for Go, use sed to avoid rebases as may be there 
forever
sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die
 
+   # avoid building manual tests (aka not ran) for nothing (bug #950010)
+   sed -i '/add_subdirectory(manual)/d' tests/CMakeLists.txt || die
+
if use plugin-dev; then #928423
# cmake --install --component integrates poorly with the cmake
# eclass and the install targets are otherwise missing, so strip

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 248b71441708..731691c88d92 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -128,6 +128,9 @@ src_prepare() {
# avoid stripping for Go, use sed to avoid rebases as may be there 
forever
sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die
 
+   # avoid building manual tests (aka not ran) for nothing (bug #950010)
+   sed -i '/add_subdirectory(manual)/d' tests/CMakeLists.txt || die
+
if use plugin-dev; then #928423
# cmake --install --component integrates poorly with the cmake
# eclass and the install targets are otherwise missing, so strip

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-02-19 Thread Ionen Wolkens

commit: d53edb82fb568c21f9770835a23863018fc58192
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Feb 19 10:42:47 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Feb 19 11:38:51 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d53edb82

dev-qt/qt-creator: update live

Only for obvious changes and not tested much, will look more
in-depth for if anything else needs updates when 16.x releases.

Closes: https://bugs.gentoo.org/949916
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 6 +-
 dev-qt/qt-creator/qt-creator-.ebuild | 6 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 44e472f45a98..d0b42ff4836c 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,7 +14,11 @@
Build QmlDesigner and related plugins 
(Insight, StudioWelcome)
Build the serial terminal 
plugin
Build plugins for tracing requiring extra 
dependencies (AppStatisticsMonitor, CtfVisualizer, PerfProfiler, 
QmlProfiler)
-   Use dev-qt/qtwebengine with 
the help USE rather than bundled litehtml
+   
+   Allow using dev-qt/qtwebengine for
+   better USE=help display, and for Design Viewer
+   Connector support with USE=qmldesigner
+   


https://bugreports.qt.io/

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 3ed1685d4f1f..248b71441708 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -71,6 +71,8 @@ COMMON_DEPEND="
qmldesigner? (
>=dev-qt/qtquick3d-${QT_PV}=
>=dev-qt/qtsvg-${QT_PV}
+   >=dev-qt/qtwebsockets-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
)
serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
svg? ( >=dev-qt/qtsvg-${QT_PV} )
@@ -184,6 +186,10 @@ src_configure() {
# https://bugreports.qt.io/browse/QTCREATORBUG-29169
$(use help && usev !webengine 
-DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
 
+   # help shouldn't use with the above, but qmldesigner is 
automagic
+   $(use help || use qmldesigner &&
+   cmake_use_find_package webengine Qt6WebEngineWidgets)
+
-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-DENABLE_SVG_SUPPORT=$(usex svg)
$(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-02-13 Thread Jakov Smolić

commit: 28a6b6d1a18a1f9eb717e6729e8735a5421d3c1e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Feb 13 08:42:15 2025 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Feb 13 08:42:15 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a6b6d1

dev-qt/qt-creator: Stabilize 15.0.1 amd64, #949681

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
index 3ed1685d4f1f..13cd21f43e32 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
@@ -29,7 +29,7 @@ else
cmdbridge-server? ( 
https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
"
S=${WORKDIR}/${QTC_P}
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-01-23 Thread Ionen Wolkens

commit: cada0cd6e0c3b82a2a8d1ef09b3a68667c613ac2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jan 23 11:22:54 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jan 23 13:01:57 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cada0cd6

dev-qt/qt-creator: add 15.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   2 +
 dev-qt/qt-creator/qt-creator-15.0.1.ebuild | 297 +
 2 files changed, 299 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 1988501b8a29..be4e63ea08b8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,4 @@
 DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 
7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0
 SHA512 
52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
 DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B 
bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05
 SHA512 
0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
+DIST qt-creator-opensource-src-15.0.1-vendor.tar.xz 508860 BLAKE2B 
c5a7eef8250c6f21b482a262dee912f704573e96400291a81b61251c7cb19139748761f56bea0a832830dadbd3035729d040b92ba00eb3f1c96c0eace220387a
 SHA512 
a334182b844e98c238fbe271fea6a169de54cd7b12dd9dea3a3d165bf1c0286fafd980e0e4e842db0b65298d92214abe618f94081756beafd2bd64398aa4d788
+DIST qt-creator-opensource-src-15.0.1.tar.xz 53250336 BLAKE2B 
f59160c113122d5c10935c7d088f57d36b41245587faf996244b6edde2b200536616247f8edaf0096f5e91750045c02b66bbcb68ee232b5e02e947e891ab6292
 SHA512 
fb3d75187607c57438beb9ec65c932e3abfd15566d8d11d612b7aa087b9df44d12d18138fbd61ece61ebc29be6d14d1ded3cd1deb1d946bd7d96f2ef2060f853

diff --git a/dev-qt/qt-creator/qt-creator-15.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
new file mode 100644
index ..3ed1685d4f1f
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-15.0.1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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
+   cmdbridge-server? ( 
https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
+   "
+   S=${WORKDIR}/${QTC_P}
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
+SLOT="0"
+IUSE="
+   +clang cmdbridge-server designer doc +help keyring plugin-dev
+   qmldesigner serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   $(llvm_gen_dep '
+   llvm-core/clang:${LLVM_SLOT}=
+   llvm-core/llvm:${LLVM_SLOT}=
+   ')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtcharts-${QT_PV}
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/

2025-01-09 Thread Conrad Kostecki

commit: 75f2e1d5210faeda3ca218c64ad2e0c2b14069f5
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jan  7 19:15:38 2025 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Jan  9 15:12:29 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f2e1d5

dev-qt/qt-creator: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/qt-creator-11.0.2-musl-no-execinfo.patch |  47 ---
 .../qt-creator/files/qt-creator-14.0.2-qt681.patch | 141 -
 2 files changed, 188 deletions(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
deleted file mode 100644
index b36cfef2d4e7..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-execinfo is unavailable with musl (unless opted to package+use libexecinfo)
 a/src/libs/utils/qtcassert.cpp
-+++ b/src/libs/utils/qtcassert.cpp
-@@ -9,5 +9,5 @@
- #include 
- 
--#if defined(Q_OS_UNIX)
-+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
- #include 
- #include 
-@@ -30,5 +30,5 @@
- if (maxdepth < 0 || maxdepth > ArraySize)
- maxdepth = ArraySize;
--#if defined(Q_OS_UNIX)
-+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
- void *bt[ArraySize] = {nullptr};
- int size = backtrace(bt, maxdepth);
 a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
-+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
-@@ -4,5 +4,5 @@
- #include "exception.h"
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- #include 
- #include 
-@@ -31,5 +31,5 @@
- namespace QmlDesigner {
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- const char* demangle(const char* name)
- {
-@@ -76,5 +76,5 @@
- }
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- static QString getBackTrace()
- {
-@@ -114,5 +114,5 @@
-   , m_file(QString::fromUtf8(file))
-   , m_description(description)
--  #ifdef Q_OS_LINUX
-+  #if defined(Q_OS_LINUX) && defined(__GLIBC__)
-   , m_backTrace(getBackTrace())
-   #endif

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
deleted file mode 100644
index 0dbe75feb7c4..
--- a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Backport of [1]+[2] to fix tests with Qt6.8.0 and build with Qt6.8.1.
-
-There was some refactoring in these files which prevent anything from
-applying cleanly, so this was manually rebased -- hopefully correct
-(fsengine tests pass again, so it should be fine).
-
-[1] https://github.com/qt-creator/qt-creator/commit/81d4e8a3742
-[2] https://github.com/qt-creator/qt-creator/commit/f993fb76ded
 a/src/libs/utils/fsengine/diriterator.h
-+++ b/src/libs/utils/fsengine/diriterator.h
-@@ -16,4 +16,36 @@
- namespace Internal {
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-+inline std::pair 
convertQDirListingIteratorFlags(
-+QDirListing::IteratorFlags flags)
-+{
-+QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::System | 
QDir::NoDotAndDotDot;
-+QDirIterator::IteratorFlags iteratorFlags = QDirIterator::NoIteratorFlags;
-+
-+if (flags & QDirListing::IteratorFlag::ExcludeFiles)
-+filters.setFlag(QDir::Files, false);
-+if (flags & QDirListing::IteratorFlag::ExcludeDirs)
-+filters.setFlag(QDir::Dirs, false);
-+if (flags & QDirListing::IteratorFlag::ExcludeSpecial)
-+filters.setFlag(QDir::System, false);
-+if (flags & QDirListing::IteratorFlag::CaseSensitive)
-+filters.setFlag(QDir::CaseSensitive, true);
-+if (flags & QDirListing::IteratorFlag::IncludeHidden)
-+filters.setFlag(QDir::Hidden, true);
-+
-+if (flags & QDirListing::IteratorFlag::IncludeDotAndDotDot) {
-+filters.setFlag(QDir::NoDot, false);
-+filters.setFlag(QDir::NoDotDot, false);
-+}
-+
-+if (flags & QDirListing::IteratorFlag::Recursive)
-+iteratorFlags.setFlag(QDirIterator::Subdirectories, true);
-+if (flags & QDirListing::IteratorFlag::FollowDirSymlinks)
-+iteratorFlags.setFlag(QDirIterator::FollowSymlinks, true);
-+
-+return {filters, iteratorFlags};
-+}
-+#endif
-+
- class DirIterator : public QAbstractFileEngineIterator
- {
 a/src/libs/utils/fsengine/fixedlistfsengine.h
-+++ b/src/libs/utils/fsengine/fixedlistfsengine.h
-@@ -67,8 +67,14 @@
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
--IteratorUniquePtr beginEntryList(const QString &path,
-- QDir::Filters filters,
-- const QStringList &filterNames) override
-+QAbstractFileEngine::IteratorUniquePtr beginEntryList(
-+const QString &path,
-+QDirListing::IteratorFlags itFlags,
-+const QStri

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-01-06 Thread Ionen Wolkens

commit: d290e5241608227bd1e84faa5c6d219ad6234440
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  6 07:18:05 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  6 12:00:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d290e524

dev-qt/qt-creator: fix GOFLAGS usage

This was copied from kitty's ebuild where this was set in
src_compile, so local was fine. Not worth a revbump, the
go-built part is very unimportant and is disabled by default.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 1e47f995104b..7bdeffec0681 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
@@ -141,7 +141,7 @@ src_configure() {
 
if use cmdbridge-server; then
go-env_set_compile_environment
-   local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
+   export GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
fi
 
# -Werror=lto-type-mismatch issues, needs looking into

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 2b586e25fae8..3ed1685d4f1f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -140,7 +140,7 @@ src_configure() {
 
if use cmdbridge-server; then
go-env_set_compile_environment
-   local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
+   export GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
fi
 
# -Werror=lto-type-mismatch issues, needs looking into

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-01-05 Thread Ionen Wolkens

commit: 49aa52b895f5b06380adf7888e53f0fc63aaa049
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  6 04:13:27 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  6 07:04:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49aa52b8

dev-qt/qt-creator: drop 14.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/qt-creator-14.0.2.ebuild | 273 -
 2 files changed, 274 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index ad47418727a4..1988501b8a29 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,2 @@
-DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 
491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f
 SHA512 
45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2
 DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 
7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0
 SHA512 
52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
 DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B 
bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05
 SHA512 
0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279

diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
deleted file mode 100644
index a51b3ea8a921..
--- a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang designer doc +help keyring plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.5.4:6
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   dev-cpp/yaml-cpp:=
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   $(llvm_gen_dep '
-   llvm-core/clang:${LLVM_SLOT}=
-   llvm-core/llvm:${LLVM_SLOT}=
-   ')
-   )
-   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   keyring? (
-   app-crypt/libsecret
-   dev-libs/glib:2
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtcharts-${QT_PV}
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2025-01-05 Thread Ionen Wolkens

commit: 658ed12de0599835536f9d4524d5dea76d57d4b9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  6 04:15:12 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  6 07:04:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658ed12d

dev-qt/qt-creator: migrate to llvm-r2.eclass

Given pkg_setup is not exported with LLVM_OPTIONAL, may as
well use llvm_chost_setup directly in src_configure rather
than define pkg_setup (which will be python's).

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild | 11 ---
 dev-qt/qt-creator/qt-creator-.ebuild  | 11 ---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 80029092f457..1e47f995104b 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
 inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} ==  ]]; then
@@ -105,11 +105,6 @@ PATCHES=(
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
 
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use clang && llvm-r1_pkg_setup
-}
-
 src_unpack() {
if [[ ${PV} ==  ]]; then
git-r3_src_unpack
@@ -142,6 +137,8 @@ src_prepare() {
 }
 
 src_configure() {
+   use clang && llvm_chost_setup
+
if use cmdbridge-server; then
go-env_set_compile_environment
local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index a68584bdc223..2b586e25fae8 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
 inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} ==  ]]; then
@@ -104,11 +104,6 @@ PATCHES=(
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
 
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use clang && llvm-r1_pkg_setup
-}
-
 src_unpack() {
if [[ ${PV} ==  ]]; then
git-r3_src_unpack
@@ -141,6 +136,8 @@ src_prepare() {
 }
 
 src_configure() {
+   use clang && llvm_chost_setup
+
if use cmdbridge-server; then
go-env_set_compile_environment
local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-12-28 Thread Arthur Zamarin

commit: a0006b5116d2002827dfe76a8e7746663580cfbf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 28 08:52:41 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 28 08:52:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0006b51

dev-qt/qt-creator: Stabilize 15.0.0-r1 amd64, #947051

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 8a2930a2a568..80029092f457 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
@@ -29,7 +29,7 @@ else
cmdbridge-server? ( 
https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
"
S=${WORKDIR}/${QTC_P}
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-12-18 Thread Ionen Wolkens

commit: c76512cc3dae9748718bd115d9cbe0862a4e90b9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Dec 19 04:33:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Dec 19 04:35:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c76512cc

dev-qt/qt-creator: drop obsolete patch in live

Haven't retried clang19, but upstream has done a similar
fix and so it should be fine.

Closes: https://bugs.gentoo.org/946636
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 8a2930a2a568..a68584bdc223 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -100,7 +100,6 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-   "${FILESDIR}"/${PN}-14.0.1-clang19.patch
 )
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-12-05 Thread Ionen Wolkens

commit: e2228fd077016d6219fa1b79830a518376563742
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  6 05:44:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  6 07:54:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2228fd0

dev-qt/qt-creator: make Go optional w/ USE=cmdbridge-server

Off by default given most people won't need this, arguably could've
skipped it entirely to make maintenance easier.

Does require to fool it into thinking Go was not found given there
isn't a proper option to disable it that I can see.

Closes: https://bugs.gentoo.org/945925
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/metadata.xml |  1 +
 ...r-15.0.0.ebuild => qt-creator-15.0.0-r1.ebuild} | 23 --
 dev-qt/qt-creator/qt-creator-.ebuild   | 23 --
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 5e0d4e8578c0..44e472f45a98 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -7,6 +7,7 @@


Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
+   Build the cmdbridge server using 
dev-lang/go
Enable designer for QtWidgets-based 
UIs
Enable the integrated 
dev-qt/qt-docs viewer (also needed for examples)
Install the 'Devel' component needed to 
build external Qt Creator plugins

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
similarity index 93%
rename from dev-qt/qt-creator/qt-creator-15.0.0.ebuild
rename to dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 496c50707950..af16e6ac46b3 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
@@ -26,7 +26,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
-   https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
+   cmdbridge-server? ( 
https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
"
S=${WORKDIR}/${QTC_P}
KEYWORDS="~amd64"
@@ -39,8 +39,8 @@ LICENSE="GPL-3"
 LICENSE+=" BSD MIT" # go
 SLOT="0"
 IUSE="
-   +clang designer doc +help keyring plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
+   +clang cmdbridge-server designer doc +help keyring plugin-dev
+   qmldesigner serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -92,8 +92,8 @@ DEPEND="${COMMON_DEPEND}"
 # worth a massive rebuild every time for the minor go usage
 BDEPEND="
${PYTHON_DEPS}
-   >=dev-lang/go-1.21.7
>=dev-qt/qttools-${QT_PV}[linguist]
+   cmdbridge-server? ( >=dev-lang/go-1.21.7 )
doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
 
@@ -113,8 +113,10 @@ pkg_setup() {
 src_unpack() {
if [[ ${PV} ==  ]]; then
git-r3_src_unpack
-   cd -- "${S}"/src/libs/gocmdbridge/server || die
-   edo go mod vendor
+   if use cmdbridge-server; then
+   cd -- "${S}"/src/libs/gocmdbridge/server || die
+   edo go mod vendor
+   fi
else
default
fi
@@ -140,8 +142,10 @@ src_prepare() {
 }
 
 src_configure() {
-   go-env_set_compile_environment
-   local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
+   if use cmdbridge-server; then
+   go-env_set_compile_environment
+   local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
+   fi
 
# -Werror=lto-type-mismatch issues, needs looking into
filter-lto
@@ -185,9 +189,8 @@ src_configure() {
$(use help && usev !webengine 
-DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
 
-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-DENABLE_SVG_SUPPORT=$(usex svg)
-
+   $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925
-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
# meant to be in sync with qtbase[journald], but think(?) not 
worth

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 496c50707950..af16e6ac46b3 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -26,7 +26,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/_/-}/${Q

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-12-05 Thread Ionen Wolkens

commit: 0edd9d52c0101d6c3a3383db49ca63909aad82ac
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  6 05:38:21 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  6 05:43:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edd9d52

dev-qt/qt-creator: re-add clang19 patch

Still needed, was lost when copied the 15-based live ebuild
which did not have the patch.

So, keep it in live too for now.

Bug: https://bugs.gentoo.org/937600
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-15.0.0.ebuild | 1 +
 dev-qt/qt-creator/qt-creator-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
index 02b286a21404..496c50707950 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
@@ -100,6 +100,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+   "${FILESDIR}"/${PN}-14.0.1-clang19.patch
 )
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 02b286a21404..496c50707950 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -100,6 +100,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+   "${FILESDIR}"/${PN}-14.0.1-clang19.patch
 )
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-12-04 Thread Ionen Wolkens

commit: 8dbfbac2d3f691bce0ffc2bd0618a55508990fd4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec  4 11:46:19 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec  4 12:18:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbfbac2

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index e4e0e8391798..02b286a21404 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -26,7 +26,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
-   https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+   https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
"
S=${WORKDIR}/${QTC_P}
KEYWORDS="~amd64"
@@ -112,7 +112,7 @@ pkg_setup() {
 src_unpack() {
if [[ ${PV} ==  ]]; then
git-r3_src_unpack
-   cd "${S}/src/libs/gocmdbridge/server" || die
+   cd -- "${S}"/src/libs/gocmdbridge/server || die
edo go mod vendor
else
default
@@ -126,6 +126,9 @@ src_prepare() {
sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-i cmake/QtCreatorAPIInternal.cmake || die
 
+   # avoid stripping for Go, use sed to avoid rebases as may be there 
forever
+   sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die
+
if use plugin-dev; then #928423
# cmake --install --component integrates poorly with the cmake
# eclass and the install targets are otherwise missing, so strip

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-12-04 Thread Ionen Wolkens

commit: 85ef71d8286d91eb9941c0b6dedfbe57d5fdd748
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec  4 10:06:54 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec  4 12:18:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ef71d8

dev-qt/qt-creator: add 15.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   2 +
 dev-qt/qt-creator/qt-creator-15.0.0.ebuild | 297 +
 2 files changed, 299 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 20893f37849d..ad47418727a4 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,3 @@
 DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 
491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f
 SHA512 
45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2
+DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 
7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0
 SHA512 
52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
+DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B 
bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05
 SHA512 
0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
new file mode 100644
index ..02b286a21404
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
@@ -0,0 +1,297 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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
+   https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
+   "
+   S=${WORKDIR}/${QTC_P}
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtcharts-${QT_PV}
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+# intentionally skipping := on go (unlike go-module.eclass) given not
+# worth a massive rebuild every time for the minor

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

2024-11-13 Thread Ionen Wolkens

commit: 14100fce76cdbb0b029750a6c04f63d93736dca6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 13 02:10:07 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 13 10:03:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14100fce

dev-qt/qt-creator: fix tests with Qt6.8.0 and build with 6.8.1

Possible this may be for nothing if a new qt-creator releases
before Qt6.8.1 (and 6.8.0 is still masked), but wanted to get
potential blockers for 6.8.1 out of the way now esp. given this
is not currently fixed in the 14.x branch upstream and would need
qt-creator-15.x

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../qt-creator/files/qt-creator-14.0.2-qt681.patch | 141 +
 dev-qt/qt-creator/qt-creator-14.0.2.ebuild |   1 +
 2 files changed, 142 insertions(+)

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
new file mode 100644
index ..0dbe75feb7c4
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
@@ -0,0 +1,141 @@
+Backport of [1]+[2] to fix tests with Qt6.8.0 and build with Qt6.8.1.
+
+There was some refactoring in these files which prevent anything from
+applying cleanly, so this was manually rebased -- hopefully correct
+(fsengine tests pass again, so it should be fine).
+
+[1] https://github.com/qt-creator/qt-creator/commit/81d4e8a3742
+[2] https://github.com/qt-creator/qt-creator/commit/f993fb76ded
+--- a/src/libs/utils/fsengine/diriterator.h
 b/src/libs/utils/fsengine/diriterator.h
+@@ -16,4 +16,36 @@
+ namespace Internal {
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
++inline std::pair 
convertQDirListingIteratorFlags(
++QDirListing::IteratorFlags flags)
++{
++QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::System | 
QDir::NoDotAndDotDot;
++QDirIterator::IteratorFlags iteratorFlags = QDirIterator::NoIteratorFlags;
++
++if (flags & QDirListing::IteratorFlag::ExcludeFiles)
++filters.setFlag(QDir::Files, false);
++if (flags & QDirListing::IteratorFlag::ExcludeDirs)
++filters.setFlag(QDir::Dirs, false);
++if (flags & QDirListing::IteratorFlag::ExcludeSpecial)
++filters.setFlag(QDir::System, false);
++if (flags & QDirListing::IteratorFlag::CaseSensitive)
++filters.setFlag(QDir::CaseSensitive, true);
++if (flags & QDirListing::IteratorFlag::IncludeHidden)
++filters.setFlag(QDir::Hidden, true);
++
++if (flags & QDirListing::IteratorFlag::IncludeDotAndDotDot) {
++filters.setFlag(QDir::NoDot, false);
++filters.setFlag(QDir::NoDotDot, false);
++}
++
++if (flags & QDirListing::IteratorFlag::Recursive)
++iteratorFlags.setFlag(QDirIterator::Subdirectories, true);
++if (flags & QDirListing::IteratorFlag::FollowDirSymlinks)
++iteratorFlags.setFlag(QDirIterator::FollowSymlinks, true);
++
++return {filters, iteratorFlags};
++}
++#endif
++
+ class DirIterator : public QAbstractFileEngineIterator
+ {
+--- a/src/libs/utils/fsengine/fixedlistfsengine.h
 b/src/libs/utils/fsengine/fixedlistfsengine.h
+@@ -67,8 +67,14 @@
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-IteratorUniquePtr beginEntryList(const QString &path,
+- QDir::Filters filters,
+- const QStringList &filterNames) override
++QAbstractFileEngine::IteratorUniquePtr beginEntryList(
++const QString &path,
++QDirListing::IteratorFlags itFlags,
++const QStringList &filterNames) override
+ {
++// We do not support recursive or following symlinks for the Fixed 
List engine.
++Q_ASSERT(itFlags.testFlag(QDirListing::IteratorFlag::Recursive) == 
false);
++
++const auto [filters, _] = convertQDirListingIteratorFlags(itFlags);
++
+ return std::make_unique(m_children, path, filters, 
filterNames);
+ }
+--- a/src/libs/utils/fsengine/fsengine_impl.cpp
 b/src/libs/utils/fsengine/fsengine_impl.cpp
+@@ -297,11 +297,25 @@
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+-QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(const 
QString &path,
+-
QDir::Filters filters,
+-const 
QStringList &filterNames)
++QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(
++const QString &path, QDirListing::IteratorFlags itFlags, const 
QStringList &filterNames)
++{
++const auto [filters, iteratorFlags] = 
convertQDirListingIteratorFlags(itFlags);
++
++FilePaths paths{m_filePath.pathAppended(".")};
++m_filePath.iterateDirectory(
++[&paths](const FilePath &p, const FilePathInfo &fi) {
++paths.append(p);
++FilePathInfoCache::CachedData *data
++= new FilePathInfoCache::CachedData{fi, 
QD

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2024-11-04 Thread Ionen Wolkens

commit: 1f01d84a8483050c1ea47ec5fe5f1997cc744173
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov  4 15:22:24 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov  4 16:13:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f01d84a

dev-qt/qt-creator: drop 14.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator-14.0.1-sol2-clang19-gcc15.patch |  18 --
 dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 270 -
 3 files changed, 289 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8799c32d4cd0..20893f37849d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B 
a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176
 SHA512 
5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a
 DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 
491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f
 SHA512 
45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
deleted file mode 100644
index 29e600ca33ef..
--- a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/938486
-https://bugs.gentoo.org/937600
-https://bugs.gentoo.org/936924
-https://bugreports.qt.io/browse/QTCREATORBUG-31517
-https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f
-https://codereview.qt-project.org/c/qt-creator/qt-creator/+/587620
 a/src/libs/3rdparty/sol2/include/sol/sol.hpp
-+++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp
-@@ -6818,7 +6818,8 @@
-   static_assert(std::is_constructible::value, "T must be constructible with Args");
- 
-   *this = nullopt;
--  this->construct(std::forward(args)...);
-+  new (static_cast(this)) optional(std::in_place, 
std::forward(args)...);
-+  return **this;
-   }
- 
-   /// Swaps this optional with the other.

diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
deleted file mode 100644
index 57312a5304e4..
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang designer doc +help keyring plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.5.4:6
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   dev-cpp/yaml-cpp:=
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   $(llvm_gen_dep '
-   sys-devel/clang:${LLVM_SLOT}=
-   sys-devel/llvm:${LLVM_SLOT}=
-   ')
-   )
-   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   keyring? (
-   app-crypt/libsecret
-   dev-libs/glib:2
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-10-29 Thread Ionen Wolkens

commit: a664cd4047bb734dbe550829a3e3757212b580f7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 29 14:55:18 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 29 17:06:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a664cd40

dev-qt/qt-creator: enable llvm slot 19 in live

Closes: https://bugs.gentoo.org/942452
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 843c80b7e3c5..e4e0e8391798 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..18} )
+LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-10-22 Thread Jakov Smolić

commit: 07d31b99d5b6e8bcccd1e9e9a9e0e0dab5e844a2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Oct 22 08:04:34 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Oct 22 08:04:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d31b99

dev-qt/qt-creator: Stabilize 14.0.2 amd64, #941959

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-qt/qt-creator/qt-creator-14.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
index 0326b526636b..5c8f2609c396 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
@@ -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"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-10-01 Thread Ionen Wolkens

commit: 4fd74ebf403ddfe5982fedba3c124da07a5370e8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Oct  2 01:07:10 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Oct  2 04:34:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd74ebf

dev-qt/qt-creator: add 14.0.2

Also guard qtcharts automagic behind USE=tracing (which feels "mostly"
fitting rather than introduce one more USE over this on a big package),
existed in earlier versions but had been missed.

Tried LLVM_SLOT=19 but fails to build with it, so keeping compat
as-is for now. qttools[clang] failed on the same thing I recall and
imagine Qt has not been testing 19 yet.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/metadata.xml |   2 +-
 dev-qt/qt-creator/qt-creator-14.0.2.ebuild | 272 +
 3 files changed, 274 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 4bf80b646983..8799c32d4cd0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B 
a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176
 SHA512 
5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a
+DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 
491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f
 SHA512 
45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 581b84c86cb1..5e0d4e8578c0 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -12,7 +12,7 @@
Install the 'Devel' component needed to 
build external Qt Creator plugins
Build QmlDesigner and related plugins 
(Insight, StudioWelcome)
Build the serial terminal 
plugin
-   Build plugins requiring tracing 
capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)
+   Build plugins for tracing requiring extra 
dependencies (AppStatisticsMonitor, CtfVisualizer, PerfProfiler, 
QmlProfiler)
Use dev-qt/qtwebengine with 
the help USE rather than bundled litehtml



diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
new file mode 100644
index ..0326b526636b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-10-01 Thread Ionen Wolkens

commit: dff5d8dbf4bf97cbb56f0a08efa0d95ad2213061
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Oct  2 03:58:19 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Oct  2 04:34:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff5d8db

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 99cda33d0135..843c80b7e3c5 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -77,6 +77,7 @@ COMMON_DEPEND="
tracing? (
app-arch/zstd:=
dev-libs/elfutils
+   >=dev-qt/qtcharts-${QT_PV}
>=dev-qt/qtshadertools-${QT_PV}
)
 "
@@ -162,6 +163,7 @@ src_configure() {
# to plugins with additional build-time dependencies.
-DBUILD_LIBRARY_TRACING=$(usex tracing) # 
qml+perfprofiler,ctfvisual
-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+   -DBUILD_PLUGIN_APPSTATISTICSMONITOR=$(usex tracing)
 
-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
@@ -267,6 +269,7 @@ Qt Quick:
 - QmlProfiler (USE=tracing)
 
 Utilities:
+- AppStatisticsMonitor (USE=tracing)
 - Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
 - Conan (dev-util/conan)
 - Docker (app-containers/docker)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

2024-09-27 Thread Ionen Wolkens

commit: 371f7190a77ebcf80fe60993d8b3f2308e9c5e24
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 27 11:03:57 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 27 12:09:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371f7190

dev-qt/qt-creator: rebase execinfo patch in live

Untested but the patch is identical beside needing to update
a moved file's path.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qt-creator-15.0.0-musl-no-execinfo.patch | 47 ++
 dev-qt/qt-creator/qt-creator-.ebuild   |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-15.0.0-musl-no-execinfo.patch 
b/dev-qt/qt-creator/files/qt-creator-15.0.0-musl-no-execinfo.patch
new file mode 100644
index ..5e3bbf25b6c3
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-15.0.0-musl-no-execinfo.patch
@@ -0,0 +1,47 @@
+execinfo is unavailable with musl (unless opt to package+use libexecinfo)
+--- a/src/libs/utils/qtcassert.cpp
 b/src/libs/utils/qtcassert.cpp
+@@ -9,5 +9,5 @@
+ #include 
+ 
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -30,5 +30,5 @@
+ if (maxdepth < 0 || maxdepth > ArraySize)
+ maxdepth = ArraySize;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ void *bt[ArraySize] = {nullptr};
+ int size = backtrace(bt, maxdepth);
+--- a/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
 b/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
+@@ -4,5 +4,5 @@
+ #include "exception.h"
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -31,5 +31,5 @@
+ namespace QmlDesigner {
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ const char* demangle(const char* name)
+ {
+@@ -76,5 +76,5 @@
+ }
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ static QString getBackTrace()
+ {
+@@ -114,5 +114,5 @@
+   , m_file(QString::fromUtf8(file))
+   , m_description(description)
+-  #ifdef Q_OS_LINUX
++  #if defined(Q_OS_LINUX) && defined(__GLIBC__)
+   , m_backTrace(getBackTrace())
+   #endif

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 23836162a90d..99cda33d0135 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -97,7 +97,7 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

2024-09-04 Thread Ionen Wolkens

commit: 4864940397a0b5808598d468d63605eb2e0217b1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep  4 07:57:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep  4 10:20:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48649403

dev-qt/qt-creator: partially fix build with clang19 and gcc15

other.resetter bit with USE=qmldesigner wrt bug #937600 comment #4
still need attention, but adding what we have so far esp. given
qmldesigner is off by default and has limited impact.

Bug: https://bugs.gentoo.org/937600
Closes: https://bugs.gentoo.org/938486
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qt-creator-14.0.1-clang19.patch  | 24 ++
 .../qt-creator-14.0.1-sol2-clang19-gcc15.patch | 18 
 dev-qt/qt-creator/qt-creator-14.0.1.ebuild |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
new file mode 100644
index ..e296f5bf68be
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/937600
+
+qt-creator has a workaround for clang (formerly) lacking an implementation
+for __cpp_template_template_args, but the workaround causes issues now that
+it is available.
+
+https://github.com/llvm/llvm-project/pull/89807
+https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1
+--- a/src/libs/utils/algorithm.h
 b/src/libs/utils/algorithm.h
+@@ -259,5 +259,5 @@
+  typename ResultContainer = C>
+ Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
+-#ifdef Q_CC_CLANG
++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
+ // "Matching of template template-arguments excludes compatible templates"
+ // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html 
(P0522R0)
+@@ -810,5 +810,5 @@
+ }
+ 
+-#ifdef Q_CC_CLANG
++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
+ template class C, // result container type
+  typename SC,  // input container type

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
new file mode 100644
index ..29e600ca33ef
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/938486
+https://bugs.gentoo.org/937600
+https://bugs.gentoo.org/936924
+https://bugreports.qt.io/browse/QTCREATORBUG-31517
+https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f
+https://codereview.qt-project.org/c/qt-creator/qt-creator/+/587620
+--- a/src/libs/3rdparty/sol2/include/sol/sol.hpp
 b/src/libs/3rdparty/sol2/include/sol/sol.hpp
+@@ -6818,7 +6818,8 @@
+   static_assert(std::is_constructible::value, "T must be constructible with Args");
+ 
+   *this = nullopt;
+-  this->construct(std::forward(args)...);
++  new (static_cast(this)) optional(std::in_place, 
std::forward(args)...);
++  return **this;
+   }
+ 
+   /// Swaps this optional with the other.

diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
index 78c4cd5ea7ef..57312a5304e4 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -91,6 +91,8 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+   "${FILESDIR}"/${PN}-14.0.1-clang19.patch
+   "${FILESDIR}"/${PN}-14.0.1-sol2-clang19-gcc15.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-09-03 Thread Ionen Wolkens

commit: 428554cb9beb3e721cc78c89dcdc238dd3292d74
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep  3 11:12:40 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep  3 11:51:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428554cb

dev-qt/qt-creator: drop 13.0.2, 14.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   2 -
 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 268 -
 dev-qt/qt-creator/qt-creator-14.0.0.ebuild | 268 -
 3 files changed, 538 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 328e0964f1e4..4bf80b646983 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1 @@
-DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 
88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a
 SHA512 
0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
-DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 
8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db
 SHA512 
75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc
 DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B 
a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176
 SHA512 
5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
deleted file mode 100644
index ee0fcd198e6e..
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang designer doc +help keyring plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   dev-cpp/yaml-cpp:=
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
-   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   keyring? (
-   app-crypt/libsecret
-   dev-libs/glib:2
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-08-24 Thread Arthur Zamarin

commit: f17f5fa1535279dcd4b85db74928d7e496619666
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 25 05:26:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 25 05:26:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17f5fa1

dev-qt/qt-creator: Stabilize 14.0.1 amd64, #938480

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
index a04b85dcdd48..78c4cd5ea7ef 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -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"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-08-07 Thread Ionen Wolkens

commit: 94a28fb5091f9f3f83f4fce7b0d4b0c4dc5e3859
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Aug  7 13:23:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Aug  7 14:32:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a28fb5

dev-qt/qt-creator: add 14.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 268 +
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index bd4b1c18ddcb..328e0964f1e4 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 
88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a
 SHA512 
0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
 DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 
8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db
 SHA512 
75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc
+DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B 
a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176
 SHA512 
5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a

diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
new file mode 100644
index ..a04b85dcdd48
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-07-25 Thread Ionen Wolkens

commit: 46f9f704db710efc421d736c7ba92f06407f8ddd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 14:01:16 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 15:58:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f9f704

dev-qt/qt-creator: add 14.0.0

Few ebuild changes, but for some notes:
* Meant to use system's lua+sol2 (newly bundled), but it does not seem
  to have a switch to use system's easily and not going to bother on
  such a big package if not.
* The bits requiring Go have not landed in 14 and remain -only.
* Dropped the comment about Qt's version given cmake files may
  optionally require yet a newer one for specific features.
* There is a new switch for building docs, so can simplify a bit.
* Thought to try unbundling syntax-highlighting but after finding
  out it uses the old slot opted to keep it like that for now.

May possibly have overlooked something given there is a lot of
noise in cmake files, please report a bug if anything is off.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-14.0.0.ebuild | 268 +
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 883f9e3f8647..bd4b1c18ddcb 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 
88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a
 SHA512 
0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
+DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 
8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db
 SHA512 
75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc

diff --git a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
new file mode 100644
index ..a04b85dcdd48
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtq

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-07-25 Thread Ionen Wolkens

commit: 19cba80e727f3f11398627961455cf0a64226dea
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 14:04:18 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 15:58:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19cba80e

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index fdf00d0e0369..23836162a90d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -45,7 +45,7 @@ IUSE="
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+QT_PV=6.5.4:6
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
@@ -53,7 +53,12 @@ COMMON_DEPEND="
>=dev-qt/qt5compat-${QT_PV}
>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
>=dev-qt/qtdeclarative-${QT_PV}=
-   clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
+   clang? (
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+   )
designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
help? (
>=dev-qt/qttools-${QT_PV}[assistant]
@@ -141,12 +146,13 @@ src_configure() {
use elibc_musl && append-lfs-flags
 
local mycmakeargs=(
+   -DBUILD_DEVELOPER_DOCS=$(usex doc)
+   -DBUILD_DOCS_BY_DEFAULT=$(usex doc)
-DBUILD_WITH_PCH=no
-DWITH_DOCS=$(usex doc)
-   -DBUILD_DEVELOPER_DOCS=$(usex doc)
-DWITH_TESTS=$(usex test)
 
-   # TODO: try unbundling now that slot 6 exists+unmasked (bug 
#934462)
+   # sticking to bundled for now until it switches to KF6's
-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
# Much can be optional, but do not want to flood users (or 
maintainers)
@@ -206,12 +212,6 @@ src_test() {
cmake_src_test --label-exclude exclude_from_precheck
 }
 
-src_compile() {
-   cmake_src_compile
-
-   use doc && cmake_build {qch,html}_docs
-}
-
 src_install() {
cmake_src_install

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-07-24 Thread Ionen Wolkens

commit: 45c9a720a5218d6de858897bdbe49db9b329cf9b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 06:23:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 06:23:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c9a720

dev-qt/qt-creator: drop 13.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 268 -
 2 files changed, 269 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index e8edf350bcd8..883f9e3f8647 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B 
ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a
 SHA512 
8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 
88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a
 SHA512 
0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
deleted file mode 100644
index 25ae3358d8dc..
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang designer doc +help keyring plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-   )
-   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   keyring? (
-   app-crypt/libsecret
-   dev-libs/glib:2
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # needed for finding docs at runtime in PF
-   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-   -i cmake/QtCreatorAPIInternal.cmake || die
-
-   if use plugin-dev; then #928423
-   # cmake --install --component integrates poorly with the cmake
-   # ecla

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-07-24 Thread Ionen Wolkens

commit: ce5f985df005e2e2cb922e593dbb13984f4bdee5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 06:26:11 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 06:26:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5f985d

dev-qt/qt-creator: update journald comment

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 4 +++-
 dev-qt/qt-creator/qt-creator-.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 972b24abebe5..ee0fcd198e6e 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -155,7 +155,9 @@ src_configure() {
 
-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
-   -Djournald=no # not really useful unless match qtbase (needs 
systemd)
+   # meant to be in sync with qtbase[journald], but think(?) not 
worth
+   # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 
nowadays
+   -Djournald=no
 
# not packaged, but allow using if found
#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 69822c51bc74..fdf00d0e0369 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -178,7 +178,9 @@ src_configure() {
 
-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
-   -Djournald=no # not really useful unless match qtbase (needs 
systemd)
+   # meant to be in sync with qtbase[journald], but think(?) not 
worth
+   # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 
nowadays
+   -Djournald=no
 
# not packaged, but allow using if found
#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-07-03 Thread Ionen Wolkens

commit: 669248c86189e9ace3a735a13970ee7bd57a1d5e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul  4 01:46:44 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul  4 01:53:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669248c8

dev-qt/qt-creator: unconditionally depend on yaml-cpp

Missed that a plugin (qtapplicationmanager) added a dependency on
yaml-cpp while comparing comparing qt-creator-12 -> 13 and is no
longer clang-only.

Feel it's not worth a USE for the plugin on such a big package
(not for minimalism), so depending unconditionally unless someone
really wants to avoid it (at best it could be interesting to avoid
:= rebuilds).

Technically needs a revbump, but qt-creator takes a while to build
and most users already were pulling it through IUSE=+clang.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 6 ++
 dev-qt/qt-creator/qt-creator-.ebuild   | 6 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 25ae3358d8dc..972b24abebe5 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -44,13 +44,11 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
>=dev-qt/qt5compat-${QT_PV}
>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
>=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-   )
+   clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
help? (
>=dev-qt/qttools-${QT_PV}[assistant]

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 7e70e0a5b37d..69822c51bc74 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -49,13 +49,11 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
+   dev-cpp/yaml-cpp:=
>=dev-qt/qt5compat-${QT_PV}
>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
>=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-   )
+   clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
help? (
>=dev-qt/qttools-${QT_PV}[assistant]

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-07-02 Thread Ionen Wolkens

commit: 9c9376b47aea93a273fa2eaeed61950133372e80
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jul  2 14:08:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul  2 15:10:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c9376b4

dev-qt/qt-creator: update live

Not tested much, but did build successfully once w/ Go bits.

May or may not consider making this optional when there is a release
after a closer look. Does not have a proper option, but it already
skips it if it does not find Go... so -DGO_BIN=no or so would likely
work.

Being off by default would also be less annoying for go rebuilds,
I doubt anyone wants to rebuild something massive like qt-creator
every go bump. Not that I really checked what this is used for yet.

For now not going to touch this too much given it may get changed
around upstream.

Closes: https://bugs.gentoo.org/935332
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 27 +--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index f7ae725146b9..7e70e0a5b37d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} ==  ]]; then
inherit git-r3
@@ -23,7 +24,10 @@ else
QTC_PV=${PV/_/-}
QTC_P=${PN}-opensource-src-${QTC_PV}
[[ ${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"
+   SRC_URI="
+   https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 
1-2)/${PV/_/-}/${QTC_P}.tar.xz
+   https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+   "
S=${WORKDIR}/${QTC_P}
KEYWORDS="~amd64"
 fi
@@ -32,6 +36,7 @@ DESCRIPTION="Lightweight IDE for C++/QML development 
centering around Qt"
 HOMEPAGE="https://www.qt.io/product/development-tools";
 
 LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
 SLOT="0"
 IUSE="
+clang designer doc +help keyring plugin-dev qmldesigner
@@ -79,8 +84,11 @@ RDEPEND="
qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 "
 DEPEND="${COMMON_DEPEND}"
+# intentionally skipping := on go (unlike go-module.eclass) given not
+# worth a massive rebuild every time for the minor go usage
 BDEPEND="
${PYTHON_DEPS}
+   >=dev-lang/go-1.21.7
>=dev-qt/qttools-${QT_PV}[linguist]
doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
@@ -90,11 +98,23 @@ PATCHES=(
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
+QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
+
 pkg_setup() {
python-any-r1_pkg_setup
use clang && llvm-r1_pkg_setup
 }
 
+src_unpack() {
+   if [[ ${PV} ==  ]]; then
+   git-r3_src_unpack
+   cd "${S}/src/libs/gocmdbridge/server" || die
+   edo go mod vendor
+   else
+   default
+   fi
+}
+
 src_prepare() {
cmake_src_prepare
 
@@ -112,6 +132,9 @@ src_prepare() {
 }
 
 src_configure() {
+   go-env_set_compile_environment
+   local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"
+
# -Werror=lto-type-mismatch issues, needs looking into
filter-lto

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-06-19 Thread Arthur Zamarin

commit: 1c813a9a9b5c29a7a12c0fa082a072867ad32811
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 19 19:43:28 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 19 19:43:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c813a9a

dev-qt/qt-creator: Stabilize 13.0.2 amd64, #934559

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index f7ae725146b9..25ae3358d8dc 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -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"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-06-18 Thread Ionen Wolkens

commit: e8e24128704e3f80016f4e7686be8aedfe31a8fa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 18 17:00:00 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 18 18:13:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e24128

dev-qt/qt-creator: update syntax-highlighting comment

Bug: https://bugs.gentoo.org/934462
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
index 036aa1705257..25ae3358d8dc 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -125,7 +125,7 @@ src_configure() {
-DBUILD_DEVELOPER_DOCS=$(usex doc)
-DWITH_TESTS=$(usex test)
 
-   # TODO?: try to unbundle with =no when syntax-highlighting:6 
exists
+   # TODO: try unbundling now that slot 6 exists+unmasked (bug 
#934462)
-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
# Much can be optional, but do not want to flood users (or 
maintainers)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 68c8cfe8e35c..f7ae725146b9 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -125,7 +125,7 @@ src_configure() {
-DBUILD_DEVELOPER_DOCS=$(usex doc)
-DWITH_TESTS=$(usex test)
 
-   # TODO?: try to unbundle with =no when syntax-highlighting:6 
exists
+   # TODO: try unbundling now that slot 6 exists+unmasked (bug 
#934462)
-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
# Much can be optional, but do not want to flood users (or 
maintainers)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 68c8cfe8e35c..f7ae725146b9 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -125,7 +125,7 @@ src_configure() {
-DBUILD_DEVELOPER_DOCS=$(usex doc)
-DWITH_TESTS=$(usex test)
 
-   # TODO?: try to unbundle with =no when syntax-highlighting:6 
exists
+   # TODO: try unbundling now that slot 6 exists+unmasked (bug 
#934462)
-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
# Much can be optional, but do not want to flood users (or 
maintainers)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-06-06 Thread Ionen Wolkens

commit: 1491ae916ff1ece5cee3cf22f7f2d02ca2b041f3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun  6 14:57:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun  6 15:47:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1491ae91

dev-qt/qt-creator: add 13.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 268 +
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d93d9286c577..e8edf350bcd8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B 
ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a
 SHA512 
8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4
+DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 
88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a
 SHA512 
0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
new file mode 100644
index ..68c8cfe8e35c
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+
+   if use plugin-dev; then #928423
+   # cmake --install --component integrates poorly with the cmake
+   # eclass

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2024-06-06 Thread Ionen Wolkens

commit: 96318f6a311cde6753dfb2ed05b4260b75a7a95d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun  6 12:47:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun  6 13:18:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96318f6a

dev-qt/qt-creator: drop 13.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator/files/qt-creator-13.0.0-qt671.patch |  29 ---
 dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 269 -
 3 files changed, 299 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 93d4e63c470d..d93d9286c577 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-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

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..
--- 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(clientExtrasName,
-- 
Qt::FindDirectChildrenOnly);
-+ClientExtras *extras = dynamic_cast(
-+widget->findChild(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.0.ebuild
deleted file mode 100644
index 12edbaa8754c..
--- a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang designer doc +help keyring plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-05-13 Thread Arthur Zamarin

commit: 27b698c805310261b6d1cd817bfc3882fb2a5f8c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 13 13:23:40 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 13 13:23:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b698c8

dev-qt/qt-creator: Stabilize 13.0.1 amd64, #931834

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
index 68c8cfe8e35c..036aa1705257 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -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"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-05-12 Thread Ionen Wolkens

commit: 4d79f466200544c70a092712a919290421661642
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 13 01:37:20 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 13 05:48:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d79f466

dev-qt/qt-creator: enable py3.13

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
index b47f014ce15a..68c8cfe8e35c 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.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} ==  ]]; then

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b47f014ce15a..68c8cfe8e35c 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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} ==  ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-05-07 Thread Ionen Wolkens

commit: 9a9504bed795ce7974eaa71bf26930b728b70358
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 12:24:38 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 14:23:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9504be

dev-qt/qt-creator: add 13.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 268 +
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3aadf1f0def7..93d4e63c470d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 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

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
new file mode 100644
index ..b47f014ce15a
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+
+   if use plugin-dev; then #928423
+   # cmake --install --component integrates poorly with the cmake
+   # eclass

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-05-05 Thread Ionen Wolkens

commit: c4abce9c16710fc81cbbe511b47edff1cd96922c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May  5 23:51:44 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May  5 23:51:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4abce9c

dev-qt/qt-creator: drop 12.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 260 -
 2 files changed, 261 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index bc5430b952e8..3aadf1f0def7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B 
a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459
 SHA512 
cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1
 DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 
63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786
 SHA512 
26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
deleted file mode 100644
index 84a477ae119f..
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang +designer doc +help plugin-dev qmldesigner
-   serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-   )
-   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # needed for finding docs at runtime in PF
-   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-   -i cmake/QtCreatorAPIInternal.cmake || die
-
-   if use plugin-dev; then #928423
-   # cmake --install --component integrates poorly with the cmake
-   # eclass and the install targets are otherwise missing, so strip
-   # out EXCLUDE_FROM_ALL until figure out a better solutio

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-04-04 Thread Ionen Wolkens

commit: 97e8651af60e5e3aae064ac23d42e8254e468d8e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Apr  4 16:36:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Apr  4 16:37:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e8651a

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index f28f40dcec29..b47f014ce15a 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.qt.io/product/development-tools";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-   +clang designer doc +help plugin-dev qmldesigner
+   +clang designer doc +help keyring plugin-dev qmldesigner
serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
@@ -45,7 +45,7 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
>=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
>=dev-qt/qtdeclarative-${QT_PV}=
clang? (
dev-cpp/yaml-cpp:=
@@ -56,6 +56,10 @@ COMMON_DEPEND="
>=dev-qt/qttools-${QT_PV}[assistant]
webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
)
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
qmldesigner? (
>=dev-qt/qtquick3d-${QT_PV}=
>=dev-qt/qtsvg-${QT_PV}
@@ -78,7 +82,7 @@ DEPEND="${COMMON_DEPEND}"
 BDEPEND="
${PYTHON_DEPS}
>=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
 
 PATCHES=(
@@ -158,6 +162,10 @@ src_configure() {
# not packaged, but allow using if found
#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+   # for bundled qtkeychain (no switch to unbundle right now)
+   # reminder: if ever unbundled/optional, qtbase[dbus] can be 
removed
+   -DLIBSECRET_SUPPORT=$(usex keyring)
)
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-04-04 Thread Ionen Wolkens

commit: 2c530eace88c9c582ec5e2fd57d42319693675ee
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Apr  4 13:43:09 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Apr  4 16:37:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c530eac

dev-qt/qt-creator: add 13.0.0

Does not seem to need real updates beside handling qtkeychain? But
may or may not have missed something given there is a lot of noise
in build system files changes.

Unfortunately upstream has not provided a switch (that I can see)
to allow using system qtkeychain[qt6] which would've been more
convenient than handling libsecret+dbus used by it.

For now opted to make dbus hard-required to simplify, doubtful
qt-creator users are minimalists in general.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 268 +
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 38f84e5fffbd..bc5430b952e8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B 
a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459
 SHA512 
cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1
+DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 
63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786
 SHA512 
26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345

diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
new file mode 100644
index ..b47f014ce15a
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang designer doc +help keyring plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+   )
+   designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   keyring? (
+   app-crypt/libsecret
+   dev-libs/glib:2
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, app-misc/brewtarget/, dev-util/qbs/

2024-04-03 Thread Michał Górny

commit: 86d95b5f3d568d1b8c01c97e75200e0113d08788
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Apr  3 09:59:24 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Apr  3 10:04:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d95b5f

*/*: Reassign pesa's packages

Signed-off-by: Michał Górny  gentoo.org>

 app-misc/brewtarget/metadata.xml | 5 +
 dev-qt/qt-creator/metadata.xml   | 4 
 dev-util/qbs/metadata.xml| 4 
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app-misc/brewtarget/metadata.xml b/app-misc/brewtarget/metadata.xml
index 10a2471e7a4b..37c8b5260562 100644
--- a/app-misc/brewtarget/metadata.xml
+++ b/app-misc/brewtarget/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   p...@gentoo.org
-   Davide Pesavento
-   
+   

Brewtarget/brewtarget


diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 89e60ab1d919..581b84c86cb1 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   p...@gentoo.org
-   Davide Pesavento
-   

q...@gentoo.org
Gentoo Qt Project

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 5ff340bae19d..7899bcd24454 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   p...@gentoo.org
-   Davide Pesavento
-   

q...@gentoo.org
Gentoo Qt Project

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-04-02 Thread Ionen Wolkens

commit: ed529e6ecf83a74ca626dcdff04a133b6675c188
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr  2 15:34:53 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr  2 15:50:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed529e6e

dev-qt/qt-creator: install Devel component with IUSE=plugin-dev

Tried to compile Qt Creator's HelloWorld plugin externally and it built
fine with the USE enabled.

Debated installing unconditionally, but it installs quite a lot of
extras. Unsure about the IUSE name choice but it should hopefully do
(did feel IUSE=devel would be a bit too generic sounding).

Went for a bit hacky solution (for now) given --component integrates
poorly with cmake.eclass and does not seem(?) other ebuilds have needed
to do this yet in ::gentoo for ideas.

Closes: https://bugs.gentoo.org/928423
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/metadata.xml |  3 ++-
 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 12 ++--
 dev-qt/qt-creator/qt-creator-.ebuild   | 12 ++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index fcd44daa8386..89e60ab1d919 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -13,8 +13,9 @@
Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Enable designer for QtWidgets-based 
UIs
Enable the integrated 
dev-qt/qt-docs viewer (also needed for examples)
-   Build the serial terminal 
plugin
+   Install the 'Devel' component needed to 
build external Qt Creator plugins
Build QmlDesigner and related plugins 
(Insight, StudioWelcome)
+   Build the serial terminal 
plugin
Build plugins requiring tracing 
capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)
Use dev-qt/qtwebengine with 
the help USE rather than bundled litehtml


diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
index 9e674d8b1aa3..84a477ae119f 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -34,8 +34,8 @@ HOMEPAGE="https://www.qt.io/product/development-tools";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-   +clang +designer doc +help qmldesigner serialterminal
-   +svg test +tracing webengine
+   +clang +designer doc +help plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -97,6 +97,14 @@ src_prepare() {
# needed for finding docs at runtime in PF
sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-i cmake/QtCreatorAPIInternal.cmake || die
+
+   if use plugin-dev; then #928423
+   # cmake --install --component integrates poorly with the cmake
+   # eclass and the install targets are otherwise missing, so strip
+   # out EXCLUDE_FROM_ALL until figure out a better solution
+   find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed 
-i -zE \
+   
's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+   fi
 }
 
 src_configure() {

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 017a06e30b56..f28f40dcec29 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -34,8 +34,8 @@ HOMEPAGE="https://www.qt.io/product/development-tools";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-   +clang designer doc +help qmldesigner serialterminal
-   +svg test +tracing webengine
+   +clang designer doc +help plugin-dev qmldesigner
+   serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -97,6 +97,14 @@ src_prepare() {
# needed for finding docs at runtime in PF
sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-i cmake/QtCreatorAPIInternal.cmake || die
+
+   if use plugin-dev; then #928423
+   # cmake --install --component integrates poorly with the cmake
+   # eclass and the install targets are otherwise missing, so strip
+   # out EXCLUDE_FROM_ALL until figure out a better solution
+   find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed 
-i -zE \
+   
's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+   fi
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-03-20 Thread Ionen Wolkens

commit: 1f6b6d2f079fdf5a0144f36ffa6bdcb51791e41a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar 20 05:27:47 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar 20 07:01:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6b6d2f

dev-qt/qt-creator: drop 12.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/qt-creator-12.0.1.ebuild | 254 -
 2 files changed, 255 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index dd4e4099f113..38f84e5fffbd 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 
2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd
 SHA512 
03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7
 DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B 
a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459
 SHA512 
cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
deleted file mode 100644
index 362b77f6691a..
--- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang +designer doc +help qmldesigner serialterminal
-   +svg test +tracing webengine
-"
-RESTRICT="!test? ( test )"
-
-LLVM_MAX_SLOT=17
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   =dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-llvm_check_deps() {
-   has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # needed for finding docs at runtime in PF
-   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-   -i cmake/QtCreatorAPIInternal.cmake || die
-}
-
-src_configure() {
-   # -Werror=lto-type-mismatch issues, needs looking into
-   filter-lto
-
-   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
-   # needs fixing in qtbase as *64 usage comes from its headers' macros
-   use elibc_musl && append-lfs-flags
-
-   local mycmakeargs=(
-   -DBUILD_WITH_PC

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-02-28 Thread Arthur Zamarin

commit: 53c1be4154c394755aba052baa7ec7a25f98d6b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb 28 19:56:07 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb 28 19:56:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c1be41

dev-qt/qt-creator: Stabilize 12.0.2 amd64, #925703

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
index f295798776cf..9e674d8b1aa3 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -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"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-02-25 Thread Ionen Wolkens

commit: 8b7a805c7915b9042a8a729966bc6a31a6e7491e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Feb 25 14:04:18 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb 25 18:45:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7a805c

dev-qt/qt-creator: disable designer by default in live

This been set by default in the old ebuilds and opted to leave it like
that but, with Qt6 and the non-split qttools where designer is off by
default, this been annoying for users.

Default designer on qttools when most users don't need it does not
seem like the right move -- and believe users that actually want this
will know to set it themselves (perhaps even globally).

Not that I'm either a qt-creator nor designer user (just maintaining
regardless), so opinions from actual users for defaults are welcome.

(live-only to avoid long rebuilds, will propagate in next version)

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index f295798776cf..017a06e30b56 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.qt.io/product/development-tools";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-   +clang +designer doc +help qmldesigner serialterminal
+   +clang designer doc +help qmldesigner serialterminal
+svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-02-21 Thread Ionen Wolkens

commit: 1f7e9fe640ba9be8f54eaab23a7f464291cf6d0a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 22 04:50:23 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 22 06:14:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7e9fe6

dev-qt/qt-creator: use := to match upcoming llvm-r1 changes

Currently ommited in the llvm-r1 example, but that's being changed
and >=llvm-18.1.0_rc3 will use $(ver_cut 1-2) as subslot.

No need for a revbump (slot 18 is still masked either way).

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
index 4587a1c7c566..f295798776cf 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QT_PV}=
clang? (
dev-cpp/yaml-cpp:=
-   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
)
designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
help? (

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 4587a1c7c566..f295798776cf 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QT_PV}=
clang? (
dev-cpp/yaml-cpp:=
-   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+   $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
)
designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
help? (

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-02-10 Thread Ionen Wolkens

commit: d519e0ecfb408e50e11f6f3c592a2e9d521c3395
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb  9 11:43:42 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 10 11:25:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d519e0ec

dev-qt/qt-creator: migrate live to llvm-r1, allow slot 18

Tested with 18.1.0_rc2 at same time, seems to be fine so may
as well do this now.

Will migrate 12.0.2 when add Qt6.6.2 given that will trigger
a rebuild either way.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index a2c7444d9223..4587a1c7c566 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} ==  ]]; then
inherit git-r3
@@ -35,9 +37,9 @@ IUSE="
+clang +designer doc +help qmldesigner serialterminal
+svg test +tracing webengine
 "
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-LLVM_MAX_SLOT=17
 QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
@@ -47,7 +49,7 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QT_PV}=
clang? (
dev-cpp/yaml-cpp:=
-   =dev-qt/qttools-${QT_PV}[designer] )
help? (
@@ -84,13 +86,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
-llvm_check_deps() {
-   has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
python-any-r1_pkg_setup
-   use clang && llvm_pkg_setup
+   use clang && llvm-r1_pkg_setup
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-02-07 Thread Ionen Wolkens

commit: 0c187dd394b737da645806780b2bd15e6ab238fd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb  8 02:35:52 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb  8 02:35:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c187dd3

dev-qt/qt-creator: add 12.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 254 +
 2 files changed, 255 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index a885584233a9..dd4e4099f113 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 
2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd
 SHA512 
03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7
+DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B 
a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459
 SHA512 
cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
new file mode 100644
index ..a2c7444d9223
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang +designer doc +help qmldesigner serialterminal
+   +svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   =dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+   # -Werror=lto-type-mismatch issues, needs looking into
+   filter-lto
+
+   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DBUILD_WITH_PCH=n

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-01-09 Thread Arthur Zamarin

commit: d63af00f11f22d5013365ea5f4df3d9f8776c54d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jan  9 18:06:53 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jan  9 18:06:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63af00f

dev-qt/qt-creator: Stabilize 12.0.1 amd64, #921646

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
index 74deb347c1bd..574bcb50928f 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,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"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2024-01-08 Thread Ionen Wolkens

commit: b3e2e734569d7886ad61637f2b1397572e4883a0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 10:20:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e2e734

dev-qt/qt-creator: drop 12.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/qt-creator-12.0.0.ebuild | 254 -
 2 files changed, 255 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index fe0a7019052a..a885584233a9 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 
1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382
 SHA512 
e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af
 DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 
2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd
 SHA512 
03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7

diff --git a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
deleted file mode 100644
index 74deb347c1bd..
--- a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang +designer doc +help qmldesigner serialterminal
-   +svg test +tracing webengine
-"
-RESTRICT="!test? ( test )"
-
-LLVM_MAX_SLOT=17
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   =dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-llvm_check_deps() {
-   has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # needed for finding docs at runtime in PF
-   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-   -i cmake/QtCreatorAPIInternal.cmake || die
-}
-
-src_configure() {
-   # -Werror=lto-type-mismatch issues, needs looking into
-   filter-lto
-
-   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
-   # needs fixing in qtbase as *64 usage comes from its headers' macros
-   use elibc_musl && append-lfs-flags
-
-   local mycmakeargs=(
-   -DBUILD_WITH_PCH=no

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-12-12 Thread Ionen Wolkens

commit: 6c240f9a846f5fc8ef404576011cc653769435e2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 12 12:21:38 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 12 13:16:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c240f9a

dev-qt/qt-creator: add 12.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-12.0.1.ebuild | 254 +
 2 files changed, 255 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index b48bd50d7f52..fe0a7019052a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 
1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382
 SHA512 
e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af
+DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 
2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd
 SHA512 
03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
new file mode 100644
index ..74deb347c1bd
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang +designer doc +help qmldesigner serialterminal
+   +svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   =dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+   # -Werror=lto-type-mismatch issues, needs looking into
+   filter-lto
+
+   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DBUILD_WITH_PCH=no
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2023-12-12 Thread Ionen Wolkens

commit: 6cb6580b8c2250e0e43bc9562d49500371afe967
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 12 12:18:15 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 12 13:16:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb6580b

dev-qt/qt-creator: drop 11.0.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator-11.0.2-musl-no-malloc-trim.patch|  10 -
 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 262 -
 3 files changed, 273 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index caa1ae484ad1..b48bd50d7f52 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 
60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795
 SHA512 
4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca
 DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 
1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382
 SHA512 
e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af

diff --git 
a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
deleted file mode 100644
index d4936882d4d2..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-malloc_trim() is unavailable with musl
 a/src/plugins/coreplugin/mainwindow.cpp
-+++ b/src/plugins/coreplugin/mainwindow.cpp
-@@ -222,5 +222,5 @@
- m_trimTimer.setInterval(6);
- // glibc may not actually free memory in free().
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); });
- #endif

diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
deleted file mode 100644
index 089d5576fdc9..
--- a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   "https://github.com/qt-creator/qt-creator.git";
-   )
-   EGIT_SUBMODULES=(
-   perfparser
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   QTC_PV=${PV/_/-}
-   QTC_P=${PN}-opensource-src-${QTC_PV}
-   [[ ${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"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-   +clang +designer doc +help qmldesigner serialterminal
-   +svg test +tracing webengine
-"
-RESTRICT="!test? ( test )"
-
-LLVM_MAX_SLOT=17
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-   >=dev-qt/qt5compat-${QT_PV}
-   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT_PV}=
-   clang? (
-   dev-cpp/yaml-cpp:=
-   =dev-qt/qttools-${QT_PV}[designer] )
-   help? (
-   >=dev-qt/qttools-${QT_PV}[assistant]
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-   )
-   qmldesigner? (
-   >=dev-qt/qtquick3d-${QT_PV}=
-   >=dev-qt/qtsvg-${QT_PV}
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   tracing? (
-   app-arch/zstd:=
-   dev-libs/elfutils
-   >=dev-qt/qtshadertools-${QT_PV}
-   )
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-   ${COMMON_DEPEND}
-   help? ( >=dev-qt/qtimageformats-${QT_PV} )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-qt/qttools-${QT_PV}[linguist]
-   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FIL

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-11-23 Thread Ionen Wolkens

commit: 42f31b31a5084630a314e3f5c984f3ba12df1887
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Nov 23 22:36:24 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Nov 24 00:05:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f31b31

dev-qt/qt-creator: add 12.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-12.0.0.ebuild | 254 +
 2 files changed, 255 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 6402206232fe..caa1ae484ad1 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 
60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795
 SHA512 
4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca
+DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 
1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382
 SHA512 
e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af

diff --git a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
new file mode 100644
index ..74deb347c1bd
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang +designer doc +help qmldesigner serialterminal
+   +svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   =dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+   # -Werror=lto-type-mismatch issues, needs looking into
+   filter-lto
+
+   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DBUILD_WITH_PCH=no
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-11-16 Thread Ionen Wolkens

commit: 350616b86d8afbcc42729bb243d4daf814e9a7b3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Nov 16 02:12:49 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Nov 17 05:13:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350616b8

dev-qt/qt-creator: re-add cvs to live readme

Didn't mean to push that bit, it is now disabled by default
in qt-creator-12, but it is not *gone*.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ab3ca9782f99..74deb347c1bd 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -120,7 +120,7 @@ src_configure() {
 
# Much can be optional, but do not want to flood users (or 
maintainers)
# with too many flags. Not to mention that many plugins are 
merely
-   # wrappers around still optional tools (e.g. git) and any 
unwanted
+   # wrappers around still optional tools (e.g. cvs) and any 
unwanted
# plugins can be disabled at runtime. So optional flags are 
limited
# to plugins with additional build-time dependencies.
-DBUILD_LIBRARY_TRACING=$(usex tracing) # 
qml+perfprofiler,ctfvisual
@@ -240,6 +240,7 @@ Utilities:
 - StudioWelcome (USE=qmldesigner)
 
 Version Control:
+- CVS (dev-vcs/cvs)
 - Fossil (dev-vcs/fossil)
 - Git (dev-vcs/git)
 - Mercurial (dev-vcs/mercurial)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

2023-11-15 Thread Ionen Wolkens

commit: 221865a1afcddfe95dc5ef3825c8f0682547f0d3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 15 23:10:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov 16 00:14:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221865a1

dev-qt/qt-creator: update live

Not much to update, but next release is close and checking state.

Tests pass except tst_utils_deviceshell which is failing in upstream's
CI as well (unless QTC_USE_QPROCESS=false). The change causing this is
not included in 12.0.0rc1 though, so not going to worry about it.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch  | 8 
 dev-qt/qt-creator/qt-creator-.ebuild  | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch 
b/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch
new file mode 100644
index ..b22f20425129
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch
@@ -0,0 +1,8 @@
+malloc_trim() is unavailable with musl
+--- a/src/plugins/coreplugin/icore.cpp
 b/src/plugins/coreplugin/icore.cpp
+@@ -1276,3 +1276,3 @@
+ // glibc may not actually free memory in free().
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); });

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 2680f1244fe9..ab3ca9782f99 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
 llvm_check_deps() {
@@ -120,7 +120,7 @@ src_configure() {
 
# Much can be optional, but do not want to flood users (or 
maintainers)
# with too many flags. Not to mention that many plugins are 
merely
-   # wrappers around still optional tools (e.g. cvs) and any 
unwanted
+   # wrappers around still optional tools (e.g. git) and any 
unwanted
# plugins can be disabled at runtime. So optional flags are 
limited
# to plugins with additional build-time dependencies.
-DBUILD_LIBRARY_TRACING=$(usex tracing) # 
qml+perfprofiler,ctfvisual
@@ -234,12 +234,12 @@ Utilities:
 - Conan (dev-util/conan)
 - Docker (app-containers/docker)
 - Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
 - SerialTerminal (USE=serialterminal)
 - SilverSearcher (sys-apps/the_silver_searcher)
 - StudioWelcome (USE=qmldesigner)
 
 Version Control:
-- CVS (dev-vcs/cvs)
 - Fossil (dev-vcs/fossil)
 - Git (dev-vcs/git)
 - Mercurial (dev-vcs/mercurial)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-10-21 Thread Ionen Wolkens

commit: b10d8c99a50a6f8700138472c3b822e732eae10c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct 22 05:51:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct 22 05:51:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10d8c99

dev-qt/qt-creator: set llvm_check_deps

Forgot, albeit typically not an issue unless someone has an extra
llvm slot without clang.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 4 
 dev-qt/qt-creator/qt-creator-.ebuild   | 4 
 2 files changed, 8 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
index 881578f8093b..089d5576fdc9 100644
--- a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
+++ b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
@@ -84,6 +84,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
 )
 
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
python-any-r1_pkg_setup
use clang && llvm_pkg_setup

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 4c93ab7cdebc..2680f1244fe9 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -84,6 +84,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
 )
 
+llvm_check_deps() {
+   has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
python-any-r1_pkg_setup
use clang && llvm_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2023-10-10 Thread Ionen Wolkens

commit: 1eb216e5795dd62466726179d4e99ffc06af2253
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 10 18:55:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 10 20:18:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb216e5

dev-qt/qt-creator: drop 11.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator/files/qt-creator-11.0.2-qt653.patch |  31 ---
 .../files/qt-creator-11.0.2-yaml-cpp-0.8.patch |  29 ---
 dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 261 -
 4 files changed, 322 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3d5794daf457..6402206232fe 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 
6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b
 SHA512 
db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5
 DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 
60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795
 SHA512 
4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
deleted file mode 100644
index 7cbfc534bab6..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Uses private parts of the QtQuick3D api which added a namespace in [1].
-
-Update: upstream has done a better fix in [2] (but can stick to the
-simple version check until next release).
-
-[1] 
https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
-[2] 
https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
 a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
-+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
-@@ -803,5 +803,9 @@
- const QMatrix4x4 sceneTransform = parent->sceneTransform() * 
localTransform;
- 
-+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3))
-+return QSSGUtils::mat44::getPosition(sceneTransform);
-+#else
- return mat44::getPosition(sceneTransform);
-+#endif
- }
- 
 a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
-+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
-@@ -738,5 +738,9 @@
- const QMatrix4x4 sceneTransform = parent->sceneTransform() * 
localTransform;
- 
-+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3))
-+return QSSGUtils::mat44::getPosition(sceneTransform);
-+#else
- return mat44::getPosition(sceneTransform);
-+#endif
- }
- 

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
deleted file mode 100644
index c06a2733b484..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/914732
-https://bugreports.qt.io/browse/QTCREATORBUG-29537
-
-https://github.com/qt-creator/qt-creator/commit/170f9acfb41704b68e2ba98690fd6d5e98addd85
-From: Eike Ziller 
-Date: Thu, 24 Aug 2023 13:41:33 +0200
-Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8
-
-They renamed their target from `yaml-cpp`
-to `yaml-cpp::yaml-cpp`
-
-Still support < 0.8 though.
 a/cmake/Findyaml-cpp.cmake
-+++ b/cmake/Findyaml-cpp.cmake
-@@ -16,5 +16,13 @@
- find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
-   endif()
--  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES 
"${yaml_cpp_include_dir}")
-+  if(TARGET yaml-cpp::yaml-cpp)
-+# yaml-cpp >= 0.8
-+set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
-+add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
-+set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
-+  else()
-+set(yaml-cpp_TARGET yaml-cpp)
-+  endif()
-+  set_target_properties(${yaml-cpp_TARGET} PROPERTIES 
INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
- else()
-   if(TARGET yaml-cpp)

diff --git a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
deleted file mode 100644
index 02fc953d5706..
--- a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-09-28 Thread Ionen Wolkens

commit: a4f30e30695a9ad1f17707070a67fcf4b34770a0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Sep 28 10:10:54 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Sep 28 12:31:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f30e30

dev-qt/qt-creator: add 11.0.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 258 +
 2 files changed, 259 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 895a5d5946de..3d5794daf457 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 
6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b
 SHA512 
db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5
+DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 
60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795
 SHA512 
4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca

diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
new file mode 100644
index ..881578f8093b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
@@ -0,0 +1,258 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang +designer doc +help qmldesigner serialterminal
+   +svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   =dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+   # -Werror=lto-type-mismatch issues, needs looking into
+   filter-lto
+
+   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DBUILD_WITH_PCH=no
+   -DWITH_DOCS=$(usex doc)
+   -DBUILD_DEVELOPER_DOCS=$(us

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-09-26 Thread Ionen Wolkens

commit: 85588cf697488a218b3ce24a78da7c8747f5f4e7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 07:27:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 08:06:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85588cf6

dev-qt/qt-creator: remove qt653 patch from live

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index e3eb16aa2c02..eb2dcec27979 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -82,7 +82,6 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
-   "${FILESDIR}"/${PN}-11.0.2-qt653.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2023-09-26 Thread Ionen Wolkens

commit: 95fef56ce3e655745b52a9bd19da12f63b004b77
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 07:26:54 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 08:06:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fef56c

dev-qt/qt-creator: fix build with yaml-cpp-0.8

Closes: https://bugs.gentoo.org/914732
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qt-creator-11.0.2-yaml-cpp-0.8.patch | 29 ++
 dev-qt/qt-creator/qt-creator-11.0.2.ebuild |  1 +
 2 files changed, 30 insertions(+)

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
new file mode 100644
index ..c06a2733b484
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/914732
+https://bugreports.qt.io/browse/QTCREATORBUG-29537
+
+https://github.com/qt-creator/qt-creator/commit/170f9acfb41704b68e2ba98690fd6d5e98addd85
+From: Eike Ziller 
+Date: Thu, 24 Aug 2023 13:41:33 +0200
+Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8
+
+They renamed their target from `yaml-cpp`
+to `yaml-cpp::yaml-cpp`
+
+Still support < 0.8 though.
+--- a/cmake/Findyaml-cpp.cmake
 b/cmake/Findyaml-cpp.cmake
+@@ -16,5 +16,13 @@
+ find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
+   endif()
+-  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES 
"${yaml_cpp_include_dir}")
++  if(TARGET yaml-cpp::yaml-cpp)
++# yaml-cpp >= 0.8
++set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
++add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
++set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
++  else()
++set(yaml-cpp_TARGET yaml-cpp)
++  endif()
++  set_target_properties(${yaml-cpp_TARGET} PROPERTIES 
INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
+ else()
+   if(TARGET yaml-cpp)

diff --git a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
index 2d43880f115f..20bd6be0b986 100644
--- a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
"${FILESDIR}"/${PN}-11.0.2-qt653.patch
+   "${FILESDIR}"/${P}-yaml-cpp-0.8.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-09-20 Thread Ionen Wolkens

commit: c1bc5cc478c51f75ed9a5fb82a5bd70724bebdc3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 20 08:20:53 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 20 08:30:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bc5cc4

dev-qt/qt-creator: drop 8.0.2

With llvm-17.0.1 being released, keeping a -14 ebuild around
is a stretch and would be surprised if someone still relied
on this old ebuild. So let's just drop it now.

This loses keywords for arm and x86. As noted in bug #905166,
currently no intention to restore these unless someone actually
wants and requests it.

Closes: https://bugs.gentoo.org/905166
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 -
 dev-qt/qt-creator/metadata.xml|  37 ---
 dev-qt/qt-creator/qt-creator-8.0.2.ebuild | 446 --
 3 files changed, 484 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 748984c50c0c..895a5d5946de 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
 DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 
6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b
 SHA512 
db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5
-DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 
53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072
 SHA512 
59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 8a364df28048..fcd44daa8386 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -10,49 +10,12 @@
Gentoo Qt Project


-   Build plugin for Android devices
-   Enable integration with popular unit 
testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)
-   Build plugin for autotools-based 
projects
-   Build plugin for bare metal 
devices
-   Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
-   Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
-   Build plugin for Boot2Qt devices
Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
-   Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
-   Build plugin for CMake-based projects
-   Build plugin to support Coco code coverage 
tool
-   Build plugin to integrate with the Conan 
package manager
-   Enable integration with 
dev-util/cppcheck
-   Build the Chrome Trace Format 
visualizer plugin
Enable designer for QtWidgets-based 
UIs
-   Build plugin for Docker support
-   Build the GLSL editor plugin
Enable the integrated 
dev-qt/qt-docs viewer (also needed for examples)
-   Build plugin to open and view image 
files
-   Enable integration with 
Incredibuild
-   Add support for the Language Server Protocol 
(LSP)
-   Build plugin for MCU devices
-   Add support for 
dev-vcs/mercurial version control system
-   Build plugin for Meson-based projects
-   Build the graphical model editor 
plugin
-   Build plugin for Nim language support
-   Add support for Perforce version control 
system (requires manual installation of Perforce client)
-   Build the Linux Perf-based profiler 
plugin
-   Build plugin for Python language 
support
-   Build plugin for Qbs-based projects
-   Build plugin for qmake-based projects
-   Build plugins for QML-based development 
(designer, editor, project manager)
-   Build the QML profiler plugin
-   Build plugin for QNX devices
-   Build plugin for deployment and 
execution on a remote Linux host
-   Build the graphical SCXML editor 
plugin
Build the serial terminal 
plugin
-   Enable integration with 
sys-apps/the_silver_searcher
-   Add support for retrieving application 
output from journald
Build QmlDesigner and related plugins 
(Insight, StudioWelcome)
Build plugins requiring tracing 
capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)
-   Enable integration with 
dev-util/valgrind
-   Build WebAssembly plugin

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/

2023-09-20 Thread Ionen Wolkens

commit: 8768e1a03ee5dc728c3ad8dc251bbeedc149434c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 20 06:57:05 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 20 08:14:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8768e1a0

dev-qt/qt-creator: link to upstream's fix in the qt653 patch header

It would probably be fine to pull that instead, albeit without
looking closer it may be safer to keep as-is until next version.

Note that while upstream's fix removes the private API usage for
that bit, it still uses QtQuick3D private API for other things,
so binding operator needs to stay.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
index 1ad23a207d9b..7cbfc534bab6 100644
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
@@ -1,5 +1,10 @@
-Uses private parts of the QtQuick3D api which added a namespace in:
-https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
+Uses private parts of the QtQuick3D api which added a namespace in [1].
+
+Update: upstream has done a better fix in [2] (but can stick to the
+simple version check until next release).
+
+[1] 
https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
+[2] 
https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
 --- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
 +++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
 @@ -803,5 +803,9 @@

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2023-09-11 Thread Ionen Wolkens

commit: b28e6ecad062935854698a0911312a12de559732
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Sep 11 19:44:43 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:20:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28e6eca

dev-qt/qt-creator: add live ebuild

Mostly the same as 11.0.2 bare no longer any unexpected test
failures, minor adjustments due to newer litehtml, and allowing
clang-17.

May still be more that need changes but will give it a closer
look on release unless something comes up first.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 250 +++
 1 file changed, 250 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
new file mode 100644
index ..e3eb16aa2c02
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -0,0 +1,250 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt-creator/qt-creator.git";
+   "https://github.com/qt-creator/qt-creator.git";
+   )
+   EGIT_SUBMODULES=(
+   perfparser
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   QTC_PV=${PV/_/-}
+   QTC_P=${PN}-opensource-src-${QTC_PV}
+   [[ ${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"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+   +clang +designer doc +help qmldesigner serialterminal
+   +svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+   >=dev-qt/qt5compat-${QT_PV}
+   >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT_PV}=
+   clang? (
+   dev-cpp/yaml-cpp:=
+   =dev-qt/qttools-${QT_PV}[designer] )
+   help? (
+   >=dev-qt/qttools-${QT_PV}[assistant]
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+   )
+   qmldesigner? (
+   >=dev-qt/qtquick3d-${QT_PV}=
+   >=dev-qt/qtsvg-${QT_PV}
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   tracing? (
+   app-arch/zstd:=
+   dev-libs/elfutils
+   >=dev-qt/qtshadertools-${QT_PV}
+   )
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+   ${COMMON_DEPEND}
+   help? ( >=dev-qt/qtimageformats-${QT_PV} )
+   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-qt/qttools-${QT_PV}[linguist]
+   doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+   "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
+   "${FILESDIR}"/${PN}-11.0.2-qt653.patch
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # needed for finding docs at runtime in PF
+   sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+   -i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+   # -Werror=lto-type-mismatch issues, needs looking into
+   filter-lto
+
+   # temporary workaround for musl-1.2.4 (bug #903611), this ideally
+   # needs fixing in qtbase as *64 usage comes from its headers' macros
+   use elibc_musl && append-lfs-flags
+
+   local mycmakeargs=(
+   -DBUILD_WITH_PCH=no
+   -DWITH_DOCS=$(usex doc)
+   -DBUILD_DEVELOPER_DOCS=$(usex doc)
+   -DWITH_TESTS=$(usex test)
+
+   # TODO?: try to unbundle with =no when syntax-highlighting:6 
exists
+   -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+   # Much can be optional, but do not want to flood users (or 
maintainers)
+   # with too many flags. Not to mention that many plugins are 
merely
+   # wrappers around still optional tools (e.g. cvs) and any 
unwanted
+   # plugins can be disabled at runtime. So optional flags are 
limited
+   # to plugins with additional build-time dependencies.
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/files/, dev-qt/qt-creator/

2023-09-11 Thread Ionen Wolkens

commit: dcd602a4a0830f42b943bdb5eec75948efc0cee7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  9 17:23:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:20:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd602a4

dev-qt/qt-creator: add 11.0.2

Not going to list every changes given this ebuild is from scratch.

There are a few ebuilds for this going around, but they about all
have (IMO) overcustomization, with a lot of USE to juggle for both
users and maintainers (some handled through sed'ing cmake files) --
all while plugins can still be disabled at runtime either way.

So this is now mostly limited to options that introduce an extra
dependency (e.g. clang). "Some" of the longest to build plugins
do have dependencies, so this still allows to cut down build time
a decent amount (not that this is a short build still).

Other small notes:
* Default IUSEs match what Qt Creator enables by default at runtime
 (albeit default USE=-tracing could be interesting for faster builds).
* Left gumbo unbundling out for now given ultimate goal is to unbundle
  litehtml instead (which itself uses gumbo), but currently it requires
  a large patch for 0.8 support (likewise to unbundle on qttools).

wrt bug #905166, delaying cleanup given restoring keywords is
non-trivial and users may need time to adjust for Qt5->Qt6, but
can be dropped anytime anyway if llvm:14 cleanup is happening
(do not consider this a blocker).

Bug: https://bugs.gentoo.org/905166
Closes: https://bugs.gentoo.org/835042
Closes: https://bugs.gentoo.org/905417
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 .../files/qt-creator-11.0.2-musl-no-execinfo.patch |  47 
 .../qt-creator-11.0.2-musl-no-malloc-trim.patch|  10 +
 .../qt-creator/files/qt-creator-11.0.2-qt653.patch |  26 +++
 dev-qt/qt-creator/metadata.xml |   7 +-
 dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 260 +
 6 files changed, 349 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9fd838575706..748984c50c0c 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
+DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 
6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b
 SHA512 
db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5
 DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 
53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072
 SHA512 
59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
new file mode 100644
index ..b36cfef2d4e7
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
@@ -0,0 +1,47 @@
+execinfo is unavailable with musl (unless opted to package+use libexecinfo)
+--- a/src/libs/utils/qtcassert.cpp
 b/src/libs/utils/qtcassert.cpp
+@@ -9,5 +9,5 @@
+ #include 
+ 
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -30,5 +30,5 @@
+ if (maxdepth < 0 || maxdepth > ArraySize)
+ maxdepth = ArraySize;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ void *bt[ArraySize] = {nullptr};
+ int size = backtrace(bt, maxdepth);
+--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
 b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+@@ -4,5 +4,5 @@
+ #include "exception.h"
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -31,5 +31,5 @@
+ namespace QmlDesigner {
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ const char* demangle(const char* name)
+ {
+@@ -76,5 +76,5 @@
+ }
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ static QString getBackTrace()
+ {
+@@ -114,5 +114,5 @@
+   , m_file(QString::fromUtf8(file))
+   , m_description(description)
+-  #ifdef Q_OS_LINUX
++  #if defined(Q_OS_LINUX) && defined(__GLIBC__)
+   , m_backTrace(getBackTrace())
+   #endif

diff --git 
a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
new file mode 100644
index ..d4936882d4d2
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
@@ -0,0 +1,10 @@
+malloc_trim() is unavailable with musl
+--- a/src/plugins/coreplugin/mainwindow.cpp
 b/src/plugins/coreplugin/mainwindow.cpp
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-11-06 Thread Sam James

commit: 51244efdbd5106e2ed9a16c55cb0d5ad1cb093e2
Author: Peter Levine  gmail  com>
AuthorDate: Sat Nov  5 20:03:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov  7 06:57:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51244efd

dev-qt/qt-creator: call xdg_pkg_postinst

xdg_pkg_postinst needs to be explicitly called since we define
our own pkg_postinst.

Closes: https://bugs.gentoo.org/879887
Signed-off-by: Peter Levine  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28149
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/qt-creator-8.0.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
index 138e0e37a74e..5c3775b33104 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
@@ -413,6 +413,8 @@ src_install() {
 }
 
 pkg_postinst() {
+   xdg_pkg_postinst
+
optfeature_header \
"Some enabled plugins require optional dependencies for 
functionality:"
use android && optfeature "android device support" \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-11-04 Thread Sam James

commit: d5b662bb7fc5976478227e330e949ae6bbd4b70a
Author: Peter Levine  gmail  com>
AuthorDate: Mon Oct 31 01:17:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 06:32:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b662bb

dev-qt/qt-creator: drop 8.0.1

Signed-off-by: Peter Levine  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28047
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 -
 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 444 --
 2 files changed, 445 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3512b8464ddb..9fd838575706 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 
07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d
 SHA512 
ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672
 DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 
53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072
 SHA512 
59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
deleted file mode 100644
index 138e0e37a74e..
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ /dev/null
@@ -1,444 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LLVM_MAX_SLOT=14
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit cmake llvm optfeature virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/";
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
-   EGIT_SUBMODULES=(
-   perfparser
-   qtscript # Need the dev branch
-   src/libs/qlitehtml
-   src/libs/qlitehtml/src/3rdparty/litehtml
-   )
-else
-   MY_PV=${PV/_/-}
-   MY_P=${PN}-opensource-src-${MY_PV}
-   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
-   S="${WORKDIR}"/${MY_P}
-   KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-QTCREATOR_PLUGINS=(
-   # Misc
-   +autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
-   +help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
-   silversearcher valgrind
-
-   # Buildsystems
-   autotools +cmake incredibuild meson qbs +qmake
-
-   # Languages
-   glsl +lsp nim python
-
-   # Platforms
-   android baremetal boot2qt mcu qnx remotelinux webassembly
-
-   # VCS
-   bazaar clearcase cvs +git mercurial perforce subversion
-)
-
-IUSE="+clang debug doc +qml systemd test wayland webengine
-   ${QTCREATOR_PLUGINS[@]}"
-
-REQUIRED_USE="
-   android? ( lsp )
-   boot2qt? ( remotelinux )
-   clang? ( lsp )
-   coco? ( lsp )
-   mcu? ( baremetal cmake )
-   python? ( lsp )
-   qml? ( qmake )
-   qnx? ( remotelinux )
-   test? ( qbs qmake )
-"
-
-# minimum Qt version required
-QT_PV="5.15.2:5"
-
-BDEPEND="
-   >=dev-qt/linguist-tools-${QT_PV}
-   doc? ( >=dev-qt/qdoc-${QT_PV} )
-   help? ( !webengine? ( virtual/pkgconfig ) )
-"
-CDEPEND="
-   clang? (
-   >=dev-cpp/yaml-cpp-0.6.2:=
-   sys-devel/clang:14=
-   )
-   >=dev-qt/qtconcurrent-${QT_PV}
-   >=dev-qt/qtcore-${QT_PV}
-   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
-   >=dev-qt/qtgui-${QT_PV}
-   >=dev-qt/qtnetwork-${QT_PV}[ssl]
-   >=dev-qt/qtprintsupport-${QT_PV}
-   >=dev-qt/qtquickcontrols-${QT_PV}
-   >=dev-qt/qtsql-${QT_PV}[sqlite]
-   >=dev-qt/qtwidgets-${QT_PV}
-   >=dev-qt/qtxml-${QT_PV}
-   >=kde-frameworks/syntax-highlighting-5.87:5
-
-   designer? ( >=dev-qt/designer-${QT_PV} )
-   help? (
-   >=dev-qt/qthelp-${QT_PV}
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-   !webengine? ( dev-libs/gumbo )
-   )
-   imageviewer? ( >=dev-qt/qtsvg-${QT_PV} )
-   perfprofiler? (
-   app-arch/zstd
-   dev-libs/elfutils
-   )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   systemd? ( sys-apps/systemd:= )
-   test? ( mcu? ( dev-cpp/gtest:= ) )
-"
-DEPEND="
-   ${CDEPEND}
-   test? (
-   dev-cpp/benchmark
-   dev-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-11-04 Thread Sam James

commit: b46bf0e8d4bac2fa871c1a1ee351599760e06c6d
Author: Peter Levine  gmail  com>
AuthorDate: Mon Oct 31 00:56:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 06:32:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46bf0e8

dev-qt/qt-creator: add 8.0.2

Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 +
 dev-qt/qt-creator/qt-creator-8.0.2.ebuild | 444 ++
 2 files changed, 445 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 45540d8edfe6..3512b8464ddb 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 
07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d
 SHA512 
ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672
+DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 
53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072
 SHA512 
59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
new file mode 100644
index ..138e0e37a74e
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
@@ -0,0 +1,444 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LLVM_MAX_SLOT=14
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit cmake llvm optfeature virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/";
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
+   EGIT_SUBMODULES=(
+   perfparser
+   qtscript # Need the dev branch
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-opensource-src-${MY_PV}
+   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
+   S="${WORKDIR}"/${MY_P}
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+QTCREATOR_PLUGINS=(
+   # Misc
+   +autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
+   +help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
+   silversearcher valgrind
+
+   # Buildsystems
+   autotools +cmake incredibuild meson qbs +qmake
+
+   # Languages
+   glsl +lsp nim python
+
+   # Platforms
+   android baremetal boot2qt mcu qnx remotelinux webassembly
+
+   # VCS
+   bazaar clearcase cvs +git mercurial perforce subversion
+)
+
+IUSE="+clang debug doc +qml systemd test wayland webengine
+   ${QTCREATOR_PLUGINS[@]}"
+
+REQUIRED_USE="
+   android? ( lsp )
+   boot2qt? ( remotelinux )
+   clang? ( lsp )
+   coco? ( lsp )
+   mcu? ( baremetal cmake )
+   python? ( lsp )
+   qml? ( qmake )
+   qnx? ( remotelinux )
+   test? ( qbs qmake )
+"
+
+# minimum Qt version required
+QT_PV="5.15.2:5"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-${QT_PV}
+   doc? ( >=dev-qt/qdoc-${QT_PV} )
+   help? ( !webengine? ( virtual/pkgconfig ) )
+"
+CDEPEND="
+   clang? (
+   >=dev-cpp/yaml-cpp-0.6.2:=
+   sys-devel/clang:14=
+   )
+   >=dev-qt/qtconcurrent-${QT_PV}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+   >=dev-qt/qtgui-${QT_PV}
+   >=dev-qt/qtnetwork-${QT_PV}[ssl]
+   >=dev-qt/qtprintsupport-${QT_PV}
+   >=dev-qt/qtquickcontrols-${QT_PV}
+   >=dev-qt/qtsql-${QT_PV}[sqlite]
+   >=dev-qt/qtwidgets-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   >=kde-frameworks/syntax-highlighting-5.87:5
+
+   designer? ( >=dev-qt/designer-${QT_PV} )
+   help? (
+   >=dev-qt/qthelp-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+   !webengine? ( dev-libs/gumbo )
+   )
+   imageviewer? ( >=dev-qt/qtsvg-${QT_PV} )
+   perfprofiler? (
+   app-arch/zstd
+   dev-libs/elfutils
+   )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   systemd? ( sys-apps/systemd:= )
+   test? ( mcu? ( dev-cpp/gtest:= ) )
+"
+DEPEND="
+   ${CDEPEND}
+   test? (
+   dev-cpp/benchmark
+   dev-cpp/eigen
+   dev-cpp/gtest
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-11-04 Thread Sam James

commit: e41b0b28956d54254c714b6dc6b0fd3983c614c7
Author: Peter Levine  gmail  com>
AuthorDate: Tue Nov  1 23:36:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 06:32:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b0b28

dev-qt/qt-creator: fix unnecessary dependence on dev-cpp/yaml-cpp

Including the clangtools plugin's CMakeLists.txt causes an
unconditional dependence on dev-cpp/yaml-cpp, whether or not the plugin
is enabled.  Removing 'add_subdirectory(clangtools)' from the parent
directory's CMakeLists.txt when the clangtools USE flag is disabled
resolves it.

Bug: https://bugs.gentoo.org/878753
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
index e110647e5230..138e0e37a74e 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
@@ -180,6 +180,8 @@ src_prepare() {
src/libs/CMakeLists.txt
cmake_use_remove_addsubdirectory qml advanceddockingsystem \
src/libs/CMakeLists.txt
+   cmake_use_remove_addsubdirectory clang clangtools \
+   src/plugins/CMakeLists.txt
cmake_use_remove_addsubdirectory test test \
src/plugins/mcusupport/CMakeLists.txt
 
@@ -338,7 +340,6 @@ src_configure() {
# Clang stuff
-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-   -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
 
# QML stuff
# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
@@ -362,6 +363,7 @@ src_configure() {
-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
+   -DBUILD_PLUGIN_CLANGTOOLS=YES
)
fi
if use help; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-11-04 Thread Sam James

commit: 166a265815ff2e354e8d83e4fb6b076f058774bc
Author: Peter Levine  gmail  com>
AuthorDate: Mon Oct 31 00:48:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 06:32:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166a2658

dev-qt/qt-creator: fix pkgconfig bdep

virtual/pkgconfig should be included as a build dependency if building
without qtwebengine support.  Also, such a dep should be explicitly
searched for by cmake with the 'find_package' command.

Closes: https://bugs.gentoo.org/878753
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
index f03c7c4f74e0..e110647e5230 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
@@ -71,6 +71,7 @@ QT_PV="5.15.2:5"
 BDEPEND="
>=dev-qt/linguist-tools-${QT_PV}
doc? ( >=dev-qt/qdoc-${QT_PV} )
+   help? ( !webengine? ( virtual/pkgconfig ) )
 "
 CDEPEND="
clang? (
@@ -213,7 +214,8 @@ src_prepare() {
 
if use help && ! use webengine; then
# unbundled gumbo doesn't use cmake
-   local gumbo_dep='pkg_check_modules(gumbo REQUIRED 
IMPORTED_TARGET gumbo)\n'
+   local gumbo_dep='find_package(PkgConfig REQUIRED)\n'
+   gumbo_dep+='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET 
gumbo)\n'
sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
src/libs/qlitehtml/src/CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-10-29 Thread Sam James

commit: 63f30dfe13ad002d2d76553c70fb1081c65e9291
Author: Peter Levine  gmail  com>
AuthorDate: Sat Aug  6 06:44:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 15:08:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f30dfe

dev-qt/qt-creator: drop 6.0.0 and 

6.0.0 is shadowed by 8.0.1 and  requires QT6.

Closes: https://github.com/gentoo/gentoo/pull/26675
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 -
 dev-qt/qt-creator/qt-creator-6.0.0.ebuild | 231 --
 dev-qt/qt-creator/qt-creator-.ebuild  | 231 --
 3 files changed, 463 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2ff50efd4154..45540d8edfe6 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 
8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348
 SHA512 
4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
 DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 
07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d
 SHA512 
ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672

diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
deleted file mode 100644
index f8eca8f995f6..
--- a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=13
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/";
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
-else
-   MY_PV=${PV/_/-}
-   MY_P=${PN}-opensource-src-${MY_PV}
-   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
-   S=${WORKDIR}/${MY_P}
-   KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
-   clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker +git glsl:glsleditor +help incredibuild
-   +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
-   qbs:qbsprojectmanager +qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
-   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-   android? ( lsp )
-   boot2qt? ( remotelinux )
-   clang? ( lsp )
-   mcu? ( baremetal cmake )
-   python? ( lsp )
-   qml? ( qmake )
-   qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.15:5"
-
-BDEPEND="
-   >=dev-qt/linguist-tools-${QT_PV}
-   virtual/pkgconfig
-   doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-CDEPEND="
-   >=dev-qt/qtconcurrent-${QT_PV}
-   >=dev-qt/qtcore-${QT_PV}
-   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
-   >=dev-qt/qtgui-${QT_PV}
-   >=dev-qt/qtnetwork-${QT_PV}[ssl]
-   >=dev-qt/qtprintsupport-${QT_PV}
-   >=dev-qt/qtquickcontrols-${QT_PV}
-   >=dev-qt/qtscript-${QT_PV}
-   >=dev-qt/qtsql-${QT_PV}[sqlite]
-   >=dev-qt/qtsvg-${QT_PV}
-   >=dev-qt/qtwidgets-${QT_PV}
-   >=dev-qt/qtx11extras-${QT_PV}
-   >=dev-qt/qtxml-${QT_PV}
-   >=kde-frameworks/syntax-highlighting-5.87:5
-   clang? (
-   >=dev-cpp/yaml-cpp-0.6.2:=
-   || (
-   sys-devel/clang:13
-   sys-devel/clang:12
-   sys-devel/clang:11
-   )
-   =dev-qt/designer-${QT_PV} )
-   help? (
-   >=dev-qt/qthelp-${QT_PV}
-   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-   )
-   perfprofiler? ( dev-libs/elfutils )
-   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-   systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-   test? (
-   >=dev-qt/qtdeclarative-${QT_PV}[localstorag

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-10-29 Thread Sam James

commit: 157b590574f3ca93b77040d9cc788e367d02c51b
Author: Peter Levine  gmail  com>
AuthorDate: Sat Aug  6 04:55:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 15:07:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157b5905

dev-qt/qt-creator: add 8.0.1

Switched from the qmake to cmake buildsystem.  Added support for the
Coco code coverage tool. The 'git' USE flag now also builds the gitlab
plugin. The 'wayland' flag was added to enforce built-with-use
dependency. 'imageviewer' flag is added for conditional dependence on
dev-qt/qtsvg.  clangd functionality now depends on >=clang-14.*.

Bug: https://bugs.gentoo.org/828071
Bug: https://bugs.gentoo.org/846947
Closes: https://bugs.gentoo.org/876169
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 +
 dev-qt/qt-creator/metadata.xml|   2 +
 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 440 ++
 3 files changed, 443 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8613fc7c9b88..2ff50efd4154 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 
8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348
 SHA512 
4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
+DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 
07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d
 SHA512 
ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 51e112b750a3..dc11e329b879 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,6 +20,7 @@
Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
+   Build plugin to support Coco code coverage 
tool
Build plugin to integrate with the Conan 
package manager
Enable integration with 
dev-util/cppcheck
Build the Chrome Trace Format 
visualizer plugin
@@ -27,6 +28,7 @@
Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
+   Build plugin to open and view image 
files
Enable integration with 
Incredibuild
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
new file mode 100644
index ..f03c7c4f74e0
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LLVM_MAX_SLOT=14
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit cmake llvm optfeature virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/";
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
+   EGIT_SUBMODULES=(
+   perfparser
+   qtscript # Need the dev branch
+   src/libs/qlitehtml
+   src/libs/qlitehtml/src/3rdparty/litehtml
+   )
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-opensource-src-${MY_PV}
+   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
+   S="${WORKDIR}"/${MY_P}
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+QTCREATOR_PLUGINS=(
+   # Misc
+   +autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
+   +help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
+   silversearcher valgrind
+
+   # Buildsystems
+   autotools +cmake incredibuild meson qbs +qmake
+
+   # Languages
+   glsl +lsp nim python
+
+   # Platforms
+   android baremetal boot2qt mcu qnx remotelinux webassembly
+
+   # VCS
+   bazaar clearcase cvs +git mercurial perforce subversion
+)
+
+IUSE="+clang debug doc +qml systemd test wayland webengine
+   ${QTCREATOR_PLUGINS[@]}"
+
+REQUIRED_USE="
+   android? ( lsp )
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-02-20 Thread Davide Pesavento

commit: beea7f325d1d39a57791babf68621ee8ef61339e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Feb 20 18:16:44 2022 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Feb 20 18:17:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beea7f32

dev-qt/qt-creator: drop old 4.15.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/metadata.xml |   2 -
 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 233 -
 3 files changed, 236 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 5c1ec986bbb7..8613fc7c9b88 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
 DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 
8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348
 SHA512 
4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d2e6af3e1338..51e112b750a3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -40,8 +40,6 @@
Build plugin for Qbs-based projects
Build plugin for qmake-based projects
Build plugins for QML-based development 
(designer, editor, project manager)
-   Enable designer for QML/QtQuick-based 
UIs
-   Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
Build plugin for deployment and 
execution on a remote Linux host

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
deleted file mode 100644
index 18260cba5420..
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/";
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
-else
-   MY_PV=${PV/_/-}
-   MY_P=${PN}-opensource-src-${MY_PV}
-   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
-   S=${WORKDIR}/${MY_P}
-   KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
-   ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
-   modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
-   +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
-   subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-   android? ( lsp )
-   boot2qt? ( remotelinux )
-   clang? ( test? ( qbs ) )
-   mcu? ( baremetal cmake )
-   python? ( lsp )
-   qmldesigner? ( qmljs )
-   qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.14:5"
-
-BDEPEND="
-   >=dev-qt/linguist-tools-${QT_PV}
-   virtual/pkgconfig
-   doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-CDEPEND="
-   >=dev-qt/qtconcurrent-${QT_PV}
-   >=dev-qt/qtcore-${QT_PV}
-   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
-   >=dev-qt/qtgui-${QT_PV}
-   >=dev-qt/qtnetwork-${QT_PV}[ssl]
-   >=dev-qt/qtprintsupport-${QT_PV}
-   >=dev-qt/qtquickcontrols-${QT_PV}
-   >=dev-qt/qtscript-${QT_PV}
-   >=dev-qt/qtsql-${QT_PV}[sqlite]
-   >=dev-qt/qtsvg-${QT_PV}
-   >=dev-qt/qtwidgets-${QT_PV}
-   >=dev-qt/qtx11extras-${QT_PV}
-   >=dev-qt/qtxml-${QT_PV}
-   kde-frameworks/syntax-highlighting:5
-   clang? (
-   >=dev-cpp/yaml-cpp-0.6.2:=
-   || (
-   sys-devel/clang:12
-   sys-devel/clang

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-12-02 Thread Davide Pesavento

commit: 53ee29848e4a7b874b9c53fffabe87cb193f1a2a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  2 19:08:57 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  2 19:08:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ee2984

dev-qt/qt-creator: bump to 6.0.0

Closes: https://bugs.gentoo.org/807580
Closes: https://bugs.gentoo.org/801922
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 +
 dev-qt/qt-creator/qt-creator-6.0.0.ebuild | 231 ++
 2 files changed, 232 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 975ecb0a7d27..5c1ec986bbb7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
+DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 
8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348
 SHA512 
4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb

diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
new file mode 100644
index ..f8eca8f995f6
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=13
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/";
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-opensource-src-${MY_PV}
+   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
+   S=${WORKDIR}/${MY_P}
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+   clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker +git glsl:glsleditor +help incredibuild
+   +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
+   qbs:qbsprojectmanager +qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+   android? ( lsp )
+   boot2qt? ( remotelinux )
+   clang? ( lsp )
+   mcu? ( baremetal cmake )
+   python? ( lsp )
+   qml? ( qmake )
+   qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.15:5"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-${QT_PV}
+   virtual/pkgconfig
+   doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+   >=dev-qt/qtconcurrent-${QT_PV}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+   >=dev-qt/qtgui-${QT_PV}
+   >=dev-qt/qtnetwork-${QT_PV}[ssl]
+   >=dev-qt/qtprintsupport-${QT_PV}
+   >=dev-qt/qtquickcontrols-${QT_PV}
+   >=dev-qt/qtscript-${QT_PV}
+   >=dev-qt/qtsql-${QT_PV}[sqlite]
+   >=dev-qt/qtsvg-${QT_PV}
+   >=dev-qt/qtwidgets-${QT_PV}
+   >=dev-qt/qtx11extras-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   >=kde-frameworks/syntax-highlighting-5.87:5
+   clang? (
+   >=dev-cpp/yaml-cpp-0.6.2:=
+   || (
+   sys-devel/clang:13
+   sys-devel/clang:12
+   sys-devel/clang:11
+   )
+   =dev-qt/designer-${QT_PV} )
+   help? (
+   >=dev-qt/qthelp-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+   )
+   perfprofiler? ( dev-libs/elfutils )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+   test? (
+   >=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+   >=dev-qt/qtquickcontrols2-${QT_PV}
+   >=dev-qt/qttest-$

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-28 Thread Davide Pesavento

commit: 70f35cac6407c88c051c2f6e9326457de6acf194
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:22:16 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f35cac

dev-qt/qt-creator: various test fixes

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 10d2dbc089f4..c199ce2d341b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
android? ( lsp )
boot2qt? ( remotelinux )
-   clang? ( lsp test? ( qbs ) )
+   clang? ( lsp )
mcu? ( baremetal cmake )
python? ( lsp )
qnx? ( remotelinux )
@@ -152,7 +152,7 @@ src_prepare() {
if ! use qml; then
sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' 
src/libs/libs.pro || die
sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-   sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
+   sed -i -e '/qmldesigner\|qmlprojectmanager/d' 
tests/auto/qml/qml.pro || die
fi
if ! use valgrind; then
sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
@@ -166,9 +166,12 @@ src_prepare() {
 
# disable broken or unreliable tests
sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-   sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' 
tests/auto/debugger/debugger.pro || die
+   sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
sed -i -e '/CONFIG -=/s/$/ testcase/' 
tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || 
die
-   sed -i -e 's/\//' tests/auto/qml/codemodel/codemodel.pro || die
+   sed -i -e '/reformatter/d' tests/auto/qml/qml.pro || die
+   sed -i -e 's/\<\(imports\|\)check\>//' 
tests/auto/qml/codemodel/codemodel.pro || die
+   sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro 
|| die
+   sed -i -e '/qtcprocess/d' tests/auto/utils/utils.pro || die
 
# do not install test binaries
sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' 
tests/auto/{qttest.pri,json/json.pro} || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-28 Thread Davide Pesavento

commit: 8947d869217415b683ab5d3325fd5a917e1779e3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:28:02 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8947d869

dev-qt/qt-creator: add USE flag to disable the qmake project manager

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  3 ++-
 dev-qt/qt-creator/qt-creator-.ebuild | 16 +---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index bdaf1a3ad21f..d2e6af3e1338 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -37,7 +37,8 @@
Add support for Perforce version control 
system (requires manual installation of Perforce client)
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
-   Build plugin for QBS-based projects
+   Build plugin for Qbs-based projects
+   Build plugin for qmake-based projects
Build plugins for QML-based development 
(designer, editor, project manager)
Enable designer for QML/QtQuick-based 
UIs
Build the QML/JavaScript editor plugin

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index c199ce2d341b..d0d62b73a9e0 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -24,13 +24,11 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
-   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild +lsp:languageclient
-   mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
-   python qbs:qbsprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
-   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind
-   webassembly)
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+   clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker git glsl:glsleditor +help incredibuild
+   +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
+   qbs:qbsprojectmanager qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -39,6 +37,7 @@ REQUIRED_USE="
clang? ( lsp )
mcu? ( baremetal cmake )
python? ( lsp )
+   qml? ( qmake )
qnx? ( remotelinux )
 "
 
@@ -149,6 +148,9 @@ src_prepare() {
sed -i -e '/tracing/d' src/libs/libs.pro 
tests/auto/auto.pro || die
fi
fi
+   if ! use qmake; then
+   sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
+   fi
if ! use qml; then
sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' 
src/libs/libs.pro || die
sed -i -e '/qml2puppet/d' src/tools/tools.pro || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-28 Thread Davide Pesavento

commit: b671c1131493e983c274a36f4711549687984a74
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:34:31 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b671c113

dev-qt/qt-creator: enable a couple more USE flags by default

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index d0d62b73a9e0..f8eca8f995f6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -25,9 +25,9 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
-   clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker git glsl:glsleditor +help incredibuild
+   clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker +git glsl:glsleditor +help incredibuild
+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
-   qbs:qbsprojectmanager qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qbs:qbsprojectmanager +qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-22 Thread Davide Pesavento

commit: be5b9f5cffb7518cad62fe41d1df1faa0ffd7748
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 23 04:16:06 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5b9f5c

dev-qt/qt-creator: clangcodemodel plugin requires USE=lsp

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ceec86efbe12..10d2dbc089f4 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
-   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild lsp:languageclient
+   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild +lsp:languageclient
mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
python qbs:qbsprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
android? ( lsp )
boot2qt? ( remotelinux )
-   clang? ( test? ( qbs ) )
+   clang? ( lsp test? ( qbs ) )
mcu? ( baremetal cmake )
python? ( lsp )
qnx? ( remotelinux )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-22 Thread Davide Pesavento

commit: 9ba0be1a9a528038bd6892795905dea469df2cca
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 23 04:05:43 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba0be1a

dev-qt/qt-creator: merge qmldesigner and qmljs USE flags

And also put qmlpreview and qmlprojectmanager behind the new flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  5 +++--
 dev-qt/qt-creator/qt-creator-.ebuild | 16 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 8713dfe7612f..bdaf1a3ad21f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -17,7 +17,7 @@
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
Build plugin for Boot2Qt devices
-   Build clang-based plugins (code model, 
formatting, static analysis)
+   Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
Build plugin to integrate with the Conan 
package manager
@@ -27,7 +27,7 @@
Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
-   Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
+   Enable integration with 
Incredibuild
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
@@ -38,6 +38,7 @@
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
Build plugin for QBS-based projects
+   Build plugins for QML-based development 
(designer, editor, project manager)
Enable designer for QML/QtQuick-based 
UIs
Build the QML/JavaScript editor plugin
Build the QML profiler plugin

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 8db237c5577b..ceec86efbe12 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -28,8 +28,9 @@ QTC_PLUGINS=(android +autotest 
autotools:autotoolsprojectmanager baremetal bazaa
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild lsp:languageclient
mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
-   python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor 
qmlprofiler qnx remotelinux
-   scxml:scxmleditor serialterminal silversearcher subversion valgrind 
webassembly)
+   python qbs:qbsprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind
+   webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -38,7 +39,6 @@ REQUIRED_USE="
clang? ( test? ( qbs ) )
mcu? ( baremetal cmake )
python? ( lsp )
-   qmldesigner? ( qmljs )
qnx? ( remotelinux )
 "
 
@@ -97,7 +97,7 @@ RDEPEND="${CDEPEND}
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+   qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
silversearcher? ( sys-apps/the_silver_searcher )
subversion? ( dev-vcs/subversion )
valgrind? ( dev-util/valgrind )
@@ -123,7 +123,6 @@ src_prepare() {
# disable unwanted plugins
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
-   einfo "Disabling ${plugin%:*} plugin"
sed -i -re 
"s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
src/plugins/plugins.pro || die "failed to 
disable ${plugin%:*} plugin"
fi
@@ -150,14 +149,11 @@ src_prepare() {
sed -i -e '/tracing/d' src/libs/libs.pro 
tests/auto/auto.pro || die
fi
fi
-   if ! use qmldesigner; then
-   sed -i -e '/advanceddockingsystem/d' src/l

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-22 Thread Davide Pesavento

commit: 2c5e19cb0458cd43f3d5c3bdd4003b5e2e393ef5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 05:16:43 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5e19cb

dev-qt/qt-creator: always build clangsupport and sqlite internal libs

The CppEditor plugin, which is pretty fundamental, depends on them.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 68a5ec763cc6..8db237c5577b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -132,7 +132,7 @@ src_prepare() {
 
# avoid building unused support libraries and tools
if ! use clang; then
-   sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro 
|| die
+   sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
sed -i -e '/clangbackend/d' src/tools/tools.pro || die
fi
if ! use glsl; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: 045b7bf9c923a736f4c74cfd4295a1635d29814a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 01:40:33 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:41:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045b7bf9

dev-qt/qt-creator: drop RDEPEND on build tools

They are used as development tools in this context, and the
user/developer may want to use different versions from those
available via portage.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 78d1c1db6106..68a5ec763cc6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -93,13 +93,10 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
sys-devel/gdb[python]
-   autotools? ( sys-devel/autoconf )
-   cmake? ( >=dev-util/cmake-3.14 )
cppcheck? ( dev-util/cppcheck )
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
-   qbs? ( >=dev-util/qbs-1.18 )
qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
silversearcher? ( sys-apps/the_silver_searcher )
subversion? ( dev-vcs/subversion )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: 568743c8d27f89f9fb6e56d47ad59a3c9d2ab54c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 01:03:19 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568743c8

dev-qt/qt-creator: add USE 'conan' and 'docker'

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  4 +++-
 dev-qt/qt-creator/qt-creator-.ebuild | 10 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 97cf7cbe66cb..8713dfe7612f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,9 +20,11 @@
Build clang-based plugins (code model, 
formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
+   Build plugin to integrate with the Conan 
package manager
Enable integration with 
dev-util/cppcheck
Build the Chrome Trace Format 
visualizer plugin
Enable designer for QtWidgets-based 
UIs
+   Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
@@ -40,7 +42,7 @@
Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
-   Add support for deployment and 
execution on a remote Linux host
+   Build plugin for deployment and 
execution on a remote Linux host
Build the graphical SCXML editor 
plugin
Build the serial terminal 
plugin
Enable integration with 
sys-apps/the_silver_searcher

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index cce36015191f..78d1c1db6106 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -25,11 +25,11 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
-   ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild 
lsp:languageclient mcu:mcusupport
-   mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce 
perfprofiler python
-   qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx 
remotelinux scxml:scxmleditor
-   serialterminal silversearcher subversion valgrind webassembly)
+   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
+   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild lsp:languageclient
+   mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
+   python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor 
qmlprofiler qnx remotelinux
+   scxml:scxmleditor serialterminal silversearcher subversion valgrind 
webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: f3886fbdc84d842a71a7b4dc368751552f0963c1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:56:48 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3886fbd

dev-qt/qt-creator: add 'incredibuild' USE flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 3 ++-
 dev-qt/qt-creator/qt-creator-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 45e6f90bbd93..883d16da2741 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,7 +11,7 @@


Build plugin for Android devices
-   Enable integration with popular unit 
testing frameworks (QtTest, Google Test, Boost.Test)
+   Enable integration with popular unit 
testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)
Build plugin for autotools-based 
projects
Build plugin for bare metal 
devices
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
@@ -25,6 +25,7 @@
Enable designer for QtWidgets-based 
UIs
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
+   Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 0aebe5389afc..6dce0255fb7f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -26,8 +26,8 @@ LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
-   ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
-   modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+   ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild 
lsp:languageclient mcu:mcusupport
+   mercurial modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: ffec9566a4e4cbe86f85980659794097a2bc4be8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 00:22:37 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffec9566

dev-qt/qt-creator: add 'meson' USE flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 1 +
 dev-qt/qt-creator/qt-creator-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 883d16da2741..97cf7cbe66cb 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -29,6 +29,7 @@
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
+   Build plugin for Meson-based projects
Build the graphical model editor 
plugin
Build plugin for Nim language support
Add support for Perforce version control 
system (requires manual installation of Perforce client)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 6dce0255fb7f..cce36015191f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -27,9 +27,9 @@ SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild 
lsp:languageclient mcu:mcusupport
-   mercurial modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
-   +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
-   subversion valgrind webassembly)
+   mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce 
perfprofiler python
+   qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx 
remotelinux scxml:scxmleditor
+   serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: c5861188f31fff37dbb447f5ea2eb1ea7ccd3682
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:23:32 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5861188

dev-qt/qt-creator: allow clang 13

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b11ee8e89714..0aebe5389afc 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -68,6 +68,7 @@ CDEPEND="
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (
+   sys-devel/clang:13
sys-devel/clang:12
sys-devel/clang:11
)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: 9ac742a301f4b2f4c796964c010e47c9e50b83c7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:15:31 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac742a3

dev-qt/qt-creator: require syntax-highlighting >= 5.87

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9c177489fe96..b11ee8e89714 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -64,7 +64,7 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
-   kde-frameworks/syntax-highlighting:5
+   >=kde-frameworks/syntax-highlighting-5.87:5
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: a55f5d5cdf45ac7a350907f83aa6f907f3c2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:05:20 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55f5d5c

dev-qt/qt-creator: clang{refactoring,pchmanager} are completely gone

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 18260cba5420..9c177489fe96 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 "
 
 # minimum Qt version required
-QT_PV="5.14:5"
+QT_PV="5.15:5"
 
 BDEPEND="
>=dev-qt/linguist-tools-${QT_PV}
@@ -130,8 +130,7 @@ src_prepare() {
src/plugins/plugins.pro || die "failed to 
disable ${plugin%:*} plugin"
fi
done
-   sed -i -re 
'/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' 
src/plugins/plugins.pro || die
-   sed -i -re '/clang(pchmanager|refactoring)backend/d' 
src/tools/tools.pro || die
+   sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || 
die
 
# avoid building unused support libraries and tools
if ! use clang; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: 25b802bcfecca3ca93b279aee7e1ce843639243a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 20:09:19 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 20:09:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b802bc

dev-qt/qt-creator: USE=android requires lsp

Closes: https://bugs.gentoo.org/802372
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 1 +
 dev-qt/qt-creator/qt-creator-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index 1e0cae2ac46f..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest 
autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+   android? ( lsp )
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
mcu? ( baremetal cmake )

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 1e0cae2ac46f..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest 
autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+   android? ( lsp )
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
mcu? ( baremetal cmake )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento

commit: b8ff4e5c839462c4bfa518c9b6a42d1f156d3330
Author: Kritzmensch  gmail  com>
AuthorDate: Sun Nov 21 19:56:42 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 20:01:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ff4e5c

dev-qt/qt-creator: add 'baremetal' as a required dep for 'mcu'

Bug: https://bugs.gentoo.org/802372
Closes: https://github.com/gentoo/gentoo/pull/23019
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
-   mcu? ( cmake )
+   mcu? ( baremetal cmake )
python? ( lsp )
qmldesigner? ( qmljs )
qnx? ( remotelinux )

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
-   mcu? ( cmake )
+   mcu? ( baremetal cmake )
python? ( lsp )
qmldesigner? ( qmljs )
qnx? ( remotelinux )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2021-07-10 Thread Davide Pesavento

commit: 69c7ab38c931d19f61adb59bebadecc2ca598632
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:29:54 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:29:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c7ab38

dev-qt/qt-creator: remove half-broken 4.12.3-r1

Bug: https://bugs.gentoo.org/757756
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../files/qt-creator-4.12.0-dylib-fix.patch|  84 
 .../qt-creator-4.12.0-libclangformat-ide.patch |  64 --
 dev-qt/qt-creator/metadata.xml |   2 -
 dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild  | 235 -
 5 files changed, 386 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d88825421b0..975ecb0a7d2 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 
7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d
 SHA512 
48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
 DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3

diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch 
b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
deleted file mode 100644
index 0d4deb2c795..000
--- a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
-From: Peter Levine 
-Date: Tue, 5 May 2020 03:45:35 -0400
-Subject: [PATCH] Fix building against clang configured with
- CLANG_LINK_CLANG_DYLIB
-
-LLVM/Clang upstream only officially supports building shared
-components as a single dynamic library (via
-LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
-Linux distros like Fedora and Gentoo have followed suit.
-
-Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
-file assumes clang is built with separate component libraries
-and the build fails.
-
-This change alters the build to check for the existence
-of clang component libraries and, if found, link to them, or
-otherwise to libclang-cpp.
-
-Task-number: QTCREATORBUG-23172
-Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86

- src/shared/clang/clang_installation.pri | 35 +++--
- 1 file changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/shared/clang/clang_installation.pri 
b/src/shared/clang/clang_installation.pri
-index 08838838bca..c191c57f1c7 100644
 a/src/shared/clang/clang_installation.pri
-+++ b/src/shared/clang/clang_installation.pri
-@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
- }
- }
- 
--
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
--CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
--exists($$CLANGFORMAT_MAIN_HEADER) {
--CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
--ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
--   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerialization \
--   -lclangSema -lclangEdit -lclangAnalysis 
-lclangDriver -lclangDynamicASTMatchers \
--   -lclangASTMatchers -lclangAST -lclangLex 
-lclangBasic
--win32:CLANGFORMAT_LIBS += -lversion
--}
--}
--win32:ALL_CLANG_LIBS += -lversion
--
- LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
- !exists($$LIBCLANG_MAIN_HEADER) {
- $$llvmWarningOrError(\
-@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
- LIBCLANG_LIBS += $${CLANG_LIB}
- 
- 
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
-+CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
-+exists($$CLANGFORMAT_MAIN_HEADER) {
-+
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib)
 {
-+CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-+ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
-+   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerializ

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento

commit: 3985c100044bc6ae7e088951d8436dccbb827810
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:01:57 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:01:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3985c100

dev-qt/qt-creator: sync KEYWORDS

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 228e4f838dd..bfc4e05275d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -19,7 +19,7 @@ else
[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento

commit: a3345ca863b3f721acd8841249670c2fcba9616a
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 05:17:36 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:18:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3345ca8

dev-qt/qt-creator: add 4.15.1

Closes: https://bugs.gentoo.org/721720
Closes: https://bugs.gentoo.org/750527
Closes: https://github.com/gentoo/gentoo/pull/21278
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans Fredrik Nordhaug  gmail.com>
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 232 +
 2 files changed, 233 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2b32f1fba3a..d88825421b0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 
7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d
 SHA512 
48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
+DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
new file mode 100644
index 000..bfc4e05275d
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=12
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/";
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-opensource-src-${MY_PV}
+   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
+   S=${WORKDIR}/${MY_P}
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
+   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
+   ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
+   modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+   +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
+   subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+   boot2qt? ( remotelinux )
+   clang? ( test? ( qbs ) )
+   mcu? ( cmake )
+   python? ( lsp )
+   qmldesigner? ( qmljs )
+   qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.14:5"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-${QT_PV}
+   virtual/pkgconfig
+   doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+   >=dev-qt/qtconcurrent-${QT_PV}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+   >=dev-qt/qtgui-${QT_PV}
+   >=dev-qt/qtnetwork-${QT_PV}[ssl]
+   >=dev-qt/qtprintsupport-${QT_PV}
+   >=dev-qt/qtquickcontrols-${QT_PV}
+   >=dev-qt/qtscript-${QT_PV}
+   >=dev-qt/qtsql-${QT_PV}[sqlite]
+   >=dev-qt/qtsvg-${QT_PV}
+   >=dev-qt/qtwidgets-${QT_PV}
+   >=dev-qt/qtx11extras-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   kde-frameworks/syntax-highlighting:5
+   clang? (
+   >=dev-cpp/yaml-cpp-0.6.2:=
+   || (
+   sys-devel/clang:12
+   sys-devel/clang:11
+   )
+   =dev-qt/designer-${QT_PV} )
+   help? (
+   >=dev-qt/qthelp-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+   )
+   perfprofiler? ( dev-libs/elfutils )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+   test? (
+   >=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+   >=dev-qt/qtquickcontrols2-${QT_PV}
+   >=dev-qt/qttest-${QT_PV}
+   >=dev-qt/qtxmlpatterns-${QT_PV}[qml]
+   )
+"
+RDEPE

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento

commit: 18ac48856dec0d17c4dabd73bcdce52ec9531831
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 04:50:25 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ac4885

dev-qt/qt-creator: add hr translation

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b22ecdc136b..228e4f838dd 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento

commit: ed1763bf93e35fe1beea74462f7e153bbe057558
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:24:47 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1763bf

dev-qt/qt-creator: drop obsolete patch

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 18e67f9fc0b..057d48b9f9a 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -112,10 +112,6 @@ for x in ${PLOCALES}; do
 done
 unset x
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
-)
-
 llvm_check_deps() {
has_version -d "sys-devel/clang:${LLVM_SLOT}"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento

commit: 9a9f0f76ee082dbefed69111aa9d802e024662e2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 04:28:03 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9f0f76

dev-qt/qt-creator: require clang 11 or 12

Upstream recommends 11 or later

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9c70a14da51..b22ecdc136b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=10
+LLVM_MAX_SLOT=12
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/";
-LICENSE="GPL-3"
-SLOT="0"
 
 if [[ ${PV} == * ]]; then
inherit git-r3
@@ -20,12 +18,12 @@ else
MY_P=${PN}-opensource-src-${MY_PV}
[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+   KEYWORDS="~amd64 ~x86"
 fi
 
-# TODO: unbundle sqlite
-
+LICENSE="GPL-3"
+SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
@@ -69,8 +67,8 @@ CDEPEND="
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (
-   sys-devel/clang:10
-   sys-devel/clang:9
+   sys-devel/clang:12
+   sys-devel/clang:11
)

1 2 3 >

1 - 100 of 217 matches

Mail list logo