The package rpms/qt5-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/qt5-qttools.git/commit/?id=ea8768...
https://src.fedoraproject.org/cgit/rpms/qt5-qttools.git/commit/?id=7f71ac....
Change:
-%ifarch armv7hl
+%ifarch armv7hl
Thanks.
Full change:
============
commit 2f0ec8a8cdd145fc357d1a157dc3092a966bfd1a
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Nov 24 07:54:16 2020 +0100
Rebuild for qtbase with -no-reduce-relocations option
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 52a9812..f219852 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -10,7 +10,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.15.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv3 or LGPLv2
Url:
http://www.qt.io
@@ -478,6 +478,9 @@ fi
%changelog
+* Tue Nov 24 07:54:16 CET 2020 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-2
+- Rebuild for qtbase with -no-reduce-relocations option
+
* Fri Nov 20 09:30:47 CET 2020 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-1
- 5.15.2
commit 7095c5d4f762910fe7106c6d1413a2af8b480cd4
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Nov 20 14:28:01 2020 +0100
Rebase clang patch
diff --git a/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
b/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
index e320d00..cc67686 100644
--- a/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
+++ b/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
@@ -1,80 +1,74 @@
-From 3dfe3b966f3fb069f258991b6a468816aab13908 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar(a)redhat.com>
-Date: Thu, 12 Dec 2019 22:47:04 +0000
-Subject: [PATCH] Link against libclang-cpp.so instead of the clang component
- libraries
-
----
- src/qdoc/configure.pri | 56 +-----------------------------------------
- 1 file changed, 1 insertion(+), 55 deletions(-)
-
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
-index e9d7667c..65470129 100644
+index 4f3d776..bcd2aae 100644
--- a/src/qdoc/configure.pri
+++ b/src/qdoc/configure.pri
-@@ -142,61 +142,7 @@ defineTest(qtConfTest_libclang) {
- CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore
- } else {
- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group
-- CLANG_LIBS += -lclangAnalysis \
-- -lclangApplyReplacements \
-- -lclangARCMigrate \
-- -lclangAST \
-- -lclangASTMatchers \
-- -lclangBasic \
-- -lclangChangeNamespace \
-- -lclangCodeGen \
-- -lclangCrossTU \
-- -lclangDaemon \
-- -lclangDriver \
-- -lclangDynamicASTMatchers \
-- -lclangEdit \
-- -lclangFormat \
-- -lclangFrontend \
-- -lclangFrontendTool \
-- -lclangHandleCXX \
-- -lclangIncludeFixer \
-- -lclangIncludeFixerPlugin \
-- -lclangIndex \
-- -lclangLex \
-- -lclangMove \
-- -lclangParse \
-- -lclangQuery \
-- -lclangReorderFields \
-- -lclangRewrite \
-- -lclangRewriteFrontend \
-- -lclangSema \
-- -lclangSerialization \
-- -lclang_static \
-- -lclangStaticAnalyzerCheckers \
-- -lclangStaticAnalyzerCore \
-- -lclangStaticAnalyzerFrontend \
-- -lclangTidy \
-- -lclangTidyAndroidModule \
-- -lclangTidyBoostModule \
-- -lclangTidyBugproneModule \
-- -lclangTidyCERTModule \
-- -lclangTidyCppCoreGuidelinesModule \
-- -lclangTidyFuchsiaModule \
-- -lclangTidyGoogleModule \
-- -lclangTidyHICPPModule \
-- -lclangTidyLLVMModule \
-- -lclangTidyMiscModule \
-- -lclangTidyModernizeModule \
-- -lclangTidyMPIModule \
-- -lclangTidyObjCModule \
-- -lclangTidyPerformanceModule \
-- -lclangTidyPlugin \
-- -lclangTidyReadabilityModule \
-- -lclangTidyUtils \
-- -lclangTooling \
-- -lclangToolingASTDiff \
-- -lclangToolingCore \
-- -lclangToolingRefactor \
+@@ -146,33 +146,6 @@ defineTest(qtConfTest_libclang) {
+ }
+ }
+ !equals(QMAKE_HOST.os, Darwin):!msvc: CLANG_LIBS+=-Wl,--start-group
+- CLANG_LIBS += -lclangAnalysis \
+- -lclangARCMigrate \
+- -lclangAST \
+- -lclangASTMatchers \
+- -lclangBasic \
+- -lclangCodeGen \
+- -lclangCrossTU \
+- -lclangDriver \
+- -lclangDynamicASTMatchers \
+- -lclangEdit \
+- -lclangFormat \
+- -lclangFrontend \
+- -lclangFrontendTool \
+- -lclangHandleCXX \
+- -lclangIndex \
+- -lclangLex \
+- -lclangParse \
+- -lclangRewrite \
+- -lclangRewriteFrontend \
+- -lclangSema \
+- -lclangSerialization \
+- -lclangStaticAnalyzerCheckers \
+- -lclangStaticAnalyzerCore \
+- -lclangStaticAnalyzerFrontend \
+- -lclangTooling \
+- -lclangToolingASTDiff \
+- -lclangToolingCore
+
+ versionIsAtLeast($$CLANG_VERSION, "10.0.0") {
+ equals(QMAKE_HOST.os, Windows): \
+@@ -187,34 +160,7 @@ defineTest(qtConfTest_libclang) {
+ else: \
+ CLANG_LIBS += -lclang_static
+
+- CLANG_LIBS += \
+- -lclangApplyReplacements \
+- -lclangChangeNamespace \
+- -lclangDaemon \
+- -lclangIncludeFixer \
+- -lclangIncludeFixerPlugin \
+- -lclangMove \
+- -lclangQuery \
+- -lclangReorderFields \
+- -lclangTidy \
+- -lclangTidyAndroidModule \
+- -lclangTidyBoostModule \
+- -lclangTidyBugproneModule \
+- -lclangTidyCERTModule \
+- -lclangTidyCppCoreGuidelinesModule \
+- -lclangTidyFuchsiaModule \
+- -lclangTidyGoogleModule \
+- -lclangTidyHICPPModule \
+- -lclangTidyLLVMModule \
+- -lclangTidyMiscModule \
+- -lclangTidyModernizeModule \
+- -lclangTidyMPIModule \
+- -lclangTidyObjCModule \
+- -lclangTidyPerformanceModule \
+- -lclangTidyPlugin \
+- -lclangTidyReadabilityModule \
+- -lclangTidyUtils \
+- -lclangToolingRefactor \
+ CLANG_LIBS += -lclang-cpp \
- -lfindAllSymbols \
- -lLLVMAArch64AsmParser \
- -lLLVMAArch64AsmPrinter \
---
-2.20.1
-
+ -lfindAllSymbols
+ }
+
commit 999edf6ab54e3bb4f4afe6c83becb6637bc84b69
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Nov 20 09:16:25 2020 +0100
5.15.2
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index b6f07ca..52a9812 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -9,8 +9,8 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
-Version: 5.15.1
-Release: 3%{?dist}
+Version: 5.15.2
+Release: 1%{?dist}
License: LGPLv3 or LGPLv2
Url:
http://www.qt.io
@@ -478,6 +478,9 @@ fi
%changelog
+* Fri Nov 20 09:30:47 CET 2020 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-1
+- 5.15.2
+
* Tue Oct 27 2020 Leigh Scott <leigh123linux(a)gmail.com> - 5.15.1-3
- Bump to fix hash issue on rpmfusion koji
commit 4c6d4f9d1a30e70f0dd1b21822bbe15d38b134ea
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Nov 20 09:16:25 2020 +0100
5.15.2
diff --git a/.gitignore b/.gitignore
index 938594f..e1df62b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/qttools-everywhere-src-5.13.2.tar.xz
/qttools-everywhere-src-5.14.2.tar.xz
/qttools-everywhere-src-5.15.1.tar.xz
+/qttools-everywhere-src-5.15.2.tar.xz
diff --git a/sources b/sources
index dead023..3da0e5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-5.15.1.tar.xz) =
8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
+SHA512 (qttools-everywhere-src-5.15.2.tar.xz) =
3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
commit fa83da79e5b7cda241f38103a0f7b6114c964067
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Oct 27 09:09:24 2020 +0000
Bump to fix hash issue on rpmfusion koji
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index afc6333..b6f07ca 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -10,7 +10,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.15.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv3 or LGPLv2
Url:
http://www.qt.io
@@ -478,6 +478,9 @@ fi
%changelog
+* Tue Oct 27 2020 Leigh Scott <leigh123linux(a)gmail.com> - 5.15.1-3
+- Bump to fix hash issue on rpmfusion koji
+
* Mon Oct 19 2020 Kalev Lember <klember(a)redhat.com> - 5.15.1-2
- Disable lto to work around lconvert segfaulting on armv7hl (#1884681)
commit ea8768acf71761872f851707392a43c4403ab5e3
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Oct 19 20:47:01 2020 +0200
Revert "Disable lto to work around lconvert segfaulting on armv7hl
(#1884681)"
My theory was wrong. It didn't help with stellarium build.
This reverts commit 7f71accce31680aceabb914ee8fd202b1b0e376c.
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index b21e785..afc6333 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -178,12 +178,6 @@ Requires: %{name}-common = %{version}-%{release}
%build
-# Disable lto to work around lconvert segfaulting on armv7hl
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1884681
-%ifarch armv7hl
-%define _lto_cflags %{nil}
-%endif
-
%{qmake_qt5} \
%{?no_examples}
commit 7f71accce31680aceabb914ee8fd202b1b0e376c
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Oct 19 16:14:46 2020 +0200
Disable lto to work around lconvert segfaulting on armv7hl (#1884681)
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 940ba73..b21e785 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -10,7 +10,7 @@
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.15.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv3 or LGPLv2
Url:
http://www.qt.io
@@ -178,6 +178,12 @@ Requires: %{name}-common = %{version}-%{release}
%build
+# Disable lto to work around lconvert segfaulting on armv7hl
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1884681
+%ifarch armv7hl
+%define _lto_cflags %{nil}
+%endif
+
%{qmake_qt5} \
%{?no_examples}
@@ -478,6 +484,9 @@ fi
%changelog
+* Mon Oct 19 2020 Kalev Lember <klember(a)redhat.com> - 5.15.1-2
+- Disable lto to work around lconvert segfaulting on armv7hl (#1884681)
+
* Thu Sep 10 2020 Jan Grulich <jgrulich(a)redhat.com> - 5.15.1-1
- 5.15.1