update to 5.15.7.20221105.f8472fd9 [release 5.15.7.20221105.f8472fd9-1mamba;Mon Nov 07 2022]
This commit is contained in:
parent
93c43cb560
commit
e289efddd9
@ -0,0 +1,12 @@
|
||||
diff -up qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h.private_api_warning qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h
|
||||
--- qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h.private_api_warning 2022-10-11 09:08:33.712070523 -0500
|
||||
+++ qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h 2022-10-11 09:10:58.647038619 -0500
|
||||
@@ -435,7 +435,7 @@ inline void QObjectPrivate::checkForInco
|
||||
Q_UNUSED(version);
|
||||
#else
|
||||
if (Q_UNLIKELY(version != QObjectPrivateVersion)) {
|
||||
- qFatal("Cannot mix incompatible Qt library (%d.%d.%d) with this library (%d.%d.%d)",
|
||||
+ qWarning("Cannot mix incompatible Qt library (%d.%d.%d) with this library (%d.%d.%d)",
|
||||
(version >> 16) & 0xff, (version >> 8) & 0xff, version & 0xff,
|
||||
(QObjectPrivateVersion >> 16) & 0xff, (QObjectPrivateVersion >> 8) & 0xff, QObjectPrivateVersion & 0xff);
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
%define majver %(echo %version | cut -d. -f1-2)
|
||||
%define majver %(echo %version | cut -d. -f1-3)
|
||||
%define gittag %(echo %version | cut -d. -f5)
|
||||
|
||||
%define _qt5_prefix %{_libdir}/qt5
|
||||
%define _qt5_bindir %{_qt5_prefix}/bin
|
||||
%define _qt5_datadir %{_datadir}/qt5
|
||||
@ -18,7 +20,7 @@
|
||||
%endif
|
||||
|
||||
Name: qt5-qtbase
|
||||
Version: 5.15.2.20220127git
|
||||
Version: 5.15.7.20221105.f8472fd9
|
||||
Release: 1mamba
|
||||
Summary: A multiplatform, C++ GUI application development framework
|
||||
Group: System/Libraries
|
||||
@ -26,7 +28,7 @@ Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: https://www.qt.io/
|
||||
Source0: https://invent.kde.org/qt/qt/qtbase.git/kde%2F5.15/qtbase-%{version}.tar.bz2
|
||||
Source0: https://invent.kde.org/qt/qt/qtbase.git/v%{majver}-lts-lgpl@%{gittag}/qtbase-%{version}.tar.bz2
|
||||
#Source0: https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtbase-everywhere-src-%{version}.tar.xz
|
||||
Source1: libqt5-profile.sh
|
||||
Source2: libqt5-profile.csh
|
||||
@ -41,6 +43,7 @@ Patch4: libqt5-5.11.2-glibc-2.28.patch
|
||||
Patch5: libqt5-5.15.0-arm-missing-math-include.patch
|
||||
Patch6: qt5-qtbase-5.15.2-gcc11.patch
|
||||
Patch7: qt5-qtbase-5.15.2.20220127git-revert-version-bump.patch
|
||||
Patch8: qt5-qtbase-5.15.7.20221105.f8472fd9-private_api_warning.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -48,11 +51,10 @@ BuildRequires: libICE-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libatk-devel
|
||||
BuildRequires: libat-spi2-core-devel
|
||||
BuildRequires: libcairo-devel
|
||||
BuildRequires: libcups-devel
|
||||
BuildRequires: libdbus-devel
|
||||
BuildRequires: libdouble-conversion-devel
|
||||
BuildRequires: libdrm-devel
|
||||
BuildRequires: libfontconfig-devel
|
||||
BuildRequires: libfreetds-devel
|
||||
@ -63,7 +65,6 @@ BuildRequires: libglib-devel
|
||||
BuildRequires: libglvnd-devel
|
||||
BuildRequires: libgtk3-devel
|
||||
BuildRequires: libharfbuzz-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libinput-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libkrb5-devel
|
||||
@ -73,13 +74,11 @@ BuildRequires: libmtdev-devel
|
||||
BuildRequires: libodbc-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libpango-devel
|
||||
BuildRequires: libpcre2-devel
|
||||
BuildRequires: libperl
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libpostgresql-devel
|
||||
BuildRequires: libsqlite-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libsystemd-devel
|
||||
BuildRequires: libts-devel
|
||||
BuildRequires: libudev-devel
|
||||
BuildRequires: libxcb-devel
|
||||
@ -408,6 +407,9 @@ Qt sets the standard for high-performance, cross-platform application developmen
|
||||
It includes a C++ class library and tools for cross-platform development and internationalization.
|
||||
This package contains the Sybase and Microsoft SQL plugin.
|
||||
|
||||
# Don't clean build at the end
|
||||
%global __spec_rmbuild_cmd /bin/true
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
@ -416,7 +418,8 @@ This package contains the Sybase and Microsoft SQL plugin.
|
||||
#:<< _EOF
|
||||
#%patch5 -p1
|
||||
%patch6 -p1 -b .gcc11
|
||||
%patch7 -p1 -b .revert-version-bump
|
||||
#%patch7 -p1 -b .revert-version-bump
|
||||
%patch8 -p1 -b .private_api_warning
|
||||
|
||||
# .git required for confiugre to call syncqt and generate includes dir
|
||||
touch .git
|
||||
@ -638,7 +641,7 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%ifnarch arm
|
||||
%{_qt5_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
|
||||
%endif
|
||||
%{_qt5_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
|
||||
%{_libdir}/qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
|
||||
%exclude %{_qt5_plugindir}/platformthemes/libqgtk3.so
|
||||
#%ifarch arm
|
||||
#%{_qt5_plugindir}/video/videonode/libeglvideonode.so
|
||||
@ -783,6 +786,12 @@ rm -f %{buildroot}%{_libdir}/*.la
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Nov 07 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.7.20221105.f8472fd9-1mamba
|
||||
- update to 5.15.7.20221105.f8472fd9
|
||||
|
||||
* Fri Nov 04 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.7-1mamba
|
||||
- update to 5.15.7
|
||||
|
||||
* Wed Feb 02 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.2.20220127git-1mamba
|
||||
- update to 5.15.2.20220127git
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user