commit: 6efbe0b4f1713563754986f128d973206c7bc011 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Sep 26 22:26:53 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Sep 26 23:07:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efbe0b4
dev-qt/qttools: install .desktop files Not very worth a revbump considering 6.5.3 is around the corner, but does not hurt to have it for stable early as this just should not be missing. Descriptions and categories may need extra work, but should do for now. Also sync with live while revbumping. Closes: https://bugs.gentoo.org/914766 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> ...ols-6.5.2-r1.ebuild => qttools-6.5.2-r2.ebuild} | 58 +++++++++++++++++++++- dev-qt/qttools/qttools-6.5.9999.ebuild | 56 ++++++++++++++++++++- ...-6.6.0_rc.ebuild => qttools-6.6.0_rc-r1.ebuild} | 56 ++++++++++++++++++++- dev-qt/qttools/qttools-6.6.9999.ebuild | 56 ++++++++++++++++++++- dev-qt/qttools/qttools-6.9999.ebuild | 56 ++++++++++++++++++++- 5 files changed, 276 insertions(+), 6 deletions(-) diff --git a/dev-qt/qttools/qttools-6.5.2-r1.ebuild b/dev-qt/qttools/qttools-6.5.2-r2.ebuild similarity index 52% rename from dev-qt/qttools/qttools-6.5.2-r1.ebuild rename to dev-qt/qttools/qttools-6.5.2-r2.ebuild index a6ea17074dc0..eb3cbd1695fe 100644 --- a/dev-qt/qttools/qttools-6.5.2-r1.ebuild +++ b/dev-qt/qttools/qttools-6.5.2-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit llvm optfeature qt6-build +inherit desktop llvm optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - assistant clang designer distancefieldgenerator gles2-only + +assistant clang designer distancefieldgenerator gles2-only +linguist opengl pixeltool qdbus qdoc qml qtattributionsscanner qtdiag qtplugininfo vulkan +widgets " @@ -78,6 +78,60 @@ src_configure() { qt6-build_src_configure } +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild index bc3de1a1b659..a0a32fd588c3 100644 --- a/dev-qt/qttools/qttools-6.5.9999.ebuild +++ b/dev-qt/qttools/qttools-6.5.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit llvm optfeature qt6-build +inherit desktop llvm optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -78,6 +78,60 @@ src_configure() { qt6-build_src_configure } +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ diff --git a/dev-qt/qttools/qttools-6.6.0_rc.ebuild b/dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild similarity index 53% rename from dev-qt/qttools/qttools-6.6.0_rc.ebuild rename to dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild index 68421695ed36..16d3014acad0 100644 --- a/dev-qt/qttools/qttools-6.6.0_rc.ebuild +++ b/dev-qt/qttools/qttools-6.6.0_rc-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit llvm optfeature qt6-build +inherit desktop llvm optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -81,6 +81,60 @@ src_configure() { qt6-build_src_configure } +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild index 68421695ed36..16d3014acad0 100644 --- a/dev-qt/qttools/qttools-6.6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.6.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit llvm optfeature qt6-build +inherit desktop llvm optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -81,6 +81,60 @@ src_configure() { qt6-build_src_configure } +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \ diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 68421695ed36..16d3014acad0 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit llvm optfeature qt6-build +inherit desktop llvm optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -81,6 +81,60 @@ src_configure() { qt6-build_src_configure } +src_install() { + qt6-build_src_install + + if use widgets; then #914766 + use designer || use distancefieldgenerator || use pixeltool && + newicon src/designer/src/designer/images/designer.png designer6.png + + if use assistant; then + make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ + 'Qt;Development;Documentation' \ + 'Comment=Tool for viewing online documentation in Qt help file format' + newicon src/assistant/assistant/images/assistant-128.png assistant6.png + fi + + if use designer; then + make_desktop_entry designer6 'Qt 6 Designer' designer6 \ + 'Qt;Development;GUIDesigner' \ + 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' + fi + + if use distancefieldgenerator; then + # no icon, sharing with designer which fits letter-wise + make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for pregenerating the font cache of Qt applications' + fi + + if use linguist; then + make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ + 'Qt;Development;Translation' \ + 'Comment=Tool for translating Qt applications' + newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png + fi + + if use pixeltool; then + # no icon, not fitting but share with designer for now + make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ + 'Qt;Development' \ + 'Comment=Tool for zooming in the desktop area pointed by the cursor' + fi + + if use qdbus; then + make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ + 'Qt;Development' \ + 'Comment=Tool that lets introspect D-Bus objects and messages' + newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png + fi + + # hack: make_destop_entry does not support overriding DESCRIPTION + find "${ED}" -type f -name "*.desktop" \ + -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die + fi +} + pkg_postinst() { use assistant && optfeature "Qt documentation viewable in assistant" \
