commit:     83a9adaa9f856783d14efab4c917d8c5fd15c106
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 22 07:44:36 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 08:21:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a9adaa

dev-qt/designer: add Qt version to .desktop and icon file

Qt 6.10 added its own install targets for .desktop files, icons, and
metainfo and has unfortunately not added the version likely given
didn't have to worry about Qt5 as they did not install these but we
do manually. Rather than more complex changes in Qt6, change this
here instead. Odds are Qt will change this in Qt7.

Ideally would just drop this package given nobody really needs designer
from Qt5 anymore (like other tools such as GUI linguist that we already
dropped), but this package is also used to provide UiTools.

Bug: https://bugs.gentoo.org/966328
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../designer/{designer-5.15.18.ebuild => designer-5.15.18-r1.ebuild}  | 4 ++--
 dev-qt/qttools/qttools-6.10.1.ebuild                                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-qt/designer/designer-5.15.18.ebuild 
b/dev-qt/designer/designer-5.15.18-r1.ebuild
similarity index 87%
rename from dev-qt/designer/designer-5.15.18.ebuild
rename to dev-qt/designer/designer-5.15.18-r1.ebuild
index 949ea828a22b..fd14ed27d669 100644
--- a/dev-qt/designer/designer-5.15.18.ebuild
+++ b/dev-qt/designer/designer-5.15.18-r1.ebuild
@@ -44,8 +44,8 @@ src_install() {
        qt5-build_src_install
        qt5_symlink_binary_to_path designer 5
 
-       doicon -s 128 src/designer/src/designer/images/designer.png
-       make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 
'Qt;Development;GUIDesigner'
+       newicon -s 128 src/designer/src/designer/images/designer.png 
designer5.png
+       make_desktop_entry designer5 'Qt 5 Designer' designer5 
'Qt;Development;GUIDesigner'
 }
 
 pkg_postinst() {

diff --git a/dev-qt/qttools/qttools-6.10.1.ebuild 
b/dev-qt/qttools/qttools-6.10.1.ebuild
index 2d98daaaa476..f16f3c5a50a2 100644
--- a/dev-qt/qttools/qttools-6.10.1.ebuild
+++ b/dev-qt/qttools/qttools-6.10.1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
        designer? (
                ~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
                zstd? ( app-arch/zstd:= )
+               !<dev-qt/designer-6.15.18-r1
        )
        qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
        qdoc? (

Reply via email to