commit 3068f7b72f135bac9f9ddc631d07f722ffc55f24
Author: Jakub Bogusz <[email protected]>
Date: Sun Jun 26 21:52:55 2022 +0200
- updated to 5.15.5
- removed obsolete gcc11 patch
gcc11.patch | 17 -----------------
qt5-qtbase.spec | 10 ++++------
2 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index d804346..251e95e 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -70,16 +70,15 @@
Summary: Qt5 - base components
Summary(pl.UTF-8): Biblioteka Qt5 - podstawowe komponenty
Name: qt5-%{orgname}
-Version: 5.15.4
-Release: 2
+Version: 5.15.5
+Release: 1
License: LGPL v3 or GPL v2 or GPL v3 or commercial
Group: X11/Libraries
Source0:
https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-opensource-src-%{version}.tar.xz
-# Source0-md5: 91d827e83a45a302bfa2f32bbc2090fb
+# Source0-md5: c058f7e20eb716f70790343da37a6b7e
Source1:
https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-opensource-src-%{version}.tar.xz
-# Source1-md5: 6ba46a712a698118f396f78a785f6774
+# Source1-md5: fa34c5c6f4facdfa18055c15532dd138
Patch0: %{name}-system_cacerts.patch
-Patch1: gcc11.patch
Patch2: egl-x11.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
@@ -1174,7 +1173,6 @@ Generator plików makefile dla aplikacji Qt5.
%prep
%setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
diff --git a/gcc11.patch b/gcc11.patch
deleted file mode 100644
index 406aae9..0000000
--- a/gcc11.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: include <limits> to fix some GCC 11 build issues
-Origin: upstream, commits:
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
-Last-Update: 2021-01-26
-
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
-
- #include <QtCore/qbytearray.h>
-
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
-
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtbase.git/commitdiff/3068f7b72f135bac9f9ddc631d07f722ffc55f24
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
