Architecture specific change in rpms/qt6-qt3d.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qt3d.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/qt6-qt3d.git/commit/?id=8330165e7....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 8330165e72f4a79e74a341341586fe6185d94f73
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Feb 25 14:54:45 2022 +0100
Enable s390x builds
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index 5c8a1a7..030e0e5 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
%global qt_module qt3d
@@ -12,7 +9,7 @@ ExcludeArch: s390x
Summary: Qt6 - Qt3D QML bindings and C++ APIs
Name: qt6-%{qt_module}
Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://doc.qt.io/qt-5/licensing.html
@@ -202,6 +199,9 @@ popd
%changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2
+- Enable s390x builds
+
* Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1
- 6.2.3
2 years, 1 month
Architecture specific change in rpms/qt6-qttools.git
by githook-noreply@fedoraproject.org
The package rpms/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/qt6-qttools.git/commit/?id=0a9a59....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 51433c58ada8be18cb7b4c6b3fb74a5c64d6028a
Merge: 1b966af 0a9a59f
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Mar 6 19:52:49 2022 +0100
Merge branch 'f36' into f35
commit 0a9a59f19857d9b6618e727826ea23024b29f762
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Feb 25 14:54:45 2022 +0100
Enable s390x builds
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 0e74fae..7757111 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
%global qt_module qttools
@@ -12,7 +9,7 @@ ExcludeArch: s390x
Summary: Qt6 - QtTool components
Name: qt6-qttools
Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv3 or LGPLv2
Url: http://www.qt.io
@@ -373,6 +370,9 @@ popd
%changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2
+- Enable s390x builds
+
* Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1
- 6.2.3
2 years, 1 month
Architecture specific change in rpms/qt6-qtdeclarative.git
by githook-noreply@fedoraproject.org
The package rpms/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/qt6-qtdeclarative.git/commit/?id=....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 43f02cf33079e29d5b604949c11a96ba19be5ecb
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Feb 25 14:54:45 2022 +0100
Enable s390x builds
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index a4adb8d..63eb442 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
%global qt_module qtdeclarative
@@ -15,7 +12,7 @@ ExcludeArch: s390x
Summary: Qt6 - QtDeclarative component
Name: qt6-%{qt_module}
Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -313,6 +310,9 @@ make check -k -C tests ||:
%changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2
+- Enable s390x builds
+
* Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1
- 6.2.3
2 years, 1 month
Architecture specific change in rpms/qt6-qtshadertools.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtshadertools.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/qt6-qtshadertools.git/commit/?id=....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 1c371069dc4468df88cf9ddc03e513c2d3cb3551
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Feb 25 16:16:37 2022 +0100
Backport glslang and SPIRV-tools patches for S390x builds
diff --git a/0001-Fix-encoding-decoding-of-string-literals-for-big-end.patch b/0001-Fix-encoding-decoding-of-string-literals-for-big-end.patch
new file mode 100644
index 0000000..c7de612
--- /dev/null
+++ b/0001-Fix-encoding-decoding-of-string-literals-for-big-end.patch
@@ -0,0 +1,192 @@
+From 3a02861bc965cddb5bca910eaa11d57e23f2ef2c Mon Sep 17 00:00:00 2001
+From: Marius Hillenbrand <mhillen(a)linux.ibm.com>
+Date: Tue, 19 Oct 2021 18:09:52 +0200
+Subject: [PATCH 1/3] Fix encoding/decoding of string literals for big-endian
+ systems
+
+Per SPIR-V spec, a string literal's UTF-8 octets are encoded packed into
+words with little-endian convention. Explicitly perform that encoding
+instead of assuming that the host system is little-endian.
+
+Note that this change requires corresponding fixes in SPIRV-Tools.
+
+Fixes #202
+---
+ src/3rdparty/glslang/SPIRV/SPVRemapper.cpp | 18 ++++++---
+ src/3rdparty/glslang/SPIRV/disassemble.cpp | 47 ++++++++++++++--------
+ src/3rdparty/glslang/SPIRV/spvIR.h | 22 +++++-----
+ 3 files changed, 52 insertions(+), 35 deletions(-)
+
+diff --git a/src/3rdparty/glslang/SPIRV/SPVRemapper.cpp b/src/3rdparty/glslang/SPIRV/SPVRemapper.cpp
+index 56d7f43..3d09c89 100644
+--- a/src/3rdparty/glslang/SPIRV/SPVRemapper.cpp
++++ b/src/3rdparty/glslang/SPIRV/SPVRemapper.cpp
+@@ -297,15 +297,21 @@ namespace spv {
+ std::string spirvbin_t::literalString(unsigned word) const
+ {
+ std::string literal;
++ const spirword_t * pos = spv.data() + word;
+
+ literal.reserve(16);
+
+- const char* bytes = reinterpret_cast<const char*>(spv.data() + word);
+-
+- while (bytes && *bytes)
+- literal += *bytes++;
+-
+- return literal;
++ do {
++ spirword_t word = *pos;
++ for (int i = 0; i < 4; i++) {
++ char c = word & 0xff;
++ if (c == '\0')
++ return literal;
++ literal += c;
++ word >>= 8;
++ }
++ pos++;
++ } while (true);
+ }
+
+ void spirvbin_t::applyMap()
+diff --git a/src/3rdparty/glslang/SPIRV/disassemble.cpp b/src/3rdparty/glslang/SPIRV/disassemble.cpp
+index 73c988c..74dd605 100644
+--- a/src/3rdparty/glslang/SPIRV/disassemble.cpp
++++ b/src/3rdparty/glslang/SPIRV/disassemble.cpp
+@@ -43,6 +43,7 @@
+ #include <stack>
+ #include <sstream>
+ #include <cstring>
++#include <utility>
+
+ #include "disassemble.h"
+ #include "doc.h"
+@@ -100,6 +101,7 @@ protected:
+ void outputMask(OperandClass operandClass, unsigned mask);
+ void disassembleImmediates(int numOperands);
+ void disassembleIds(int numOperands);
++ std::pair<int, std::string> decodeString();
+ int disassembleString();
+ void disassembleInstruction(Id resultId, Id typeId, Op opCode, int numOperands);
+
+@@ -290,31 +292,44 @@ void SpirvStream::disassembleIds(int numOperands)
+ }
+ }
+
+-// return the number of operands consumed by the string
+-int SpirvStream::disassembleString()
++// decode string from words at current position (non-consuming)
++std::pair<int, std::string> SpirvStream::decodeString()
+ {
+- int startWord = word;
+-
+- out << " \"";
+-
+- const char* wordString;
++ std::string res;
++ int wordPos = word;
++ char c;
+ bool done = false;
++
+ do {
+- unsigned int content = stream[word];
+- wordString = (const char*)&content;
++ unsigned int content = stream[wordPos];
+ for (int charCount = 0; charCount < 4; ++charCount) {
+- if (*wordString == 0) {
++ c = content & 0xff;
++ content >>= 8;
++ if (c == '\0') {
+ done = true;
+ break;
+ }
+- out << *(wordString++);
++ res += c;
+ }
+- ++word;
+- } while (! done);
++ ++wordPos;
++ } while(! done);
++
++ return std::make_pair(wordPos - word, res);
++}
++
++// return the number of operands consumed by the string
++int SpirvStream::disassembleString()
++{
++ out << " \"";
+
++ std::pair<int, std::string> decoderes = decodeString();
++
++ out << decoderes.second;
+ out << "\"";
+
+- return word - startWord;
++ word += decoderes.first;
++
++ return decoderes.first;
+ }
+
+ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode, int numOperands)
+@@ -331,7 +346,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
+ nextNestedControl = 0;
+ }
+ } else if (opCode == OpExtInstImport) {
+- idDescriptor[resultId] = (const char*)(&stream[word]);
++ idDescriptor[resultId] = decodeString().second;
+ }
+ else {
+ if (resultId != 0 && idDescriptor[resultId].size() == 0) {
+@@ -428,7 +443,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
+ --numOperands;
+ // Get names for printing "(XXX)" for readability, *after* this id
+ if (opCode == OpName)
+- idDescriptor[stream[word - 1]] = (const char*)(&stream[word]);
++ idDescriptor[stream[word - 1]] = decodeString().second;
+ break;
+ case OperandVariableIds:
+ disassembleIds(numOperands);
+diff --git a/src/3rdparty/glslang/SPIRV/spvIR.h b/src/3rdparty/glslang/SPIRV/spvIR.h
+index 486e80d..5249a5b 100755
+--- a/src/3rdparty/glslang/SPIRV/spvIR.h
++++ b/src/3rdparty/glslang/SPIRV/spvIR.h
+@@ -111,27 +111,23 @@ public:
+
+ void addStringOperand(const char* str)
+ {
+- unsigned int word;
+- char* wordString = (char*)&word;
+- char* wordPtr = wordString;
+- int charCount = 0;
++ unsigned int word = 0;
++ unsigned int shiftAmount = 0;
+ char c;
++
+ do {
+ c = *(str++);
+- *(wordPtr++) = c;
+- ++charCount;
+- if (charCount == 4) {
++ word |= ((unsigned int)c) << shiftAmount;
++ shiftAmount += 8;
++ if (shiftAmount == 32) {
+ addImmediateOperand(word);
+- wordPtr = wordString;
+- charCount = 0;
++ word = 0;
++ shiftAmount = 0;
+ }
+ } while (c != 0);
+
+ // deal with partial last word
+- if (charCount > 0) {
+- // pad with 0s
+- for (; charCount < 4; ++charCount)
+- *(wordPtr++) = 0;
++ if (shiftAmount > 0) {
+ addImmediateOperand(word);
+ }
+ }
+--
+2.35.1
+
diff --git a/0002-TIntermediate-promoteConstantUnion-fix-conversion-to.patch b/0002-TIntermediate-promoteConstantUnion-fix-conversion-to.patch
new file mode 100644
index 0000000..5748ef2
--- /dev/null
+++ b/0002-TIntermediate-promoteConstantUnion-fix-conversion-to.patch
@@ -0,0 +1,33 @@
+From 1d5124efb3bc7173ec6f9961a865f2e167f5198f Mon Sep 17 00:00:00 2001
+From: Marius Hillenbrand <mhillen(a)linux.ibm.com>
+Date: Wed, 10 Nov 2021 18:10:58 +0100
+Subject: [PATCH 2/3] TIntermediate::promoteConstantUnion(): fix conversion to
+ int8
+
+The signedness of type char is implementation-defined in C++. The
+conversion to (signed) int8 currently uses a cast to char, which is
+undefined for negative values when the type char is implemented as
+unsigned. Thus, fix to cast to "signed char", which has the intended
+semantic on all implementations.
+
+Fixes #2807
+---
+ .../glslang/glslang/MachineIndependent/Intermediate.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/glslang/glslang/MachineIndependent/Intermediate.cpp b/src/3rdparty/glslang/glslang/MachineIndependent/Intermediate.cpp
+index 84b4c55..89538ea 100644
+--- a/src/3rdparty/glslang/glslang/MachineIndependent/Intermediate.cpp
++++ b/src/3rdparty/glslang/glslang/MachineIndependent/Intermediate.cpp
+@@ -3867,7 +3867,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC
+ case EbtFloat16: PROMOTE(setDConst, double, Get); break; \
+ case EbtFloat: PROMOTE(setDConst, double, Get); break; \
+ case EbtDouble: PROMOTE(setDConst, double, Get); break; \
+- case EbtInt8: PROMOTE(setI8Const, char, Get); break; \
++ case EbtInt8: PROMOTE(setI8Const, signed char, Get); break; \
+ case EbtInt16: PROMOTE(setI16Const, short, Get); break; \
+ case EbtInt: PROMOTE(setIConst, int, Get); break; \
+ case EbtInt64: PROMOTE(setI64Const, long long, Get); break; \
+--
+2.35.1
+
diff --git a/0003-Use-intermOut.cpp-s-IsNan-and-IsInfinity-for-parse-t.patch b/0003-Use-intermOut.cpp-s-IsNan-and-IsInfinity-for-parse-t.patch
new file mode 100644
index 0000000..2fa1329
--- /dev/null
+++ b/0003-Use-intermOut.cpp-s-IsNan-and-IsInfinity-for-parse-t.patch
@@ -0,0 +1,177 @@
+From 7282f8b715bfa2622eb9663f917f639a73e5d102 Mon Sep 17 00:00:00 2001
+From: Marius Hillenbrand <mhillen(a)linux.ibm.com>
+Date: Tue, 9 Nov 2021 16:31:22 +0100
+Subject: [PATCH 3/3] Use intermOut.cpp's IsNan and IsInfinity for parse-time
+ constant folding (updated)
+
+There were two implementations of isInf() and isNan(), in Constant.cpp
+and in intermOut.cpp. The former only works on little-endian systems,
+the latter is a wrapper for library functions and works regardless of
+endianness. Move the second version into Common.h and adopt it in both
+places. Thereby avoid the duplication and fix for big-endian systems.
+
+A previous commit with the same intent and purpose had missed a required
+header for builds on Windows.
+
+On s390x, this fixes the test case
+Glsl/CompileToAstTest.FromFile/constFold_frag.
+
+Fixes #2802
+---
+ src/3rdparty/glslang/glslang/Include/Common.h | 34 +++++++++++++++++++
+ .../glslang/MachineIndependent/Constant.cpp | 33 ++----------------
+ .../glslang/MachineIndependent/intermOut.cpp | 31 -----------------
+ 3 files changed, 36 insertions(+), 62 deletions(-)
+
+diff --git a/src/3rdparty/glslang/glslang/Include/Common.h b/src/3rdparty/glslang/glslang/Include/Common.h
+index 115f6f7..5b2dae6 100644
+--- a/src/3rdparty/glslang/glslang/Include/Common.h
++++ b/src/3rdparty/glslang/glslang/Include/Common.h
+@@ -39,6 +39,11 @@
+
+ #include <algorithm>
+ #include <cassert>
++#ifdef _MSC_VER
++#include <cfloat>
++#else
++#include <cmath>
++#endif
+ #include <cstdio>
+ #include <cstdlib>
+ #include <list>
+@@ -288,6 +293,35 @@ template <class T> bool IsMultipleOfPow2(T number, int powerOf2)
+ return ! (number & (powerOf2 - 1));
+ }
+
++inline bool IsInfinity(double x) {
++#ifdef _MSC_VER
++ switch (_fpclass(x)) {
++ case _FPCLASS_NINF:
++ case _FPCLASS_PINF:
++ return true;
++ default:
++ return false;
++ }
++#else
++ return std::isinf(x);
++#endif
++}
++
++inline bool IsNan(double x) {
++#ifdef _MSC_VER
++ switch (_fpclass(x)) {
++ case _FPCLASS_SNAN:
++ case _FPCLASS_QNAN:
++ return true;
++ default:
++ return false;
++ }
++#else
++ return std::isnan(x);
++#endif
++}
++
++
+ } // end namespace glslang
+ } // namespace QtShaderTools
+
+diff --git a/src/3rdparty/glslang/glslang/MachineIndependent/Constant.cpp b/src/3rdparty/glslang/glslang/MachineIndependent/Constant.cpp
+index 23c511e..1b23d68 100644
+--- a/src/3rdparty/glslang/glslang/MachineIndependent/Constant.cpp
++++ b/src/3rdparty/glslang/glslang/MachineIndependent/Constant.cpp
+@@ -46,35 +46,6 @@ namespace {
+ using namespace QtShaderTools;
+ using namespace glslang;
+
+-typedef union {
+- double d;
+- int i[2];
+-} DoubleIntUnion;
+-
+-// Some helper functions
+-
+-bool isNan(double x)
+-{
+- DoubleIntUnion u;
+- // tough to find a platform independent library function, do it directly
+- u.d = x;
+- int bitPatternL = u.i[0];
+- int bitPatternH = u.i[1];
+- return (bitPatternH & 0x7ff80000) == 0x7ff80000 &&
+- ((bitPatternH & 0xFFFFF) != 0 || bitPatternL != 0);
+-}
+-
+-bool isInf(double x)
+-{
+- DoubleIntUnion u;
+- // tough to find a platform independent library function, do it directly
+- u.d = x;
+- int bitPatternL = u.i[0];
+- int bitPatternH = u.i[1];
+- return (bitPatternH & 0x7ff00000) == 0x7ff00000 &&
+- (bitPatternH & 0xFFFFF) == 0 && bitPatternL == 0;
+-}
+-
+ const double pi = 3.1415926535897932384626433832795;
+
+ } // end anonymous namespace
+@@ -664,12 +635,12 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
+
+ case EOpIsNan:
+ {
+- newConstArray[i].setBConst(isNan(unionArray[i].getDConst()));
++ newConstArray[i].setBConst(IsNan(unionArray[i].getDConst()));
+ break;
+ }
+ case EOpIsInf:
+ {
+- newConstArray[i].setBConst(isInf(unionArray[i].getDConst()));
++ newConstArray[i].setBConst(IsInfinity(unionArray[i].getDConst()));
+ break;
+ }
+
+diff --git a/src/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp b/src/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp
+index e07cdfe..9478fd5 100644
+--- a/src/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp
++++ b/src/3rdparty/glslang/glslang/MachineIndependent/intermOut.cpp
+@@ -48,37 +48,6 @@
+ #endif
+ #include <cstdint>
+
+-namespace {
+-
+-bool IsInfinity(double x) {
+-#ifdef _MSC_VER
+- switch (_fpclass(x)) {
+- case _FPCLASS_NINF:
+- case _FPCLASS_PINF:
+- return true;
+- default:
+- return false;
+- }
+-#else
+- return std::isinf(x);
+-#endif
+-}
+-
+-bool IsNan(double x) {
+-#ifdef _MSC_VER
+- switch (_fpclass(x)) {
+- case _FPCLASS_SNAN:
+- case _FPCLASS_QNAN:
+- return true;
+- default:
+- return false;
+- }
+-#else
+- return std::isnan(x);
+-#endif
+-}
+-
+-}
+
+ namespace QtShaderTools {
+
+--
+2.35.1
+
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index eac33d9..9372974 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -9,7 +9,7 @@
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
Name: qt6-%{qt_module}
Version: 6.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv3
Url: http://www.qt.io
@@ -23,6 +23,9 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
# Upstream patches
+Patch0: 0001-Fix-encoding-decoding-of-string-literals-for-big-end.patch
+Patch1: 0002-TIntermediate-promoteConstantUnion-fix-conversion-to.patch
+Patch2: 0003-Use-intermOut.cpp-s-IsNan-and-IsInfinity-for-parse-t.patch
# Upstreamable patches
@@ -109,6 +112,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-3
+- Backport glslang and SPIRV-tools patches for s390x builds
+
* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2
- Enable s390x builds
commit 94522680bd262022f020c78a39d8271bffd98100
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Feb 25 14:51:17 2022 +0100
Enable s390x builds
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index d41d206..eac33d9 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
%global qt_module qtshadertools
@@ -12,7 +9,7 @@ ExcludeArch: s390x
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
Name: qt6-%{qt_module}
Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv3
Url: http://www.qt.io
@@ -112,6 +109,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2
+- Enable s390x builds
+
* Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1
- 6.2.3
2 years, 1 month
Architecture specific change in rpms/qt6-qtbase.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtbase.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/qt6-qtbase.git/commit/?id=87e7cd2....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit f84906798f4344563a289d2e5485d099ed0abfe0
Merge: 2e911d9 87e7cd2
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Mar 6 19:51:55 2022 +0100
Merge branch 'f36' into f35
commit 87e7cd2e38128dafddd1267c88f5951e3f4c3fe6
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Feb 25 12:45:49 2022 +0100
Enable s390x builds
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index ac24cfe..ab7efae 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
# See http://bugzilla.redhat.com/223663
%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
@@ -42,7 +39,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -836,6 +833,9 @@ make check -k ||:
%changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2
+- Enable s390x builds
+
* Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1
- 6.2.3
2 years, 1 month
Architecture specific change in rpms/libscn.git
by githook-noreply@fedoraproject.org
The package rpms/libscn.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/libscn.git/commit/?id=04f2e33bc23....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 04f2e33bc2352c842fc889024e54051bb87547bd
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Mar 6 15:41:06 2022 +0100
Disabled some tests on s390x due to regressions.
diff --git a/libscn.spec b/libscn.spec
index e816068..9309e52 100644
--- a/libscn.spec
+++ b/libscn.spec
@@ -41,6 +41,11 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%prep
%autosetup -n %{upname}-%{version} -p1
+# https://github.com/eliaskosunen/scnlib/issues/54
+%ifarch s390x
+sed -e '/integer/d' -e '/float/d' -i test/CMakeLists.txt
+%endif
+
%build
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
commit 4068d148e994b413b10d55e91da22438fe3d14d3
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Mar 5 15:33:25 2022 +0100
Updated to version 1.0.
diff --git a/.gitignore b/.gitignore
index 8ecfbc8..63fd708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libscn-0.3.tar.gz
/libscn-0.4.tar.gz
+/libscn-1.0.tar.gz
diff --git a/libscn-fast_float-build-fixes.patch b/libscn-fast_float-build-fixes.patch
new file mode 100644
index 0000000..1327e5c
--- /dev/null
+++ b/libscn-fast_float-build-fixes.patch
@@ -0,0 +1,75 @@
+From bcf8d68dd3b6b9b2f0c174da9c006ec79fd1c3ba Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly(a)easycoding.org>
+Date: Tue, 1 Mar 2022 16:51:39 +0100
+Subject: [PATCH 1/2] Fixed build with packaged version of fast_float library.
+
+Signed-off-by: Vitaly Zaitsev <vitaly(a)easycoding.org>
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d960eb9..ecfaf57 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,6 +48,10 @@ if (NOT (${CMAKE_VERSION} VERSION_LESS "3.9.0"))
+ cmake_policy(SET CMP0069 NEW)
+ endif ()
+
++if (NOT SCN_USE_BUNDLED_FAST_FLOAT)
++ find_package(FastFloat REQUIRED)
++endif ()
++
+ include(sanitizers)
+ include(flags)
+
+@@ -84,7 +88,7 @@ function(generate_library_target target_name)
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/deps/fast_float/single_include>)
+ else ()
+ target_link_libraries(${target_name} INTERFACE
+- fast_float)
++ FastFloat::fast_float)
+ endif ()
+ endfunction()
+ function(generate_header_only_target target_name)
+@@ -101,7 +105,7 @@ function(generate_header_only_target target_name)
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/deps/fast_float/single_include>)
+ else ()
+ target_link_libraries(${target_name} INTERFACE
+- fast_float)
++ FastFloat::fast_float)
+ endif ()
+ endfunction()
+
+
+From cee3ed295d09e2e91e507bc07278bc3511f9ceba Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly(a)easycoding.org>
+Date: Wed, 2 Mar 2022 11:22:21 +0100
+Subject: [PATCH 2/2] Use CMAKE_INSTALL_INCLUDEDIR instead of hardcoded path.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ecfaf57..f1864c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,7 +73,7 @@ function(generate_library_target target_name)
+ PRIVATE ${SCN_SOURCES})
+ target_include_directories(${target_name} PUBLIC
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+- $<INSTALL_INTERFACE:include>)
++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ target_include_directories(${target_name} PRIVATE
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+ target_compile_definitions(${target_name} PUBLIC
+@@ -95,7 +95,7 @@ function(generate_header_only_target target_name)
+ add_library(${target_name} INTERFACE)
+ target_include_directories(${target_name} INTERFACE
+ "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include;${PROJECT_SOURCE_DIR}/src>"
+- "$<INSTALL_INTERFACE:include>")
++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+ target_compile_definitions(${target_name} INTERFACE
+ -DSCN_HEADER_ONLY=1)
+ target_compile_features(${target_name} INTERFACE cxx_std_11)
diff --git a/libscn.spec b/libscn.spec
index 9a4a979..e816068 100644
--- a/libscn.spec
+++ b/libscn.spec
@@ -3,19 +3,23 @@
%global upname %{intname}lib
Name: libscn
-Version: 0.4
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
License: ASL 2.0
Summary: Library for replacing scanf and std::istream
URL: https://github.com/eliaskosunen/%{upname}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires: google-benchmark-devel
+# https://github.com/eliaskosunen/scnlib/pull/53
+Patch100: %{name}-fast_float-build-fixes.patch
+
+BuildRequires: cmake
BuildRequires: doctest-devel
-BuildRequires: ninja-build
+BuildRequires: fast_float-devel
BuildRequires: gcc-c++
-BuildRequires: cmake
+BuildRequires: google-benchmark-devel
+BuildRequires: ninja-build
%description
%{upname} is a modern C++ library for replacing scanf and std::istream.
@@ -37,20 +41,17 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%prep
%autosetup -n %{upname}-%{version} -p1
-# https://github.com/eliaskosunen/scnlib/issues/36
-%if 0%{?fedora} && 0%{?fedora} >= 34
-sed -e '/small-vector/d' -i test/CMakeLists.txt
-%endif
-
%build
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
- -DSCN_TESTS:BOOL=ON \
- -DSCN_EXAMPLES:BOOL=OFF \
-DSCN_BENCHMARKS:BOOL=ON \
-DSCN_DOCS:BOOL=OFF \
+ -DSCN_EXAMPLES:BOOL=OFF \
-DSCN_INSTALL:BOOL=ON \
- -DSCN_PEDANTIC:BOOL=OFF
+ -DSCN_PEDANTIC:BOOL=OFF \
+ -DSCN_TESTS:BOOL=ON \
+ -DSCN_USE_BUNDLED_FAST_FLOAT:BOOL=OFF \
+ -DSCN_WERROR:BOOL=OFF
%cmake_build
%check
@@ -71,6 +72,9 @@ rm -rf %{buildroot}%{_datadir}/%{intname}
%{_libdir}/%{name}.so
%changelog
+* Tue Mar 01 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0-1
+- Updated to version 1.0.
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index ee61e40..a5cedca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libscn-0.4.tar.gz) = a7059e70326e7d5af463b4ae09308644f8035092776f44001c1a4abf78421f55084e2fc30c6a9778eda62014354dba7c31b3f2f2d333bad04a2ec48b1f812ca0
+SHA512 (libscn-1.0.tar.gz) = 0d34b5a710a472618df5d8202bbd647f488aa0ac2ad593c4a212e42b8aee5c35882f6e0ab7a7241c766ed17c9273d5e6704b012ef7f23a1b329b2a2f28ec60c6
2 years, 1 month
Architecture specific change in rpms/qgnomeplatform.git
by githook-noreply@fedoraproject.org
The package rpms/qgnomeplatform.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/qgnomeplatform.git/commit/?id=1c1....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 2c6b76583c698c516c9c1303204eac203fa7c41c
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 11:45:53 2022 -0500
Rework packaging for consistency and add rich supplements for GNOME Shell
QGnomePlatform packaging had the Qt5 version without a suffix while the
Qt6 version had a suffix. This made the packaging a bit inconsistent.
Additionally, QGnomePlatform is useful when a Qt5/Qt6 application is
installed on a GNOME desktop, so let's declare the necessary rich
dependency to indicate as such.
diff --git a/qgnomeplatform.spec b/qgnomeplatform.spec
index afb4493..8c1e67d 100644
--- a/qgnomeplatform.spec
+++ b/qgnomeplatform.spec
@@ -1,7 +1,7 @@
Name: qgnomeplatform
Version: 0.8.4
-Release: 4%{?dist}
-Summary: Qt5 Platform Theme aimed to accommodate Gnome settings
+Release: 5%{?dist}
+Summary: Qt Platform Theme aimed to accommodate Gnome settings
License: LGPLv2+
URL: https://github.com/MartinBriza/QGnomePlatform
@@ -18,38 +18,59 @@ BuildRequires: gtk3-devel
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: libinput-devel
BuildRequires: libXrender-devel
+
+%description
+QGnomePlatform is a Qt Platform Theme aimed to accommodate as much of
+GNOME settings as possibleand utilize them in Qt applications without
+modifying them - making them fit into the environment as well as possible.
+
+%package qt5
+Summary: Qt5 Platform Theme aimed to accommodate Gnome settings
BuildRequires: qt5-qtbase-devel >= 5.15.2
BuildRequires: qt5-qtbase-static >= 5.15.2
BuildRequires: qt5-qtwayland-devel >= 5.15.2
-
-BuildRequires: qt6-qtbase-devel >= 6.2.0
-BuildRequires: qt6-qtbase-static >= 6.2.0
-BuildRequires: qt6-qtwayland-devel >= 6.2.0
-BuildRequires: qt6-qtbase-private-devel >= 6.2.0
+BuildRequires: qt5-qtbase-private-devel >= 5.15.2
BuildRequires: libadwaita-qt5-devel >= 1.4.1
-Requires: adwaita-qt5%{?_isa}
-
-BuildRequires: libadwaita-qt6-devel >= 1.4.1
-BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+Requires: adwaita-qt5%{?_isa}
+%if (0%{?fedora} && 0%{?fedora} <= 38)
+# Replace QGnomePlatform package with this as it was the Qt5 flavor
+Obsoletes: %{name} < 0.8.4-5
+Provides: %{name} = %{version}-%{release}
+Provides: %{name}%{?_isa} = %{version}-%{release}
+%endif
-%description
+# When GNOME Shell and Qt 5 are installed, we want this by default
+Supplements: (qt5-qtbase and gnome-shell)
+
+%description qt5
QGnomePlatform is a Qt5 Platform Theme aimed to accommodate as much of
GNOME settings as possibleand utilize them in Qt applications without
modifying them - making them fit into the environment as well as possible.
-%package -n qgnomeplatform-qt6
+%package qt6
Summary: Qt6 Platform Theme aimed to accommodate Gnome settings
+BuildRequires: qt6-qtbase-devel >= 6.2.0
+BuildRequires: qt6-qtbase-static >= 6.2.0
+BuildRequires: qt6-qtwayland-devel >= 6.2.0
+BuildRequires: qt6-qtbase-private-devel >= 6.2.0
+
+BuildRequires: libadwaita-qt6-devel >= 1.4.1
+
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
Requires: adwaita-qt6%{?_isa}
-%description -n qgnomeplatform-qt6
+# When GNOME Shell and Qt 6 are installed, we want this by default
+Supplements: (qt6-qtbase and gnome-shell)
+
+%description qt6
QGnomePlatform is a Qt6 Platform Theme aimed to accommodate as much of
GNOME settings as possibleand utilize them in Qt applications without
modifying them - making them fit into the environment as well as possible.
+
%prep
%autosetup -p1 -n QGnomePlatform-%{version}
@@ -69,19 +90,25 @@ modifying them - making them fit into the environment as well as possible.
%global _vpath_builddir %{_target_platform}-qt6
%cmake_install
-%files
+%files qt5
%doc README.md
%license LICENSE
%{_qt5_libdir}/libqgnomeplatform.so
%{_qt5_plugindir}/platformthemes/libqgnomeplatformtheme.so
%{_qt5_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
-%files -n qgnomeplatform-qt6
+%files qt6
+%doc README.md
+%license LICENSE
%{_qt6_libdir}/libqgnomeplatform6.so
%{_qt6_plugindir}/platformthemes/libqgnomeplatformtheme.so
%{_qt6_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
%changelog
+* Sat Mar 05 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 0.8.4-5
+- Rework packaging for consistency
+- Add rich supplements for installing QGnomePlatform modules
+
* Mon Feb 07 2022 Jan Grulich <jgrulich(a)redhat.com> - 0.8.4-4
- Rebuild (qt6)
commit 1c1c0062bcc5cddaf481059686a1af6dfbcf2220
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 11:28:06 2022 -0500
Allow s390x builds again now that qt6-qtdeclarative works on s390x
diff --git a/qgnomeplatform.spec b/qgnomeplatform.spec
index 13ea86c..afb4493 100644
--- a/qgnomeplatform.spec
+++ b/qgnomeplatform.spec
@@ -1,7 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
-
Name: qgnomeplatform
Version: 0.8.4
Release: 4%{?dist}
2 years, 1 month
Architecture specific change in rpms/adwaita-qt.git
by githook-noreply@fedoraproject.org
The package rpms/adwaita-qt.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/adwaita-qt.git/commit/?id=a4b3424....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 2c545391ccbcff225ccc712cf332084e4463b544
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 13:58:48 2022 -0500
Small cleanups to the packaging
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index d00e343..277fcbb 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,6 +1,6 @@
Name: adwaita-qt
Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+ and GPLv2+
Summary: Adwaita theme for Qt-based applications
@@ -9,23 +9,22 @@ Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwait
BuildRequires: cmake
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtx11extras-devel
-
-BuildRequires: qt6-qtbase-devel
-
BuildRequires: libxcb-devel
Obsoletes: adwaita-qt4 < 1.1.90
Obsoletes: adwaita-qt-common < 1.1.90
-Requires: adwaita-qt5
+Requires: (adwaita-qt5 if qt5-qtbase)
+Requires: (adwaita-qt6 if qt6-qtbase)
%description
Theme to let Qt applications fit nicely into Fedora Workstation
%package -n adwaita-qt5
Summary: Adwaita Qt5 theme
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtx11extras-devel
+
Requires: libadwaita-qt5%{?_isa} = %{version}-%{release}
%description -n adwaita-qt5
@@ -47,6 +46,8 @@ developing applications that use libadwaita-qt5.
%package -n adwaita-qt6
Summary: Adwaita Qt6 theme
+BuildRequires: qt6-qtbase-devel
+
Requires: libadwaita-qt6%{?_isa} = %{version}-%{release}
%description -n adwaita-qt6
@@ -120,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc
%{_libdir}/libadwaitaqt6priv.so
%changelog
+* Sat Mar 05 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 1.4.1-3
+- Small cleanups to the packaging
+
* Thu Nov 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 1.4.1-2
- Rebuild (qt6)
commit a4b34240931b44e8b91672be452cd17d0624b309
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 13:56:19 2022 -0500
Allow s390x builds again now that qt6-qtdeclarative works on s390x
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index a9a5c34..d00e343 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,7 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
-
Name: adwaita-qt
Version: 1.4.1
Release: 2%{?dist}
2 years, 1 month
Architecture specific change in rpms/adwaita-qt.git
by githook-noreply@fedoraproject.org
The package rpms/adwaita-qt.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/adwaita-qt.git/commit/?id=a4b3424....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 2c545391ccbcff225ccc712cf332084e4463b544
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 13:58:48 2022 -0500
Small cleanups to the packaging
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index d00e343..277fcbb 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,6 +1,6 @@
Name: adwaita-qt
Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+ and GPLv2+
Summary: Adwaita theme for Qt-based applications
@@ -9,23 +9,22 @@ Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwait
BuildRequires: cmake
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtx11extras-devel
-
-BuildRequires: qt6-qtbase-devel
-
BuildRequires: libxcb-devel
Obsoletes: adwaita-qt4 < 1.1.90
Obsoletes: adwaita-qt-common < 1.1.90
-Requires: adwaita-qt5
+Requires: (adwaita-qt5 if qt5-qtbase)
+Requires: (adwaita-qt6 if qt6-qtbase)
%description
Theme to let Qt applications fit nicely into Fedora Workstation
%package -n adwaita-qt5
Summary: Adwaita Qt5 theme
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtx11extras-devel
+
Requires: libadwaita-qt5%{?_isa} = %{version}-%{release}
%description -n adwaita-qt5
@@ -47,6 +46,8 @@ developing applications that use libadwaita-qt5.
%package -n adwaita-qt6
Summary: Adwaita Qt6 theme
+BuildRequires: qt6-qtbase-devel
+
Requires: libadwaita-qt6%{?_isa} = %{version}-%{release}
%description -n adwaita-qt6
@@ -120,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc
%{_libdir}/libadwaitaqt6priv.so
%changelog
+* Sat Mar 05 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 1.4.1-3
+- Small cleanups to the packaging
+
* Thu Nov 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 1.4.1-2
- Rebuild (qt6)
commit a4b34240931b44e8b91672be452cd17d0624b309
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 13:56:19 2022 -0500
Allow s390x builds again now that qt6-qtdeclarative works on s390x
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index a9a5c34..d00e343 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,7 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
-
Name: adwaita-qt
Version: 1.4.1
Release: 2%{?dist}
2 years, 1 month
Architecture specific change in rpms/adwaita-qt.git
by githook-noreply@fedoraproject.org
The package rpms/adwaita-qt.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/adwaita-qt.git/commit/?id=76c75e5....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 2cd84a9463589e796f438d74b056d4132fa65a44
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 14:13:16 2022 -0500
Put the Qt6 BR in the right place
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index 359141e..9c435ab 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -32,8 +32,6 @@ Adwaita theme variant for applications utilizing Qt5.
%package -n libadwaita-qt5
Summary: Adwaita Qt5 library
-BuildRequires: qt6-qtbase-devel
-
%description -n libadwaita-qt5
%{summary}.
@@ -48,6 +46,8 @@ developing applications that use libadwaita-qt5.
%package -n adwaita-qt6
Summary: Adwaita Qt6 theme
+BuildRequires: qt6-qtbase-devel
+
Requires: libadwaita-qt6%{?_isa} = %{version}-%{release}
%description -n adwaita-qt6
commit 43c5fb0b2ee7209c9cff521e5f7412f55e5c5952
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 13:58:48 2022 -0500
Small cleanups to the packaging
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index 1df7708..359141e 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,6 +1,6 @@
Name: adwaita-qt
Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+ and GPLv2+
Summary: Adwaita theme for Qt-based applications
@@ -9,23 +9,22 @@ Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwait
BuildRequires: cmake
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtx11extras-devel
-
-BuildRequires: qt6-qtbase-devel
-
BuildRequires: libxcb-devel
Obsoletes: adwaita-qt4 < 1.1.90
Obsoletes: adwaita-qt-common < 1.1.90
-Requires: adwaita-qt5
+Requires: (adwaita-qt5 if qt5-qtbase)
+Requires: (adwaita-qt6 if qt6-qtbase)
%description
Theme to let Qt applications fit nicely into Fedora Workstation
%package -n adwaita-qt5
Summary: Adwaita Qt5 theme
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtx11extras-devel
+
Requires: libadwaita-qt5%{?_isa} = %{version}-%{release}
%description -n adwaita-qt5
@@ -33,6 +32,8 @@ Adwaita theme variant for applications utilizing Qt5.
%package -n libadwaita-qt5
Summary: Adwaita Qt5 library
+BuildRequires: qt6-qtbase-devel
+
%description -n libadwaita-qt5
%{summary}.
@@ -120,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc
%{_libdir}/libadwaitaqt6priv.so
%changelog
+* Sat Mar 05 2022 Neal Gompa <ngompa(a)fedoraproject.org> - 1.4.1-3
+- Small cleanups to the packaging
+
* Wed Jan 19 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit 76c75e5e38b2d81d1fe253538f0681cea532e720
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sat Mar 5 13:56:19 2022 -0500
Allow s390x builds again now that qt6-qtdeclarative works on s390x
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index 17edd19..1df7708 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,7 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
-
Name: adwaita-qt
Version: 1.4.1
Release: 2%{?dist}
2 years, 1 month