The package rpms/mingw-qt6-qtdeclarative.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-qtdeclarative.git/commi....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit f5093528262f780d5755000b2e133d0a041c0185
Merge: 019a975 e674711
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Wed Mar 30 20:06:31 2022 +0200
Merge branch 'rawhide' into f35
commit e6747114236a1c2ba5d0d50f98b0d3d88b1769fe
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Wed Mar 30 17:36:08 2022 +0200
Add qt6 suffix to tools to avoid collision with qt5 tools
diff --git a/mingw-qt6-qtdeclarative.spec b/mingw-qt6-qtdeclarative.spec
index 2f6219e..b72a560 100644
--- a/mingw-qt6-qtdeclarative.spec
+++ b/mingw-qt6-qtdeclarative.spec
@@ -20,7 +20,7 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Qt6 for Windows - QtDeclarative component
License: LGPLv3 or GPLv2
@@ -32,6 +32,8 @@ Source0:
https://github.com/qt/%{qt_module}/archive/%{commit}/%{qt_module
Source0:
http://download.qt.io/%{?pre:development}%{?!pre:official}_releases/qt/%{...
%endif
+# Add qt6 suffix to tools to avoid collision with qt5 tools
+Patch0: qtdeclarative-qt6-suffix.patch
BuildRequires: cmake
BuildRequires: ninja-build
@@ -113,9 +115,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/
# Win32
%files -n mingw32-qt6-%{qt_module}
%license LICENSE.LGPL* LICENSE.GPL*
-%{mingw32_bindir}/qml.exe
-%{mingw32_bindir}/qmlpreview.exe
-%{mingw32_bindir}/qmlscene.exe
+%{mingw32_bindir}/qml-qt6.exe
+%{mingw32_bindir}/qmlpreview-qt6.exe
+%{mingw32_bindir}/qmlscene-qt6.exe
%{mingw32_bindir}/Qt6LabsAnimation.dll
%{mingw32_bindir}/Qt6LabsFolderListModel.dll
%{mingw32_bindir}/Qt6LabsQmlModels.dll
@@ -424,9 +426,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/
# Win64
%files -n mingw64-qt6-%{qt_module}
%license LICENSE.LGPL* LICENSE.GPL*
-%{mingw64_bindir}/qml.exe
-%{mingw64_bindir}/qmlpreview.exe
-%{mingw64_bindir}/qmlscene.exe
+%{mingw64_bindir}/qml-qt6.exe
+%{mingw64_bindir}/qmlpreview-qt6.exe
+%{mingw64_bindir}/qmlscene-qt6.exe
%{mingw64_bindir}/Qt6LabsAnimation.dll
%{mingw64_bindir}/Qt6LabsFolderListModel.dll
%{mingw64_bindir}/Qt6LabsQmlModels.dll
@@ -733,6 +735,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/
%changelog
+* Wed Mar 30 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-3
+- Add qt6 suffix to tools to avoid collision with qt5 tools
+
* Fri Mar 25 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-3
- Rebuild with mingw-gcc-12
diff --git a/qtdeclarative-qt6-suffix.patch b/qtdeclarative-qt6-suffix.patch
new file mode 100644
index 0000000..5e952bd
--- /dev/null
+++ b/qtdeclarative-qt6-suffix.patch
@@ -0,0 +1,34 @@
+diff -rupN qtdeclarative-everywhere-src-6.2.3/tools/qml/CMakeLists.txt
qtdeclarative-everywhere-src-6.2.3-new/tools/qml/CMakeLists.txt
+--- qtdeclarative-everywhere-src-6.2.3/tools/qml/CMakeLists.txt 2022-01-18
16:35:56.000000000 +0100
++++ qtdeclarative-everywhere-src-6.2.3-new/tools/qml/CMakeLists.txt 2022-03-30
16:52:24.640738722 +0200
+@@ -15,6 +15,7 @@ qt_internal_add_app(qml
+ )
+
+ set_target_properties(qml PROPERTIES WIN32_EXECUTABLE FALSE)
++set_target_properties(qml PROPERTIES OUTPUT_NAME "qml-qt6")
+
+ set_source_files_properties(
+ conf/default.qml
+diff -rupN qtdeclarative-everywhere-src-6.2.3/tools/qmlpreview/CMakeLists.txt
qtdeclarative-everywhere-src-6.2.3-new/tools/qmlpreview/CMakeLists.txt
+--- qtdeclarative-everywhere-src-6.2.3/tools/qmlpreview/CMakeLists.txt 2022-01-18
16:35:56.000000000 +0100
++++ qtdeclarative-everywhere-src-6.2.3-new/tools/qmlpreview/CMakeLists.txt 2022-03-30
16:52:44.317781209 +0200
+@@ -17,5 +17,7 @@ qt_internal_add_app(qmlpreview
+
+ set_target_properties(qmlpreview PROPERTIES WIN32_EXECUTABLE FALSE)
+
++set_target_properties(qmlpreview PROPERTIES OUTPUT_NAME "qmlpreview-qt6")
++
+ #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>:
+ # QMAKE_TARGET_DESCRIPTION = "QML" "Preview"
+diff -rupN qtdeclarative-everywhere-src-6.2.3/tools/qmlscene/CMakeLists.txt
qtdeclarative-everywhere-src-6.2.3-new/tools/qmlscene/CMakeLists.txt
+--- qtdeclarative-everywhere-src-6.2.3/tools/qmlscene/CMakeLists.txt 2022-01-18
16:35:56.000000000 +0100
++++ qtdeclarative-everywhere-src-6.2.3-new/tools/qmlscene/CMakeLists.txt 2022-03-30
16:53:00.600643875 +0200
+@@ -21,6 +21,8 @@ qt_internal_add_app(qmlscene
+
+ set_target_properties(qmlscene PROPERTIES WIN32_EXECUTABLE FALSE)
+
++set_target_properties(qmlscene PROPERTIES OUTPUT_NAME "qmlscene-qt6")
++
+ #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
+ # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer"
+
commit 6335e430abf33ff5383cd4faa457b5c9f3d82577
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Fri Mar 25 14:43:01 2022 +0100
Rebuild with mingw-gcc-12
diff --git a/mingw-qt6-qtdeclarative.spec b/mingw-qt6-qtdeclarative.spec
index c8b860f..2f6219e 100644
--- a/mingw-qt6-qtdeclarative.spec
+++ b/mingw-qt6-qtdeclarative.spec
@@ -20,7 +20,7 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Qt6 for Windows - QtDeclarative component
License: LGPLv3 or GPLv2
@@ -733,6 +733,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/
%changelog
+* Fri Mar 25 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-3
+- Rebuild with mingw-gcc-12
+
* Sat Mar 05 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-2
- Re-enable s390x build
commit 4e3df7ca04f4f56c9fc6c27fbb8aa66d7408e7ac
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Sun Mar 6 00:23:58 2022 +0100
Re-enable s390x build
diff --git a/mingw-qt6-qtdeclarative.spec b/mingw-qt6-qtdeclarative.spec
index 9ed23db..c8b860f 100644
--- a/mingw-qt6-qtdeclarative.spec
+++ b/mingw-qt6-qtdeclarative.spec
@@ -20,10 +20,8 @@
Name: mingw-qt6-%{qt_module}
Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Qt6 for Windows - QtDeclarative component
-# Native build is not available for s390x
-ExcludeArch: s390x
License: LGPLv3 or GPLv2
URL:
http://qt.io/
@@ -735,6 +733,9 @@ rm -rf %{buildroot}%{mingw64_libdir}/objects-RelWithDebInfo/
%changelog
+* Sat Mar 05 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-2
+- Re-enable s390x build
+
* Tue Feb 08 2022 Sandro Mani <manisandro(a)gmail.com> - 6.2.3-1
- Update to 6.2.3