|
@@ -67,7 +67,7 @@ BuildRequires: systemd-devel
|
|
|
|
|
|
Summary: Qt5 - QtBase components
|
|
|
Name: qt5-qtbase
|
|
|
-Version: 5.15.2%{?qt5_patchlevel:.%{qt5_patchlevel}}
|
|
|
+Version: 5.15.7%{?qt5_patchlevel:.%{qt5_patchlevel}}
|
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
@@ -79,7 +79,7 @@ Url: https://qt-project.org/
|
|
|
|
|
|
%global qt5_minorver %(echo %{version} | cut -d . -f 1-2)
|
|
|
#global qt5_patchlevel %(echo %{version} | cut -d . -f 4)
|
|
|
-Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-src-%{version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
|
|
|
+Source0: https://download.qt.io/official_releases/qt/%{qt5_minorver}/%{version}%{?qt5_patchlevel:-%{qt5_patchlevel}}/submodules/%{qt_module}-everywhere-opensource-src-%{version}%{?qt5_patchlevel:-%{qt5_patchlevel}}.tar.xz
|
|
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
|
|
|
Source1: qtlogging.ini
|
|
@@ -98,69 +98,66 @@ Source10: macros.qt5-qtbase
|
|
|
# support multilib optflags
|
|
|
Patch2: qtbase-multilib_optflags.patch
|
|
|
|
|
|
-# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
|
|
|
-Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
|
|
|
-
|
|
|
-# borrowed from opensuse
|
|
|
-# track private api via properly versioned symbols
|
|
|
-# downside: binaries produced with these differently-versioned symbols are no longer
|
|
|
-# compatible with qt-project.org's Qt binary releases.
|
|
|
-Patch8: tell-the-truth-about-private-api.patch
|
|
|
-
|
|
|
# upstreamable patches
|
|
|
# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
|
|
-Patch50: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
|
|
|
+Patch50: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
|
|
|
|
|
|
# 1381828 - Broken window scaling for some QT5 applications (#1381828)
|
|
|
# This patch moves the threshold for 2x scaling from the DPI of 144 to 192,
|
|
|
# the same value GNOME uses. It's not a complete solution...
|
|
|
-Patch51: qtbase-hidpi_scale_at_192.patch
|
|
|
+Patch51: qtbase-hidpi_scale_at_192.patch
|
|
|
|
|
|
# 1. Workaround moc/multilib issues
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020
|
|
|
# https://bugreports.qt.io/browse/QTBUG-49972
|
|
|
# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
|
|
|
-Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
|
|
|
+Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
|
|
|
|
|
|
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
|
|
|
# https://bugzilla.redhat.com/1704474
|
|
|
-Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
|
|
|
+Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
|
|
|
|
|
|
# respect QMAKE_LFLAGS_RELEASE when building qmake
|
|
|
-Patch54: qtbase-qmake_LFLAGS.patch
|
|
|
+Patch54: qtbase-qmake_LFLAGS.patch
|
|
|
|
|
|
# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
|
|
|
-Patch55: qtbase-everywhere-src-5.14.2-no_relocatable.patch
|
|
|
+Patch55: qtbase-everywhere-src-5.14.2-no_relocatable.patch
|
|
|
+
|
|
|
+# fix FTBFS against libglvnd-1.3.4+
|
|
|
+Patch56: qtbase-everywhere-src-5.15.2-libglvnd.patch
|
|
|
|
|
|
# drop -O3 and make -O2 by default
|
|
|
-Patch61: qt5-qtbase-cxxflag.patch
|
|
|
+Patch61: qt5-qtbase-cxxflag.patch
|
|
|
|
|
|
# support firebird version 3.x
|
|
|
-Patch64: qt5-qtbase-5.12.1-firebird.patch
|
|
|
+Patch63: qt5-qtbase-5.12.1-firebird.patch
|
|
|
+
|
|
|
+# support firebird version 4.x
|
|
|
+Patch64: qt5-qtbase-5.12.1-firebird-4.0.0.patch
|
|
|
|
|
|
# fix for new mariadb
|
|
|
-Patch65: qtbase-opensource-src-5.9.0-mysql.patch
|
|
|
+Patch65: qtbase-opensource-src-5.9.0-mysql.patch
|
|
|
|
|
|
# python3
|
|
|
-Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
|
|
+Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
|
|
|
|
|
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
|
|
|
-Patch80: qtbase-use-wayland-on-gnome.patch
|
|
|
-
|
|
|
-# macros, be mindful to keep sync'd with macros.qt5-base
|
|
|
-%define _qt5 %{name}
|
|
|
+Patch80: qtbase-use-wayland-on-gnome.patch
|
|
|
|
|
|
# gcc-11
|
|
|
Patch90: %{name}-gcc11.patch
|
|
|
|
|
|
-# glibc stat
|
|
|
-
|
|
|
## upstream patches
|
|
|
-# see also patch90
|
|
|
-Patch200: qtbase-QTBUG-90395.patch
|
|
|
-Patch201: qtbase-QTBUG-89977.patch
|
|
|
-Patch202: qtbase-filechooser-portal-send-window-id-in-hex.patch
|
|
|
+# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
|
|
|
+# git diff v5.15.5-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
|
|
|
+# patch100 in lookaside cache due to large'ish size -- rdieter
|
|
|
+#Patch100: kde-5.15-rollup-20220920.patch.gz
|
|
|
+# HACK to make 'fedpkg sources' consider it 'used"
|
|
|
+#Source100: kde-5.15-rollup-20220920.patch.gz
|
|
|
+
|
|
|
+# macros, be mindful to keep sync'd with macros.qt5-base
|
|
|
+%define _qt5 %{name}
|
|
|
|
|
|
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
|
|
# Those themes are there for platform integration. If the required libraries are
|
|
@@ -373,9 +370,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|
|
|
|
|
## upstream fixes
|
|
|
|
|
|
-# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
|
|
|
-%patch8 -p1
|
|
|
-
|
|
|
%patch50 -p1 -b .QT_VERSION_CHECK
|
|
|
# FIXME/TODO : rebase or drop -- rdieter
|
|
|
#patch51 -p1 -b .hidpi_scale_at_192
|
|
@@ -383,6 +377,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|
|
%patch53 -p1 -b .qt5gui_cmake_isystem_includes
|
|
|
%patch54 -p1 -b .qmake_LFLAGS
|
|
|
%patch55 -p1 -b .no_relocatable
|
|
|
+%patch56 -p1 -b .libglvnd
|
|
|
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
|
|
%patch64 -p1 -b .firebird
|
|
|
%patch65 -p1 -b .mysql
|
|
@@ -393,8 +388,7 @@ 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
|
|
|
+#%patch100 -p1
|
|
|
|
|
|
# move some bundled libs to ensure they're not accidentally used
|
|
|
pushd src/3rdparty
|
|
@@ -1089,6 +1083,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Oct 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.7-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Tue Apr 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.2-1
|
|
|
- new upstream release.
|
|
|
- imported Patch55, 90-202 from rawhide.
|