Accepting request 976077 from KDE:Qt:6.3
Forward only OBS-URL: https://build.opensuse.org/request/show/976077 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-base?expand=0&rev=28
This commit is contained in:
Git OBS Bridge
parent
412a67379d
commit
a3ba43f933
@ -0,0 +1,60 @@
|
||||
From 65e233bd48801c1d48da735d62d00179cb986155 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Fri, 22 Apr 2022 10:22:52 -0700
|
||||
Subject: [PATCH] Fix build with GCC12: avoid QCborStreamReader::preparse()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
GCC 12 doesn't like that we're calling preparse() on the empty
|
||||
QByteArray() (whose .data() == &QByteArray::_empty), despite the
|
||||
condition being impossible.
|
||||
|
||||
Reported at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105348
|
||||
|
||||
In function ‘void* qt_cbor_decoder_read(void*, void*, size_t, size_t)’,
|
||||
inlined from ‘void* read_bytes_unchecked(const CborValue*, void*, size_t, size_t)’ at cborinternal_p.h:234:51,
|
||||
inlined from ‘uint32_t read_uint32(const CborValue*, size_t)’ at cborinternal_p.h:271:25,
|
||||
inlined from ‘uint64_t _cbor_value_decode_int64_internal(const CborValue*)’ at cborparser.c:333:23,
|
||||
inlined from ‘uint64_t _cbor_value_extract_int64_helper(const CborValue*)’ at cbor.h:372:50,
|
||||
inlined from ‘void QCborStreamReader::preparse()’ at qcborstreamreader.cpp:769:59,
|
||||
inlined from ‘QCborStreamReader::QCborStreamReader(const QByteArray&)’ at qcborstreamreader.cpp:825:13,
|
||||
inlined from ‘QCborStreamReader::QCborStreamReader()’ at qcborstreamreader.cpp:790:37,
|
||||
inlined from ‘QtPrivate::QMetaTypeForType<QCborStreamReader>::getDefaultCtr()::<lambda(const QtPrivate::QMetaTypeInterface*, void*)>’ at qmetatype.h:2302:65,
|
||||
inlined from ‘static constexpr void QtPrivate::QMetaTypeForType<QCborStreamReader>::getDefaultCtr()::<lambda(const QtPrivate::QMetaTypeInterface*, void*)>::_FUN(const QtPrivate::QMetaTypeInterface*, void*)’ at qmetatype.h:2302:20:
|
||||
qcborstreamreader.cpp:706:18: error: array subscript ‘unsigned int[0]’ is partly outside array bounds of ‘const char [1]’ [-Werror=array-bounds]
|
||||
qbytearray.h:92:23: note: object ‘QByteArray::_empty’ of size 1
|
||||
|
||||
Change-Id: If05aeeb7176e4f13af9afffd16e8485d34e36100
|
||||
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
||||
(cherry picked from commit d7d6f46324c7dbcfb02ddea3ab1b8db433c9b0d0)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
src/corelib/serialization/qcborstreamreader.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp
|
||||
index cf90f3e397..273941214b 100644
|
||||
--- a/src/corelib/serialization/qcborstreamreader.cpp
|
||||
+++ b/src/corelib/serialization/qcborstreamreader.cpp
|
||||
@@ -565,7 +565,7 @@ public:
|
||||
CborValue currentElement;
|
||||
QCborError lastError = {};
|
||||
|
||||
- QByteArray::size_type bufferStart;
|
||||
+ QByteArray::size_type bufferStart = 0;
|
||||
bool corrupt = false;
|
||||
|
||||
QCborStreamReaderPrivate(const QByteArray &data)
|
||||
@@ -787,7 +787,7 @@ inline void QCborStreamReader::preparse()
|
||||
\sa addData(), isValid()
|
||||
*/
|
||||
QCborStreamReader::QCborStreamReader()
|
||||
- : QCborStreamReader(QByteArray())
|
||||
+ : d(new QCborStreamReaderPrivate({})), type_(Invalid)
|
||||
{
|
||||
}
|
||||
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From fe84b31c871449da9d75c2d2615f3f061d969234 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Fri, 22 Apr 2022 09:44:43 -0700
|
||||
Subject: [PATCH] QtOpenGL: Fix build with GCC 12: qt_imageForBrush is in QtGui
|
||||
|
||||
/usr/bin/ld: lib/libQt6OpenGL.t.so.6.4.0: protected symbol `_Z16qt_imageForBrushib' isn't defined
|
||||
|
||||
Change-Id: If05aeeb7176e4f13af9afffd16e845af9638337b
|
||||
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
||||
(cherry picked from commit 507115ebbb04cdebd09125a422fa3c081987a371)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
src/opengl/qopenglpaintengine.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp
|
||||
index 98ab71dad5..5b6da3fa20 100644
|
||||
--- a/src/opengl/qopenglpaintengine.cpp
|
||||
+++ b/src/opengl/qopenglpaintengine.cpp
|
||||
@@ -112,7 +112,7 @@
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
-Q_OPENGL_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
|
||||
+Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
|
||||
|
||||
////////////////////////////////// Private Methods //////////////////////////////////////////
|
||||
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From f4e4af57b8829a0290264b9612be4a3a0946e88d Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Fri, 22 Apr 2022 11:21:31 -0700
|
||||
Subject: [PATCH] XCB: fix GCC 12 warning about uninitialized variable use
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
GCC is right that symbolsGroup2 could remain uninitialized for some
|
||||
conditions. So always initialize it.
|
||||
|
||||
qxcbkeyboard.cpp:284:48: error: ‘symbolsGroup2’ may be used uninitialized [-Werror=maybe-uninitialized]
|
||||
|
||||
Change-Id: If05aeeb7176e4f13af9afffd16e84af7d7806b0d
|
||||
Reviewed-by: Zhang Hao <543985125@qq.com>
|
||||
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
||||
(cherry picked from commit e92e48bc791ddafe14be39aae10790b680ddd1f7)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
src/plugins/platforms/xcb/qxcbkeyboard.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
|
||||
index 48abbbf74c..99870d6f45 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
|
||||
@@ -257,7 +257,7 @@ struct xkb_keymap *QXcbKeyboard::keymapFromCore(const KeysymModifierMap &keysymM
|
||||
const int maxGroup1 = 4; // We only support 4 shift states anyway
|
||||
const int maxGroup2 = 2; // Only 3rd and 4th keysym are group 2
|
||||
xcb_keysym_t symbolsGroup1[maxGroup1];
|
||||
- xcb_keysym_t symbolsGroup2[maxGroup2];
|
||||
+ xcb_keysym_t symbolsGroup2[maxGroup2] = { XKB_KEY_NoSymbol, XKB_KEY_NoSymbol };
|
||||
for (int i = 0; i < maxGroup1 + maxGroup2; i++) {
|
||||
xcb_keysym_t sym = i < keysymsPerKeycode ? codeMap[i] : XKB_KEY_NoSymbol;
|
||||
if (mapGroup2ToLevel3) {
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 10 07:30:33 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add GCC 12 compatibility changes:
|
||||
* 0001-XCB-fix-GCC-12-warning-about-uninitialized-variable-.patch
|
||||
* 0001-Fix-build-with-GCC12-avoid-QCborStreamReader-prepars.patch
|
||||
* 0001-QtOpenGL-Fix-build-with-GCC-12-qt_imageForBrush-is-i.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 3 11:25:01 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -40,6 +40,9 @@ Source: https://download.qt.io/official_releases/qt/%{short_version}/%{r
|
||||
Source99: qt6-base-rpmlintrc
|
||||
# Patches 0-100 are upstream patches #
|
||||
Patch0: 0001-CMake-Don-t-hardcode-the-library-directory-name.patch
|
||||
Patch1: 0001-XCB-fix-GCC-12-warning-about-uninitialized-variable-.patch
|
||||
Patch2: 0001-Fix-build-with-GCC12-avoid-QCborStreamReader-prepars.patch
|
||||
Patch3: 0001-QtOpenGL-Fix-build-with-GCC-12-qt_imageForBrush-is-i.patch
|
||||
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
|
||||
Patch100: 0001-Tell-the-truth-about-private-API.patch
|
||||
%if 0%{?suse_version} == 1500
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user