The package rpms/mingw-qt6-qttools.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mingw-qt6-qttools.git/commit/?id=....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 319e8d6063f18938c4e3b6b0f9317df0249898bf
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Wed Mar 30 23:38:07 2022 +0200
Make package arched
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index abcf626..c4f1d95 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -20,7 +20,7 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Qt6 for Windows - QtTools component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -67,7 +67,6 @@ Fedora Windows cross-compiler.
Summary: Qt6 for Windows - QtTools component
# Dependency for host tools
Requires: qt6-qttools-devel = %{version}%{?pre:~%pre}
-BuildArch: noarch
%description -n mingw32-qt6-%{qt_module}
This package contains the Qt software toolkit for developing
@@ -82,7 +81,6 @@ Fedora Windows cross-compiler.
Summary: Qt6 for Windows - QtTools component
# Dependency for host tools
Requires: qt6-qttools-devel = %{version}%{?pre:~%pre}
-BuildArch: noarch
%description -n mingw64-qt6-%{qt_module}
This package contains the Qt software toolkit for developing
@@ -238,6 +236,10 @@ ln -s %{_libdir}/cmake/Qt6LinguistTools
%{buildroot}%{mingw64_libdir}/cmake/Qt6L
%changelog
+* Wed Mar 30 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-7
+- Make package arched, otherwise symlink to native Qt6LinguistToolsMacros cmake
+ dir may point to the wrong location
+
* Wed Mar 30 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-6
- Link native Qt6LinguistToolsMacros cmake dir
- Add qt6 suffix to tools at cmake level
commit 2c61fda7a53a68d268e38166278545296b70b246
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Wed Mar 30 19:01:58 2022 +0200
Link native Qt6LinguistToolsMacros cmake dir, add qt6 suffix to tools at cmake level
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index ce8e036..abcf626 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -20,12 +20,15 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Qt6 for Windows - QtTools component
License: GPLv3 with exceptions or LGPLv2 with exceptions
URL:
http://qt.io/
+# Add qt6 suffix to tools to avoid collision with qt5 tools
+Patch0: qttools-qt6-suffix.patch
+
%if 0%{?commit:1}
Source0:
https://github.com/qt/%{qt_module}/archive/%{commit}/%{qt_module}-everywh...
%else
@@ -40,11 +43,15 @@ BuildRequires: mingw32-filesystem >= 96
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-qt6-qtactiveqt = %{version}
BuildRequires: mingw32-qt6-qtbase = %{version}
+BuildRequires: mingw32-qt6-qtdeclarative = %{version}
+BuildRequires: mingw32-vulkan-loader
BuildRequires: mingw64-filesystem >= 96
BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-qt6-qtactiveqt = %{version}
BuildRequires: mingw64-qt6-qtbase = %{version}
+BuildRequires: mingw64-qt6-qtdeclarative = %{version}
+BuildRequires: mingw64-vulkan-loader
%description
@@ -103,30 +110,22 @@ Fedora Windows cross-compiler.
%install
%mingw_ninja_install
-# Remove unversioned qtdiag
-rm %{buildroot}%{mingw32_bindir}/qtdiag.exe
-rm %{buildroot}%{mingw64_bindir}/qtdiag.exe
-
-# Add version suffix to qdbus/qdbusviewer
-mv %{buildroot}%{mingw32_bindir}/qdbus.exe %{buildroot}%{mingw32_bindir}/qdbus6.exe
-mv %{buildroot}%{mingw64_bindir}/qdbus.exe %{buildroot}%{mingw64_bindir}/qdbus6.exe
-mv %{buildroot}%{mingw32_bindir}/qdbusviewer.exe
%{buildroot}%{mingw32_bindir}/qdbusviewer6.exe
-mv %{buildroot}%{mingw64_bindir}/qdbusviewer.exe
%{buildroot}%{mingw64_bindir}/qdbusviewer6.exe
-mv %{buildroot}%{mingw32_bindir}/qtplugininfo.exe
%{buildroot}%{mingw32_bindir}/qtplugininfo6.exe
-mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/qtplugininfo6.exe
+# Link native Qt6LinguistToolsMacros
+ln -s %{_libdir}/cmake/Qt6LinguistTools
%{buildroot}%{mingw32_libdir}/cmake/Qt6LinguistTools
+ln -s %{_libdir}/cmake/Qt6LinguistTools
%{buildroot}%{mingw64_libdir}/cmake/Qt6LinguistTools
# Win32
%files -n mingw32-qt6-%{qt_module}
%license LICENSE.LGPL* LICENSE.GPL*
-%{mingw32_bindir}/qdbus6.exe
-%{mingw32_bindir}/qdbusviewer6.exe
+%{mingw32_bindir}/qdbus-qt6.exe
+%{mingw32_bindir}/qdbusviewer-qt6.exe
+%{mingw32_bindir}/qtdiag-qt6.exe
+%{mingw32_bindir}/qtplugininfo-qt6.exe
%{mingw32_bindir}/Qt6DesignerComponents.dll
%{mingw32_bindir}/Qt6Designer.dll
%{mingw32_bindir}/Qt6Help.dll
%{mingw32_bindir}/Qt6UiTools.dll
-%{mingw32_bindir}/qtdiag6.exe
-%{mingw32_bindir}/qtplugininfo6.exe
%{mingw32_includedir}/qt6/QtDesigner/
%{mingw32_includedir}/qt6/QtDesignerComponents/
%{mingw32_includedir}/qt6/QtHelp/
@@ -139,6 +138,7 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
%{mingw32_libdir}/cmake/Qt6/FindWrapLibClang.cmake
%{mingw32_libdir}/cmake/Qt6Help/
%{mingw32_libdir}/cmake/Qt6Linguist/
+%{mingw32_libdir}/cmake/Qt6LinguistTools
%{mingw32_libdir}/cmake/Qt6Tools/
%{mingw32_libdir}/cmake/Qt6UiPlugin/
%{mingw32_libdir}/cmake/Qt6UiTools/
@@ -179,14 +179,14 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
# Win64
%files -n mingw64-qt6-%{qt_module}
%license LICENSE.LGPL* LICENSE.GPL*
-%{mingw64_bindir}/qdbus6.exe
-%{mingw64_bindir}/qdbusviewer6.exe
+%{mingw64_bindir}/qdbus-qt6.exe
+%{mingw64_bindir}/qdbusviewer-qt6.exe
+%{mingw64_bindir}/qtdiag-qt6.exe
+%{mingw64_bindir}/qtplugininfo-qt6.exe
%{mingw64_bindir}/Qt6DesignerComponents.dll
%{mingw64_bindir}/Qt6Designer.dll
%{mingw64_bindir}/Qt6Help.dll
%{mingw64_bindir}/Qt6UiTools.dll
-%{mingw64_bindir}/qtdiag6.exe
-%{mingw64_bindir}/qtplugininfo6.exe
%{mingw64_includedir}/qt6/QtDesigner/
%{mingw64_includedir}/qt6/QtDesignerComponents/
%{mingw64_includedir}/qt6/QtHelp/
@@ -199,6 +199,7 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
%{mingw64_libdir}/cmake/Qt6/FindWrapLibClang.cmake
%{mingw64_libdir}/cmake/Qt6Help/
%{mingw64_libdir}/cmake/Qt6Linguist/
+%{mingw64_libdir}/cmake/Qt6LinguistTools
%{mingw64_libdir}/cmake/Qt6Tools/
%{mingw64_libdir}/cmake/Qt6UiPlugin/
%{mingw64_libdir}/cmake/Qt6UiTools/
@@ -237,6 +238,10 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
%changelog
+* Wed Mar 30 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-6
+- Link native Qt6LinguistToolsMacros cmake dir
+- Add qt6 suffix to tools at cmake level
+
* Mon Mar 28 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-5
- Remove leftover ExclusiveArch
diff --git a/qttools-qt6-suffix.patch b/qttools-qt6-suffix.patch
new file mode 100644
index 0000000..7179146
--- /dev/null
+++ b/qttools-qt6-suffix.patch
@@ -0,0 +1,50 @@
+diff -rupN --no-dereference qttools-everywhere-src-6.2.3/src/qdbus/qdbus/CMakeLists.txt
qttools-everywhere-src-6.2.3-new/src/qdbus/qdbus/CMakeLists.txt
+--- qttools-everywhere-src-6.2.3/src/qdbus/qdbus/CMakeLists.txt 2022-01-18
23:36:41.000000000 +0100
++++ qttools-everywhere-src-6.2.3-new/src/qdbus/qdbus/CMakeLists.txt 2022-03-30
17:44:48.106279494 +0200
+@@ -19,4 +19,5 @@ if(WIN32)
+ set_target_properties(qdbus PROPERTIES
+ WIN32_EXECUTABLE FALSE
+ )
++ set_target_properties(qdbus PROPERTIES OUTPUT_NAME "qdbus-qt6")
+ endif()
+diff -rupN --no-dereference
qttools-everywhere-src-6.2.3/src/qdbus/qdbusviewer/CMakeLists.txt
qttools-everywhere-src-6.2.3-new/src/qdbus/qdbusviewer/CMakeLists.txt
+--- qttools-everywhere-src-6.2.3/src/qdbus/qdbusviewer/CMakeLists.txt 2022-01-18
23:36:41.000000000 +0100
++++ qttools-everywhere-src-6.2.3-new/src/qdbus/qdbusviewer/CMakeLists.txt 2022-03-30
17:44:48.107279546 +0200
+@@ -60,4 +60,5 @@ if(WIN32)
+ set_target_properties(qdbusviewer PROPERTIES
+ QT_TARGET_RC_ICONS
"${CMAKE_CURRENT_SOURCE_DIR}/images/qdbusviewer.ico"
+ )
++ set_target_properties(qdbusviewer PROPERTIES OUTPUT_NAME
"qdbusviewer-qt6")
+ endif()
+diff -rupN --no-dereference qttools-everywhere-src-6.2.3/src/qtdiag/CMakeLists.txt
qttools-everywhere-src-6.2.3-new/src/qtdiag/CMakeLists.txt
+--- qttools-everywhere-src-6.2.3/src/qtdiag/CMakeLists.txt 2022-01-18 23:36:41.000000000
+0100
++++ qttools-everywhere-src-6.2.3-new/src/qtdiag/CMakeLists.txt 2022-03-30
17:44:48.107279546 +0200
+@@ -5,7 +5,6 @@
+ #####################################################################
+
+ qt_internal_add_app(qtdiag
+- INSTALL_VERSIONED_LINK
+ SOURCES
+ main.cpp
+ qtdiag.cpp qtdiag.h
+@@ -18,6 +17,8 @@ set_target_properties(qtdiag PROPERTIES
+ WIN32_EXECUTABLE FALSE
+ )
+
++set_target_properties(qtdiag PROPERTIES OUTPUT_NAME "qtdiag-qt6")
++
+ #### Keys ignored in scope 1:.:.:qtdiag.pro:<TRUE>:
+ # QT_FOR_CONFIG = "tools-private"
+ # _REQUIREMENTS = "qtConfig(qtdiag)"
+diff -rupN --no-dereference qttools-everywhere-src-6.2.3/src/qtplugininfo/CMakeLists.txt
qttools-everywhere-src-6.2.3-new/src/qtplugininfo/CMakeLists.txt
+--- qttools-everywhere-src-6.2.3/src/qtplugininfo/CMakeLists.txt 2022-01-18
23:36:41.000000000 +0100
++++ qttools-everywhere-src-6.2.3-new/src/qtplugininfo/CMakeLists.txt 2022-03-30
17:44:48.107279546 +0200
+@@ -12,6 +12,8 @@ set_target_properties(qtplugininfo PROPE
+ WIN32_EXECUTABLE FALSE
+ )
+
++set_target_properties(qtplugininfo PROPERTIES OUTPUT_NAME "qtplugininfo-qt6")
++
+ #### Keys ignored in scope 1:.:.:qtplugininfo.pro:<TRUE>:
+ # QT_FOR_CONFIG = "tools-private"
+ # _REQUIREMENTS = "qtConfig(qtplugininfo)"
commit 95dfbf3a6d919840326ad1d6dba4336b404fb0f2
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Mon Mar 28 09:05:01 2022 +0200
Bump spec
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index 16671b3..ce8e036 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -20,7 +20,7 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Qt6 for Windows - QtTools component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -237,6 +237,9 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
%changelog
+* Mon Mar 28 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-5
+- Remove leftover ExclusiveArch
+
* Fri Mar 25 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-4
- Rebuild with mingw-gcc-12
commit db15262f75bcc846d46820eff1cf97438e78c553
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Mon Mar 28 09:00:48 2022 +0200
Fix leftover ExcludeArch
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index abcb9b9..16671b3 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -61,8 +61,6 @@ Summary: Qt6 for Windows - QtTools component
# Dependency for host tools
Requires: qt6-qttools-devel = %{version}%{?pre:~%pre}
BuildArch: noarch
-# Native build is not available for s390x
-ExcludeArch: s390x
%description -n mingw32-qt6-%{qt_module}
This package contains the Qt software toolkit for developing
commit 2bb55a166e30975a564509203cf82254c6e8c14e
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Mon Mar 28 00:26:28 2022 +0200
Revert accidental commit
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index 3455b46..abcb9b9 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -98,9 +98,7 @@ Fedora Windows cross-compiler.
# Need -DFEATURE_windeployqt=OFF to avoid cmake aborting with Qt6::windeployqt target not
found
%mingw_cmake -GNinja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DFEATURE_windeployqt=OFF \
- -DQT_FEATURE_clang=ON \
- -DQT_FEATURE_clangcpp=${_clangcpp}
+ -DFEATURE_windeployqt=OFF
%mingw_ninja
commit 8aa84511aa44a27feaa26a310a7e85b57184ae85
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Fri Mar 25 14:44:35 2022 +0100
Rebuild with mingw-gcc-12
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index a5146ed..3455b46 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -20,7 +20,7 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Qt6 for Windows - QtTools component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -241,6 +241,9 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
%changelog
+* Fri Mar 25 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-4
+- Rebuild with mingw-gcc-12
+
* Sun Mar 06 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-3
- Re-enable s390x build
commit 8274e7e54c3fc85e61fa5210d0774caaf9500537
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Sun Mar 6 20:46:38 2022 +0100
Re-enable s390x build
diff --git a/mingw-qt6-qttools.spec b/mingw-qt6-qttools.spec
index 3f90b95..a5146ed 100644
--- a/mingw-qt6-qttools.spec
+++ b/mingw-qt6-qttools.spec
@@ -20,7 +20,7 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Qt6 for Windows - QtTools component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -96,7 +96,11 @@ Fedora Windows cross-compiler.
%build
# Need -DFEATURE_windeployqt=OFF to avoid cmake aborting with Qt6::windeployqt target not
found
-%mingw_cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_windeployqt=OFF
+%mingw_cmake -GNinja \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFEATURE_windeployqt=OFF \
+ -DQT_FEATURE_clang=ON \
+ -DQT_FEATURE_clangcpp=${_clangcpp}
%mingw_ninja
@@ -237,6 +241,9 @@ mv %{buildroot}%{mingw64_bindir}/qtplugininfo.exe
%{buildroot}%{mingw64_bindir}/
%changelog
+* Sun Mar 06 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-3
+- Re-enable s390x build
+
* Sat Feb 19 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-2
- Bump release