Merge branch 'rawhide' into f36
This commit is contained in:
Jan Grulich
commit
702f992cc1
|
|
@ -5,3 +5,7 @@
|
|||
/kde-5.15-rollup-20220131.patch.gz
|
||||
/qtbase-everywhere-opensource-src-5.15.3.tar.xz
|
||||
/kde-5.15-rollup-20220304.patch.gz
|
||||
/qtbase-everywhere-opensource-src-5.15.4.tar.xz
|
||||
/kde-5.15-rollup-20220516.patch.gz
|
||||
/qtbase-everywhere-opensource-src-5.15.5.tar.xz
|
||||
/kde-5.15-rollup-20220713.patch.gz
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
%endif
|
||||
%endif
|
||||
|
||||
# zstd support
|
||||
%global zstd 1
|
||||
|
||||
# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1668865
|
||||
# for current stable releases
|
||||
%if 0%{?fedora} < 30 || 0%{?rhel} > 6
|
||||
|
|
@ -57,8 +60,8 @@ BuildRequires: pkgconfig(libsystemd)
|
|||
|
||||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.15.3
|
||||
Release: 3%{?dist}
|
||||
Version: 5.15.5
|
||||
Release: 2%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
|
|
@ -83,12 +86,6 @@ Source10: macros.qt5-qtbase
|
|||
# support multilib optflags
|
||||
Patch2: qtbase-multilib_optflags.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
|
||||
|
|
@ -141,14 +138,13 @@ Patch90: %{name}-gcc11.patch
|
|||
|
||||
## upstream patches
|
||||
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
|
||||
# git diff v5.15.3-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
|
||||
# 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-20220304.patch.gz
|
||||
Patch100: kde-5.15-rollup-20220713.patch.gz
|
||||
# HACK to make 'fedpkg sources' consider it 'used"
|
||||
Source100: kde-5.15-rollup-20220304.patch.gz
|
||||
Source100: kde-5.15-rollup-20220713.patch.gz
|
||||
# CVS-2021-38593
|
||||
Patch101: qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
|
||||
Patch102: qtbase-everywhere-src-5.15.2-CVE-2022-2525.patch
|
||||
Patch103: qt5-qtbase-fix-invalid-number-of-concurrent-stream.patch
|
||||
|
||||
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
||||
# Those themes are there for platform integration. If the required libraries are
|
||||
|
|
@ -233,6 +229,10 @@ BuildRequires: time
|
|||
BuildRequires: xorg-x11-server-Xvfb
|
||||
%endif
|
||||
|
||||
%if 0%{?zstd}
|
||||
BuildRequires: pkgconfig(libzstd)
|
||||
%endif
|
||||
|
||||
%if 0%{?qtchooser}
|
||||
%if 0%{?fedora}
|
||||
Conflicts: qt < 1:4.8.6-10
|
||||
|
|
@ -392,9 +392,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
|
||||
|
|
@ -423,8 +420,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||
## upstream patches
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
|
||||
# move some bundled libs to ensure they're not accidentally used
|
||||
pushd src/3rdparty
|
||||
|
|
@ -535,7 +530,11 @@ export MAKEFLAGS="%{?_smp_mflags}"
|
|||
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
|
||||
|
||||
# Validate config results
|
||||
%if "%{?ibase}" != "-no-sql-ibase"
|
||||
for config_test in egl-x11 ibase ; do
|
||||
%else
|
||||
for config_test in egl-x11 ; do
|
||||
%endif
|
||||
config_result="$(grep ^cache.${config_test}.result config.cache | cut -d= -f2 | tr -d ' ')"
|
||||
if [ "${config_result}" != "true" ]; then
|
||||
echo "${config_test} detection failed"
|
||||
|
|
@ -582,7 +581,7 @@ translationdir=%{_qt5_translationdir}
|
|||
|
||||
Name: Qt5
|
||||
Description: Qt5 Configuration
|
||||
Version: 5.15.3
|
||||
Version: 5.15.5
|
||||
EOF
|
||||
|
||||
# rpm macros
|
||||
|
|
@ -1098,12 +1097,31 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
|
||||
- 5.15.5
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Jun 21 2022 Than Ngo <than@redhat.com> - 5.15.3-3
|
||||
- bz#2099267, backport patch to fix download problem from Settings
|
||||
|
||||
* Mon May 30 2022 Than Ngo <than@redhat.com> - 5.15.3-2
|
||||
- Fixed bz#1994724, CVE-2021-38593
|
||||
|
||||
* Mon May 30 2022 Than Ngo <than@redhat.com> - 5.15.4-3
|
||||
- bz#1994719, CVE-2021-38593
|
||||
|
||||
* Sun May 22 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-2
|
||||
- Rebuild (broken update)
|
||||
|
||||
* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
|
||||
- 5.15.4
|
||||
|
||||
* Fri Apr 01 2022 Than Ngo <than@redhat.com> - 5.15.3-2
|
||||
- bz#2070958, enable zstd
|
||||
>>>>>>> rawhide
|
||||
|
||||
* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
|
||||
- 5.15.3 + kde-5.15 fixes
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
|
||||
index 7a2daa2..cfd1ca3 100644
|
||||
--- a/src/corelib/io/qprocess_unix.cpp
|
||||
+++ b/src/corelib/io/qprocess_unix.cpp
|
||||
@@ -422,11 +422,11 @@
|
||||
// Add the program name to the argument list.
|
||||
argv[0] = nullptr;
|
||||
if (!program.contains(QLatin1Char('/'))) {
|
||||
+ // findExecutable() returns its argument if it's an absolute path,
|
||||
+ // otherwise it searches $PATH; returns empty if not found (we handle
|
||||
+ // that case much later)
|
||||
const QString &exeFilePath = QStandardPaths::findExecutable(program);
|
||||
- if (!exeFilePath.isEmpty()) {
|
||||
- const QByteArray &tmp = QFile::encodeName(exeFilePath);
|
||||
- argv[0] = ::strdup(tmp.constData());
|
||||
- }
|
||||
+ argv[0] = ::strdup(QFile::encodeName(exeFilePath).constData());
|
||||
}
|
||||
if (!argv[0])
|
||||
argv[0] = ::strdup(encodedProgramName.constData());
|
||||
@@ -978,11 +978,10 @@
|
||||
QByteArray tmp;
|
||||
if (!program.contains(QLatin1Char('/'))) {
|
||||
const QString &exeFilePath = QStandardPaths::findExecutable(program);
|
||||
- if (!exeFilePath.isEmpty())
|
||||
- tmp = QFile::encodeName(exeFilePath);
|
||||
- }
|
||||
- if (tmp.isEmpty())
|
||||
+ tmp = QFile::encodeName(exeFilePath);
|
||||
+ } else {
|
||||
tmp = QFile::encodeName(program);
|
||||
+ }
|
||||
argv[0] = tmp.data();
|
||||
|
||||
if (envp)
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (qtbase-everywhere-opensource-src-5.15.3.tar.xz) = 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
|
||||
SHA512 (kde-5.15-rollup-20220304.patch.gz) = eee2ee1fbb6be6042261dc35f008b8a91ebd7ceedba469d37220d6185b296d6de9bb65c8c4da4d83d0462d7eb183f9e06fc6c2f748700c400af77980d1c8ed5f
|
||||
SHA512 (qtbase-everywhere-opensource-src-5.15.5.tar.xz) = ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
|
||||
SHA512 (kde-5.15-rollup-20220713.patch.gz) = ad352cf917e77c6ff77ed981e96ad423c2fed6b61d03d36231b0d5d1609fb1d09bc1eaeced19f0b3d3aee317135f345ce1f7b1886ae6a63d16043c4c1b879649
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index e6a0d97..cf93041 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -216,9 +216,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
|
||||
QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
|
||||
|
||||
internal_module {
|
||||
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
|
||||
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
|
||||
} else {
|
||||
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
|
||||
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
|
||||
" qt_private_api_tag*;"
|
||||
|
||||
private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
|
||||
Loading…
Reference in New Issue