From 0c22deed5d2277304057c4e1f4eec99a02efbf63e9f05797ed0fc332aef98859 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 30 Sep 2022 18:33:05 +0000 Subject: [PATCH] Qt 6.4.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=26 --- linguist6.png | 3 +++ qt6-tools.changes | 11 +++++++++++ qt6-tools.spec | 17 ++++++++++++----- qttools-everywhere-src-6.3.2.tar.xz | 3 --- qttools-everywhere-src-6.4.0.tar.xz | 3 +++ 5 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 linguist6.png delete mode 100644 qttools-everywhere-src-6.3.2.tar.xz create mode 100644 qttools-everywhere-src-6.4.0.tar.xz diff --git a/linguist6.png b/linguist6.png new file mode 100644 index 0000000..d9a4b60 --- /dev/null +++ b/linguist6.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2e84fbec687192cbd274ed2c08d9287433be0a83e7d7ee447c5822fc68ee6b8 +size 1410 diff --git a/qt6-tools.changes b/qt6-tools.changes index fdb8c1b..470d233 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 29 10:36:06 UTC 2022 - Christophe Giboudeaux + +- Update to 6.4.0: + * https://www.qt.io/blog/qt-6.4-released + +------------------------------------------------------------------- +Fri Sep 16 08:29:22 UTC 2022 - Christophe Giboudeaux + +- Update to 6.4.0 RC + ------------------------------------------------------------------- Fri Sep 9 12:41:48 UTC 2022 - Christophe Giboudeaux diff --git a/qt6-tools.spec b/qt6-tools.spec index 2b7e5ce..78fe6a3 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -16,8 +16,8 @@ # -%define real_version 6.3.2 -%define short_version 6.3 +%define real_version 6.4.0 +%define short_version 6.4 %define tar_name qttools-everywhere-src %define tar_suffix %{nil} # @@ -27,7 +27,7 @@ %endif # Name: qt6-tools%{?pkg_suffix} -Version: 6.3.2 +Version: 6.4.0 Release: 0 Summary: Qt 6 Tools libraries and tools # TODO Check if it's still valid @@ -43,6 +43,8 @@ Source10: org.qt.designer6.desktop Source11: org.qt.linguist6.desktop Source12: org.qt.qdbusviewer6.desktop Source13: org.qt.assistant6.desktop +# The 48x48 icon was removed from qttools +Source14: linguist6.png Source99: qt6-tools-rpmlintrc # clang-devel in Leap 15.3 points to clang7... %if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150300 @@ -273,6 +275,7 @@ This library does not have any ABI or API guarantees. %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix} %build +%define _lto_cflags %{nil} %cmake_qt6 %{qt6_build} @@ -284,6 +287,9 @@ This library does not have any ABI or API guarantees. %{qt6_link_executables} +# CMake files are not needed for plugins (except for Qt6UiPlugin) +rm %{buildroot}%{_qt6_cmakedir}/Qt6Designer/*Plugin{Config,Targets}*.cmake + # Unused file. There are no private headers for this library rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_linguist_private.pri @@ -291,11 +297,12 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_linguist_private.pri %suse_update_desktop_file -i org.qt.assistant6 %suse_update_desktop_file -i org.qt.designer6 %suse_update_desktop_file -i org.qt.linguist6 +rm %{buildroot}%{_datadir}/pixmaps/linguist6.png %suse_update_desktop_file -i org.qt.qdbusviewer6 # Icons for the desktop files install -D -m644 src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer6.png -install -D -m644 src/linguist/linguist/images/icons/linguist-48-32.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/linguist6.png +install -D -m644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/linguist6.png install -D -m644 src/linguist/linguist/images/icons/linguist-128-32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/linguist6.png install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer6.png install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer6.png @@ -312,7 +319,7 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{ %postun -n libQt6UiTools6 -p /sbin/ldconfig %files -%license LICENSE.* +%license LICENSES/* %{_bindir}/pixeltool6 %{_bindir}/qdistancefieldgenerator6 %{_bindir}/qtdiag6 diff --git a/qttools-everywhere-src-6.3.2.tar.xz b/qttools-everywhere-src-6.3.2.tar.xz deleted file mode 100644 index b6bcdeb..0000000 --- a/qttools-everywhere-src-6.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5b07d2ffab68cebe935972506c88ffe1e4b7d24bdc28c67578dbc075799aed2 -size 8629400 diff --git a/qttools-everywhere-src-6.4.0.tar.xz b/qttools-everywhere-src-6.4.0.tar.xz new file mode 100644 index 0000000..63ba364 --- /dev/null +++ b/qttools-everywhere-src-6.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2 +size 8738432