Browse Source

update to version 5.15.3

Signed-off-by: Toshaan Bharvani <toshaan@powerel.org>
master
Toshaan Bharvani 1 year ago
parent
commit
12aed97f00
  1. 30
      SOURCES/qtbase-ambiguous-python-shebang.patch
  2. 30
      SPECS/qt5-qtbase.spec

30
SOURCES/qtbase-ambiguous-python-shebang.patch

@ -0,0 +1,30 @@
diff --git a/mkspecs/features/uikit/devices.py b/mkspecs/features/uikit/devices.py
index 8cdcb370..b0c927ea 100755
--- a/mkspecs/features/uikit/devices.py
+++ b/mkspecs/features/uikit/devices.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#############################################################################
##
diff --git a/tests/manual/xembed-raster/gtk-embedder.py b/tests/manual/xembed-raster/gtk-embedder.py
index 5c37fd44..86ffa9fd 100755
--- a/tests/manual/xembed-raster/gtk-embedder.py
+++ b/tests/manual/xembed-raster/gtk-embedder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#############################################################################
##
## Copyright (C) 2013 Canonical Ltd.
diff --git a/tests/manual/xembed-widgets/gtk-embedder.py b/tests/manual/xembed-widgets/gtk-embedder.py
index 2a7c92db..93135b14 100755
--- a/tests/manual/xembed-widgets/gtk-embedder.py
+++ b/tests/manual/xembed-widgets/gtk-embedder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#############################################################################
##
## Copyright (C) 2013 Canonical Ltd.

30
SPECS/qt5-qtbase.spec

@ -29,6 +29,9 @@
%endif %endif
%endif %endif


# Disable automatic .la file removal
%global __brp_remove_la_files %nil

%global platform linux-g++ %global platform linux-g++


%if 0%{?use_clang} %if 0%{?use_clang}
@ -56,15 +59,15 @@ BuildRequires: pkgconfig(libsystemd)


Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.15.2 Version: 5.15.3
Release: 29%{?dist} Release: 1%{?dist}




# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/ Url: http://qt-project.org/
%global majmin %(echo %{version} | cut -d. -f1-2) %global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz


# https://bugzilla.redhat.com/show_bug.cgi?id=1227295 # https://bugzilla.redhat.com/show_bug.cgi?id=1227295
Source1: qtlogging.ini Source1: qtlogging.ini
@ -130,7 +133,7 @@ Patch64: qt5-qtbase-5.12.1-firebird-4.0.0.patch
Patch65: qtbase-opensource-src-5.9.0-mysql.patch Patch65: qtbase-opensource-src-5.9.0-mysql.patch


# python3 # python3
Patch68: qtbase-everywhere-src-5.11.1-python3.patch Patch68: qtbase-ambiguous-python-shebang.patch


# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome # https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129 # https://bugzilla.redhat.com/show_bug.cgi?id=1732129
@ -141,14 +144,12 @@ Patch90: %{name}-gcc11.patch


## upstream patches ## upstream patches
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
# git diff v5.15.2..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz # git diff v5.15.3-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 in lookaside cache due to large'ish size -- rdieter
Patch100: kde-5.15-rollup-20220131.patch.gz Patch100: kde-5.15-rollup-20220324.patch.gz
# HACK to make 'fedpkg sources' consider it 'used" # HACK to make 'fedpkg sources' consider it 'used"
Source100: kde-5.15-rollup-20220131.patch.gz Source100: kde-5.15-rollup-20220324.patch.gz
Patch101: 0068-Bump-version.patch


Patch102: qtbase-CVE-2021-38593.patch


# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
# Those themes are there for platform integration. If the required libraries are # Those themes are there for platform integration. If the required libraries are
@ -183,6 +184,7 @@ BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libproxy-1.0)
# xcb-sm # xcb-sm
BuildRequires: pkgconfig(ice) pkgconfig(sm) BuildRequires: pkgconfig(ice) pkgconfig(sm)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
@ -423,10 +425,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.


## upstream patches ## upstream patches
%patch100 -p1 %patch100 -p1
# revert version bump
%patch101 -p1 -R

%patch102 -p1


# move some bundled libs to ensure they're not accidentally used # move some bundled libs to ensure they're not accidentally used
pushd src/3rdparty pushd src/3rdparty
@ -599,7 +597,7 @@ translationdir=%{_qt5_translationdir}


Name: Qt5 Name: Qt5
Description: Qt5 Configuration Description: Qt5 Configuration
Version: 5.15.2 Version: 5.15.3
EOF EOF


# rpm macros # rpm macros
@ -1119,6 +1117,10 @@ fi




%changelog %changelog
* Thu Mar 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
- 5.15.3 + sync with Fedora
Resolves: bz#2061354

* Mon Jan 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.2-29 * Mon Jan 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.2-29
- Sync with Fedora: - Sync with Fedora:
- sync kde/5.15 branch patches - sync kde/5.15 branch patches

Loading…
Cancel
Save