The package rpms/qt5-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/qt5-qtbase.git/commit/?id=350a9f5...
https://src.fedoraproject.org/cgit/rpms/qt5-qtbase.git/commit/?id=c3b686c....
Change:
-%ifnarch s390x
+%ifnarch s390x
Thanks.
Full change:
============
commit 6ae41be8260f0f5403367eb01f7cd8319779674a
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Mar 9 09:28:57 2021 +0100
FileChooser portal: send window id in hex
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index cb45d3b..ce0055f 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,8 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 14%{?dist}
+Release: 15%{?dist}
+
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -136,7 +137,7 @@ Patch90: %{name}-gcc11.patch
# see also patch90
Patch200: qtbase-QTBUG-90395.patch
Patch201: qtbase-QTBUG-89977.patch
-
+Patch202: qtbase-filechooser-portal-send-window-id-in-hex.patch
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
# Those themes are there for platform integration. If the required libraries are
@@ -1060,6 +1061,9 @@ fi
%changelog
+* Tue Mar 09 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-15
+- FileChooser portal: send window id in hex
+
* Fri Feb 19 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-14
- %%build: explicitly pass -egl build option
- unconditional BR: pkgconfig(glesv2) again
diff --git a/qtbase-filechooser-portal-send-window-id-in-hex.patch
b/qtbase-filechooser-portal-send-window-id-in-hex.patch
new file mode 100644
index 0000000..4203036
--- /dev/null
+++ b/qtbase-filechooser-portal-send-window-id-in-hex.patch
@@ -0,0 +1,26 @@
+From acaabc9108dfe75530960cf8e3ec4f3602cd82e0 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich(a)redhat.com>
+Date: Mon, 08 Mar 2021 12:29:21 +0100
+Subject: [PATCH] FileChooser portal: send window id in hex
+
+We send window id in decimal, however, it is expected to be send in hex.
+This causes a mismatch and makes portal dialog to show in background.
+
+Pick-to: 5.15 6.0 6.1
+Change-Id: Ibd77199bbb4a2ad4782a0457ddc5506c6b5608fe
+Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com>
+---
+
+diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+index ec153f6..85bdd1a 100644
+--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
++++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+@@ -185,7 +185,7 @@
+
QLatin1String("/org/freedesktop/portal/desktop"),
+
QLatin1String("org.freedesktop.portal.FileChooser"),
+ d->saveFile ?
QLatin1String("SaveFile") : QLatin1String("OpenFile"));
+- QString parentWindowId = QLatin1String("x11:") +
QString::number(d->winId);
++ QString parentWindowId = QLatin1String("x11:") +
QString::number(d->winId, 16);
+
+ QVariantMap options;
+ if (!d->acceptLabel.isEmpty())
commit 5068fa5739bdd076f662cd91c7cfe6b5f9fa30d6
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri Feb 19 12:58:32 2021 -0600
%build: explicitly pass -egl build option
unconditional BR: pkgconfig(glesv2) again
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index f24f347..cb45d3b 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 13%{?dist}
+Release: 14%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -191,10 +191,7 @@ BuildRequires: pkgconfig(vulkan)
BuildRequires: libEGL-devel
BuildRequires: pkgconfig(gbm)
## TODO: apparently only needed if building opengl_es2 support, do we actually use it?
-- rex
-## this dep was removed in rawhide with introduction of mesa-19.1
-%if 0%{?fedora} < 30
BuildRequires: pkgconfig(glesv2)
-%endif
%global sqlite -system-sqlite
BuildRequires: pkgconfig(sqlite3) >= 3.7
%if 0%{?fedora} > 22
@@ -475,6 +472,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
-shared \
-accessibility \
%{?dbus}%{!?dbus:-dbus-runtime} \
+ %{?egl:-egl} \
-fontconfig \
-glib \
-gtk \
@@ -1062,6 +1060,10 @@ fi
%changelog
+* Fri Feb 19 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-14
+- %%build: explicitly pass -egl build option
+- unconditional BR: pkgconfig(glesv2) again
+
* Tue Feb 09 2021 Pavel Raiskup <praiskup(a)redhat.com> - 5.15.2-13
- rebuild all postgresql deps once more, for libpq ABI fix rhbz#1908268
commit ad76910087d31f553b3148bf6b83d0d125dbec94
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Feb 9 13:02:39 2021 +0100
Rebuild for libpq ABI change once more
Related: rhbz#1908268
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 0e12c60..f24f347 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 12%{?dist}
+Release: 13%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1062,6 +1062,9 @@ fi
%changelog
+* Tue Feb 09 2021 Pavel Raiskup <praiskup(a)redhat.com> - 5.15.2-13
+- rebuild all postgresql deps once more, for libpq ABI fix rhbz#1908268
+
* Mon Feb 08 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-12
- Use Wayland platform on GNOME for RHEL 9
commit 799f1df9e371ae0159460d347d2cd1bde0e4069c
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Feb 8 11:42:10 2021 +0100
Use Wayland platform on GNOME for RHEL 9
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 95e3ace..0e12c60 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 11%{?dist}
+Release: 12%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -393,7 +393,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%endif
%patch68 -p1
-%if 0%{?fedora} > 30
+%if 0%{?fedora} > 30 || 0%{?rhel} > 8
%patch80 -p1 -b .use-wayland-on-gnome.patch
%endif
@@ -1062,6 +1062,9 @@ fi
%changelog
+* Mon Feb 08 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-12
+- Use Wayland platform on GNOME for RHEL 9
+
* Mon Feb 08 2021 Pavel Raiskup <praiskup(a)redhat.com> - 5.15.2-11
- rebuild for libpq ABI fix rhbz#1908268
commit 232aaf980139deae916b9a08e407fea9d40eebad
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Feb 8 10:27:59 2021 +0100
rebuild for libpq ABI fix
Related: rhbz#1908268
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 39ee6ce..95e3ace 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 10%{?dist}
+Release: 11%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1062,6 +1062,9 @@ fi
%changelog
+* Mon Feb 08 2021 Pavel Raiskup <praiskup(a)redhat.com> - 5.15.2-11
+- rebuild for libpq ABI fix rhbz#1908268
+
* Sat Feb 06 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-10
- FTBFS: qendian.h (and qfloat16.h) missing <limits> include (QTBUG-90395)
- Qt build on GCC 11 (QTBUG-89977)
commit 4c363d0363dcde59275fe8024e8aa547227730fb
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Feb 6 17:08:39 2021 -0600
FTBFS: qendian.h (and qfloat16.h) missing <limits> include (QTBUG-90395)
Qt build on GCC 11 (QTBUG-89977)
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index f59aa19..39ee6ce 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 9%{?dist}
+Release: 10%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -133,6 +133,10 @@ Patch90: %{name}-gcc11.patch
# glibc stat
## upstream patches
+# see also patch90
+Patch200: qtbase-QTBUG-90395.patch
+Patch201: qtbase-QTBUG-89977.patch
+
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
# Those themes are there for platform integration. If the required libraries are
@@ -396,6 +400,8 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%patch90 -p1 -b .gcc11
## upstream patches
+%patch200 -p1 -b .QTBUG-90395
+%patch201 -p1 -b .QTBUG-89977
# move some bundled libs to ensure they're not accidentally used
pushd src/3rdparty
@@ -1056,6 +1062,10 @@ fi
%changelog
+* Sat Feb 06 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-10
+- FTBFS: qendian.h (and qfloat16.h) missing <limits> include (QTBUG-90395)
+- Qt build on GCC 11 (QTBUG-89977)
+
* Mon Feb 01 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-9
- Disable getentropy on RHEL
diff --git a/qtbase-QTBUG-89977.patch b/qtbase-QTBUG-89977.patch
new file mode 100644
index 0000000..cfaac11
--- /dev/null
+++ b/qtbase-QTBUG-89977.patch
@@ -0,0 +1,11 @@
+diff -up qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo
qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h
+--- qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo 2020-10-27
03:02:11.000000000 -0500
++++ qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h 2021-02-06
17:05:04.879201352 -0600
+@@ -51,6 +49,7 @@
+
+ #include <string>
+ #include <iterator>
++#include <limits>
+
+ #ifdef truncate
+ #error qbytearray.h must be included before any header file that defines truncate
diff --git a/qtbase-QTBUG-90395.patch b/qtbase-QTBUG-90395.patch
new file mode 100644
index 0000000..cc4bb6e
--- /dev/null
+++ b/qtbase-QTBUG-90395.patch
@@ -0,0 +1,23 @@
+diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395
qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h
+--- qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395 2020-10-27
03:02:11.000000000 -0500
++++ qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h 2021-02-06
16:36:27.072105717 -0600
+@@ -44,6 +44,8 @@
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+
++#include <limits>
++
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
+diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395
qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h
+--- qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395 2021-02-06
16:36:27.074105730 -0600
++++ qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h 2021-02-06
16:37:19.212440114 -0600
+@@ -43,6 +43,7 @@
+
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) &&
!defined(__F16C__)
commit ca6fb1879d00c1f4cc78f3f0017d29baa2e4c0a8
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Feb 1 09:08:11 2021 +0100
Disable getentropy on RHEL
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index d18895f..f59aa19 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -16,6 +16,9 @@
%global no_feature_statx -no-feature-statx
%global no_feature_renameat2 -no-feature-renameat2
%endif
+%if 0%{?rhel} && 0%{?rhel} > 6
+%global no_feature_getentropy -no-feature-getentropy
+%endif
# support qtchooser (adds qtchooser .conf file)
%global qtchooser 1
@@ -52,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 8%{?dist}
+Release: 9%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -496,6 +499,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
-no-feature-relocatable \
%{?no_feature_renameat2} \
%{?no_feature_statx} \
+ %{?no_feature_getentropy} \
QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
@@ -1052,6 +1056,9 @@ fi
%changelog
+* Mon Feb 01 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-9
+- Disable getentropy on RHEL
+
* Fri Jan 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-8
- Disable statx and renameat2 on RHEL
commit c699625b6cc20c439d3b083e5d495927a5ee9bfb
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Jan 29 09:59:12 2021 +0100
Disable statx and renameat2 on RHEL
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index f18b4fa..d18895f 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -12,7 +12,7 @@
# workaround
https://bugzilla.redhat.com/show_bug.cgi?id=1668865
# for current stable releases
-%if 0%{?fedora} && 0%{?fedora} < 30
+%if 0%{?fedora} < 30 || 0%{?rhel} > 6
%global no_feature_statx -no-feature-statx
%global no_feature_renameat2 -no-feature-renameat2
%endif
@@ -52,7 +52,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 7%{?dist}
+Release: 8%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1052,6 +1052,9 @@ fi
%changelog
+* Fri Jan 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-8
+- Disable statx and renameat2 on RHEL
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.15.2-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 8005265f87a90237f75c5260e35d09117607c39a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 14:42:38 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index e43b530..f18b4fa 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -52,7 +52,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 6%{?dist}
+Release: 7%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1052,6 +1052,9 @@ fi
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.15.2-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Sat Dec 19 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-6
- rebuild (gcc11)
commit 90cf7f7329ab6d48702e607d4dd83204c46f4cc3
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Sat Jan 9 05:53:03 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 9cf3638..e43b530 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -42,6 +42,7 @@
%endif
%global journald -journald
+BuildRequires: make
BuildRequires: pkgconfig(libsystemd)
%global examples 1
commit 13faecf546b55c7209a9b5f9750c16cd6946c078
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Dec 19 22:25:50 2020 -0600
rebuild (gcc11)
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 4b6ad2b..9cf3638 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 5%{?dist}
+Release: 6%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1051,6 +1051,9 @@ fi
%changelog
+* Sat Dec 19 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-6
+- rebuild (gcc11)
+
* Mon Nov 30 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-5
- re-enable vulkan support on s390x, root cause fixed
commit 350a9f57c009e19a7508cc48342c1345448d3d2e
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Nov 30 15:44:11 2020 -0600
re-enable vulkan support on s390x, root cause fixed
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 3566a85..4b6ad2b 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 4%{?dist}
+Release: 5%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -176,10 +176,8 @@ BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
BuildRequires: pkgconfig(xkeyboard-config)
-%ifnarch s390x
%global vulkan 1
BuildRequires: pkgconfig(vulkan)
-%endif
%if 0%{?fedora} || 0%{?rhel} > 6
%global egl 1
BuildRequires: libEGL-devel
@@ -1053,6 +1051,9 @@ fi
%changelog
+* Mon Nov 30 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-5
+- re-enable vulkan support on s390x, root cause fixed
+
* Sun Nov 29 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-4
- drop vulkan support on s390x (#1902449)
commit dbbb20763b5a0bd8cb3580e8fd2fb753c2995bbf
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sun Nov 29 08:59:23 2020 -0600
fix vulkan conditional
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index b44c656..3566a85 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -944,10 +944,12 @@ fi
%{_qt5_libdir}/libQt5EdidSupport.prl
%{_qt5_libdir}/libQt5XkbCommonSupport.*a
%{_qt5_libdir}/libQt5XkbCommonSupport.prl
+%if 0%{?vulkan}
%{_qt5_headerdir}/QtVulkanSupport/
%{_qt5_libdir}/cmake/Qt5VulkanSupport/
%{_qt5_libdir}/libQt5VulkanSupport.*a
%{_qt5_libdir}/libQt5VulkanSupport.prl
+%endif
%if 0%{?examples}
%files examples
commit c3b686ca071ae149d5d2ecd4d7f383eca793b03e
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sun Nov 29 01:14:45 2020 -0600
drop vulkan support on s390x (#1902449)
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index c91e3c7..b44c656 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 3%{?dist}
+Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -176,7 +176,10 @@ BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
BuildRequires: pkgconfig(xkeyboard-config)
+%ifnarch s390x
+%global vulkan 1
BuildRequires: pkgconfig(vulkan)
+%endif
%if 0%{?fedora} || 0%{?rhel} > 6
%global egl 1
BuildRequires: libEGL-devel
@@ -264,7 +267,9 @@ Requires: %{name}-gui%{?_isa}
Requires: libEGL-devel
%endif
Requires: pkgconfig(gl)
+%if 0%{?vulkan}
Requires: pkgconfig(vulkan)
+%endif
Requires: qt5-rpm-macros
%if 0%{?use_clang}
Requires: clang >= 3.7.0
@@ -1046,6 +1051,9 @@ fi
%changelog
+* Sun Nov 29 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-4
+- drop vulkan support on s390x (#1902449)
+
* Fri Nov 27 2020 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-3
- Require qt-settings only in Fedora builds
commit ab8ab2c460a5c86b26bcbe20e298006dc6508067
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Nov 27 11:40:37 2020 +0100
Require qt-settings on.y in Fedora builds
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index d23f7df..c91e3c7 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -37,7 +37,9 @@
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm;
echo $d)
# use external qt_settings pkg
+%if 0%{?fedora}
%global qt_settings 1
+%endif
%global journald -journald
BuildRequires: pkgconfig(libsystemd)
@@ -49,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.2
-Release: 2%{?dist}
+Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -1044,6 +1046,9 @@ fi
%changelog
+* Fri Nov 27 2020 Jan Grulich <jgrulich(a)redhat.com> - 5.15.2-3
+- Require qt-settings only in Fedora builds
+
* Mon Nov 23 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.2-2
- -no-reduce-relocations (#1900527)