!116 fix build error of libxkbcommon 1.6.0
From: @dou33 Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot
Gitee
commit
a2385c0b86
31
fix-build-error-of-libxkbcommon-1.6.0.patch
Normal file
31
fix-build-error-of-libxkbcommon-1.6.0.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From cf3d8031ac756fb339658d1e9fabb9e7d254e66f Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Mon, 29 Jan 2024 11:10:54 +0800
|
||||
Subject: [PATCH] fix build error of libxkbcommon 1.6.0
|
||||
|
||||
---
|
||||
src/platformsupport/input/xkbcommon/qxkbcommon.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
|
||||
index b713c194..ecf02de6 100644
|
||||
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
|
||||
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
|
||||
@@ -273,10 +273,14 @@ static constexpr const auto KeyTbl = qMakeArray(
|
||||
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
|
||||
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
|
||||
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
|
||||
+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
|
||||
+ The define check is kind of version check here. */
|
||||
+#ifdef XKB_KEY_dead_lowline
|
||||
Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
|
||||
Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
|
||||
Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
|
||||
Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
|
||||
+#endif
|
||||
|
||||
// Special keys from X.org - This include multimedia keys,
|
||||
// wireless/bluetooth/uwb keys, special launcher keys, etc.
|
||||
--
|
||||
2.41.0
|
||||
|
||||
Binary file not shown.
@ -1,17 +0,0 @@
|
||||
diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.firebird qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json
|
||||
--- qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.firebird 2019-01-28 11:11:52.000000000 -0600
|
||||
+++ qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json 2019-02-03 13:41:27.392305128 -0600
|
||||
@@ -49,10 +49,11 @@
|
||||
"ibase": {
|
||||
"label": "InterBase",
|
||||
"test": {},
|
||||
- "headers": "ibase.h",
|
||||
+ "headers": "ibase.h",
|
||||
"sources": [
|
||||
{ "libs": "-lgds32_ms", "condition": "config.win32" },
|
||||
- { "libs": "-lgds", "condition": "!config.win32" }
|
||||
+ { "libs": "-lgds", "condition": "!config.win32" },
|
||||
+ { "libs": "-lfbclient", "condition": "!config.win32" }
|
||||
]
|
||||
},
|
||||
"mysql": {
|
||||
@ -36,7 +36,7 @@
|
||||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.15.10
|
||||
Release: 5
|
||||
Release: 6
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
@ -59,7 +59,7 @@ Source3: 10-qt5-check-opengl2.sh
|
||||
Source4: macros.qt5-qtbase
|
||||
|
||||
# support multilib optflags
|
||||
#Patch2: qtbase-multilib_optflags.patch
|
||||
Patch0000: qtbase-multilib_optflags.patch
|
||||
|
||||
# make mixing versions with private apis a warning instead of fatal error
|
||||
Patch0001: qtbase-everywhere-src-5.15.6-private_api_warning.patch
|
||||
@ -68,11 +68,6 @@ Patch0001: qtbase-everywhere-src-5.15.6-private_api_warning.patch
|
||||
# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
|
||||
Patch0002: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
|
||||
|
||||
# 1381828 - Broken window scaling for some QT5 applications (#1381828)
|
||||
# This patch moves the threshold for 2x scaling from the DPI of 144 to 192,
|
||||
# the same value GNOME uses. It's not a complete solution...
|
||||
#Patch51: qtbase-hidpi_scale_at_192.patch
|
||||
|
||||
# 1. Workaround moc/multilib issues
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020
|
||||
# https://bugreports.qt.io/browse/QTBUG-49972
|
||||
@ -113,7 +108,7 @@ Patch0013: %{name}-gcc11.patch
|
||||
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
|
||||
# git diff v5.15.10-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-20230613.patch.gz
|
||||
Patch100: kde-5.15-rollup-20230613.patch
|
||||
|
||||
Patch101: qtbase-5.15.10-fix-missing-qtsan-include.patch
|
||||
# Workaround for font rendering issue with cjk-vf-fonts
|
||||
@ -136,6 +131,7 @@ Patch0025: CVE-2023-37369.patch
|
||||
Patch0026: qtbase5.15.10-CVE-2023-38197.patch
|
||||
# https://codereview.qt-project.org/c/qt/qtbase/+/503026
|
||||
Patch0027: qtbase5.15.10-CVE-2023-43114.patch
|
||||
Patch0028: fix-build-error-of-libxkbcommon-1.6.0.patch
|
||||
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
||||
# Those themes are there for platform integration. If the required libraries are
|
||||
# not there, the platform to integrate with isn't either. Then Qt will just
|
||||
@ -373,13 +369,12 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
||||
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
||||
|
||||
## dowstream patches
|
||||
%patch -P0000 -p1
|
||||
%patch -P0001 -p1 -b .private_api_warning
|
||||
|
||||
## upstream fixes
|
||||
|
||||
%patch -P0002 -p1 -b .QT_VERSION_CHECK
|
||||
# FIXME/TODO : rebase or drop -- rdieter
|
||||
#patch -P51 -p1 -b .hidpi_scale_at_192
|
||||
%patch -P0004 -p1 -b .moc_macros
|
||||
%patch -P0005 -p1 -b .qt5gui_cmake_isystem_includes
|
||||
%patch -P0006 -p1 -b .qmake_LFLAGS
|
||||
@ -404,6 +399,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
||||
%patch -P0025 -p1
|
||||
%patch -P0026 -p1
|
||||
%patch -P0027 -p1
|
||||
%patch -P0028 -p1
|
||||
# move some bundled libs to ensure they're not accidentally used
|
||||
pushd src/3rdparty
|
||||
mkdir UNUSED
|
||||
@ -1061,6 +1057,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 31 2024 douyan <douyan@kylinos.cn> - 5.15.10-6
|
||||
- fix build error of libxkbcommon-1.6.0
|
||||
|
||||
* Fri Nov 24 2023 hua_yadong <huayadong@kylinos.cn> - 5.15.10-5
|
||||
- fix qtbase5.15.10-CVE-2023-43114.patch
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp.hidpi_scale_at_192 qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp
|
||||
--- qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp.hidpi_scale_at_192 2019-02-03 13:21:27.866906481 -0600
|
||||
+++ qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp 2019-02-03 13:23:47.554767565 -0600
|
||||
@@ -744,7 +744,7 @@ void QXcbScreen::updateGeometry(const QR
|
||||
// Use 128 as a reference DPI on small screens. This favors "small UI" over "large UI".
|
||||
qreal referenceDpi = physicalSize().width() <= 320 ? 128 : 96;
|
||||
|
||||
- m_pixelDensity = qMax(1, qRound(dpi/referenceDpi));
|
||||
+ m_pixelDensity = qMax(1, (int) (dpi/referenceDpi)); //instead of rounding at 1.5, round at 2.0 (same as GNOME)
|
||||
m_geometry = geometry;
|
||||
m_availableGeometry = geometry & m_virtualDesktop->workArea();
|
||||
QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);
|
||||
Loading…
x
Reference in New Issue
Block a user