From 95b06051ae97a2751f77e5ba67d0fadf89929f86 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 18 Dec 2024 15:12:11 +0300 Subject: [PATCH] import qt6-qttools-6.8.1-2.el10 --- .gitignore | 2 +- .qt6-qttools.metadata | 2 +- SOURCES/io.qt.Designer.metainfo.xml | 45 ++++++++++++++++++++++ SOURCES/io.qt.Linguist.metainfo.xml | 43 +++++++++++++++++++++ SOURCES/io.qt.qdbusviewer.metainfo.xml | 40 ++++++++++++++++++++ SPECS/qt6-qttools.spec | 52 +++++++++++++++++++++++--- 6 files changed, 176 insertions(+), 8 deletions(-) create mode 100644 SOURCES/io.qt.Designer.metainfo.xml create mode 100644 SOURCES/io.qt.Linguist.metainfo.xml create mode 100644 SOURCES/io.qt.qdbusviewer.metainfo.xml diff --git a/.gitignore b/.gitignore index 066f3f2..701a755 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qttools-everywhere-src-6.7.1.tar.xz +SOURCES/qttools-everywhere-src-6.8.1.tar.xz diff --git a/.qt6-qttools.metadata b/.qt6-qttools.metadata index 6b875b3..32092ac 100644 --- a/.qt6-qttools.metadata +++ b/.qt6-qttools.metadata @@ -1 +1 @@ -3cc4b77444190293ba0b9a7895d779f7ef3e2f49 SOURCES/qttools-everywhere-src-6.7.1.tar.xz +b8ec9e68c33fcf75d40cbfaeeac2181f2f6598dd SOURCES/qttools-everywhere-src-6.8.1.tar.xz diff --git a/SOURCES/io.qt.Designer.metainfo.xml b/SOURCES/io.qt.Designer.metainfo.xml new file mode 100644 index 0000000..af89f37 --- /dev/null +++ b/SOURCES/io.qt.Designer.metainfo.xml @@ -0,0 +1,45 @@ + + + + io.qt.Designer + Qt Designer + Design GUIs for Qt applications + Erstelle GUIs for Qt Anwendungen + + The Qt Company + + CC0-1.0 + LGPL-3.0-only + Qt + +

Qt Designer lets you created and edit .ui files for your Qt Widgets Application

+

Mit Qt Designer kannst du .ui Dateien für deine Qt Anwendung erstellen und bearbeiten

+ + + + https://doc.qt.io/qt-6/images/designer-multiple-screenshot.png + + + https://doc.qt.io/qt-6/images/designer-screenshot.png + + + https://www.qt.io/ + https://bugreports.qt.io + https://doc.qt.io/qt-6/qtdesigner-manual.html + https://code.qt.io/cgit/qt/qttools.git/tree/src/designer + https://www.qt.io/community/contribute-to-qt + + Development + Qt + + + pointing + keyboard + + + qt6-designer.desktop + + designer + application/x-designer + + diff --git a/SOURCES/io.qt.Linguist.metainfo.xml b/SOURCES/io.qt.Linguist.metainfo.xml new file mode 100644 index 0000000..f5fd3f5 --- /dev/null +++ b/SOURCES/io.qt.Linguist.metainfo.xml @@ -0,0 +1,43 @@ + + + + io.qt.Linguist + Qt Linguist + Add translations to Qt applications + Übersetzungen zu Qt Programmen hinzufügen + + The Qt Company + + CC0-1.0 + LGPL-3.0-only + Qt + +

Qt Linguist allows you to translate Qt applications

+

Qt Linguist erlaubt dir Übersetzung von Qt Programmen

+ + + + The main window + Das Hauptfenster + https://raw.githubusercontent.com/flathub/io.qt.Linguist/78c853bd0488bf62e2042b2011d674e08dcf7b76/Screenshots/MainWindow.png + + + https://www.qt.io/ + https://code.qt.io/cgit/qt/qttools.git/tree/src/linguist/linguist + https://www.qt.io/community/contribute-to-qt + + Translation + Qt + + + pointing + keyboard + + + qt6-linguist.desktop + + linguist + text/vnd.trolltech.linguist + application/x-linguist + + diff --git a/SOURCES/io.qt.qdbusviewer.metainfo.xml b/SOURCES/io.qt.qdbusviewer.metainfo.xml new file mode 100644 index 0000000..619201b --- /dev/null +++ b/SOURCES/io.qt.qdbusviewer.metainfo.xml @@ -0,0 +1,40 @@ + + + + io.qt.qdbusviewer + Qt QDBusViewer + Debug D-Bus applications + + The Qt Company + + CC0-1.0 + LGPL-3.0-only + Qt + +

The Qt D-Bus Viewer is a tool that lets you introspect D-Bus objects and messages. You can choose between the system bus and the session bus.

+ + + + The Main Window + https://github.com/flathub/io.qt.qdbusviewer/blob/5df144729039a83d41d5c3e285e8d090884564a7/Screenshots/MainWindow.png?raw=true + + + https://www.qt.io/ + https://bugreports.qt.io + https://code.qt.io/cgit/qt/qttools.git/tree/src/qdbus/qdbusviewer + https://www.qt.io/community/contribute-to-qt + + Development + Debugger + Qt + + + pointing + keyboard + + + qt6-qdbusviewer.desktop + + qdbusviewer + + diff --git a/SPECS/qt6-qttools.spec b/SPECS/qt6-qttools.spec index 6b7bc58..d787471 100644 --- a/SPECS/qt6-qttools.spec +++ b/SPECS/qt6-qttools.spec @@ -7,11 +7,13 @@ %global examples 1 %global build_tests 1 +# disable once Qt7 is stable and providing the apps +%global metainfo 1 Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.7.1 -Release: 4%{?dist} +Version: 6.8.1 +Release: 2%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -38,11 +40,17 @@ Source21: designer.desktop Source22: linguist.desktop Source23: qdbusviewer.desktop +# borrowed from Flathub with adjustments for Fedora +Source31: io.qt.Designer.metainfo.xml +Source32: io.qt.Linguist.metainfo.xml +Source33: io.qt.qdbusviewer.metainfo.xml + BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: desktop-file-utils BuildRequires: /usr/bin/file +BuildRequires: libappstream-glib BuildRequires: qt6-rpm-macros >= %{version} BuildRequires: qt6-qtbase-private-devel BuildRequires: qt6-qtbase-static >= %{version} @@ -140,6 +148,7 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %if 0%{?examples} %package examples Summary: Programming examples for %{name} +Requires: %{name} = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description examples @@ -158,9 +167,9 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -%patch1 -p1 -b .run-qttools-with-qt6-suffix +%patch -P1 -p1 -b .run-qttools-with-qt6-suffix %ifarch %{mips32} -%patch2 -p1 -b .libatomic +%patch -P2 -p1 -b .libatomic %endif %build @@ -193,6 +202,12 @@ desktop-file-install \ --vendor="qt6" \ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} +%if 0%{?metainfo} +install -Dm0644 -t %{buildroot}%{_metainfodir} \ + %{SOURCE31} %{SOURCE32} %{SOURCE33} +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml +%endif + # icons install -m644 -p -D src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant-qt6.png install -m644 -p -D src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant-qt6.png @@ -252,6 +267,7 @@ popd %files +%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx %{_bindir}/qdbus-qt6 %{_qt6_bindir}/qdbus %{_qt6_bindir}/qdbus-qt6 @@ -285,6 +301,9 @@ popd %{_qt6_bindir}/qdistancefieldgenerator* %{_qt6_libexecdir}/qhelpgenerator* %{_qt6_libexecdir}/qtattributionsscanner* +%if 0%{?metainfo} +%{_metainfodir}/io.qt.Designer.metainfo.xml +%endif %files -n qt6-designer %{_bindir}/designer* @@ -310,12 +329,18 @@ popd %{_qt6_libexecdir}/lprodump* %{_qt6_libexecdir}/lrelease* %{_qt6_libexecdir}/lupdate* +%if 0%{?metainfo} +%{_metainfodir}/io.qt.Linguist.metainfo.xml +%endif %files -n qt6-qdbusviewer %{_bindir}/qdbusviewer* %{_qt6_bindir}/qdbusviewer* %{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* +%if 0%{?metainfo} +%{_metainfodir}/io.qt.qdbusviewer.metainfo.xml +%endif %files devel %{_bindir}/pixeltool* @@ -338,7 +363,6 @@ popd %{_qt6_libdir}/libQt6UiTools.so %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake -%dir %{_qt6_libdir}/cmake/Qt6Designer %{_qt6_libdir}/cmake/Qt6Designer/*.cmake %{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6QDocCatchPrivate @@ -394,9 +418,25 @@ popd %endif %changelog -* Tue Nov 26 2024 MSVSphere Packaging Team - 6.7.1-4 +* Wed Dec 18 2024 MSVSphere Packaging Team - 6.8.1-2 - Rebuilt for MSVSphere 10 +* Wed Dec 11 2024 Jan Grulich - 6.8.1-2 +- Add versioned deps to -examples + Resolves: RHEL-53982 + +* Fri Dec 06 2024 Jan Grulich - 6.8.1-1 +- 6.8.1 + Resolves: RHEL-53982 + +* Mon Nov 04 2024 Jan Grulich - 6.7.1 -6 +- Fix build against LLVM 19 + Resolves: RHEL-64941 + +* Tue Oct 29 2024 Troy Dawson - 6.7.1-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Mon Jun 24 2024 Troy Dawson - 6.7.1-4 - Bump release for June 2024 mass rebuild