qt5: 5.15.10 -> 5.15.11

This commit is contained in:
Tim Biermann 2023-10-12 18:14:06 +02:00
parent 7e6d995ae9
commit 94f3684193
Signed by: tb
GPG Key ID: 42F8B4E30B673606
5 changed files with 4690 additions and 4681 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,11 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/X13pqCXmpwlcGseYnVFdbjvJm60uzg1B4zIfFSyMTd14TFaV4cBNK/1uobJhFPlpuMHMP8dUnUxMqU36Muvogs=
SHA256 (Pkgfile) = d9b50352be90367b6a1bb76654d303f749dceac448b45cbcfc81a5522a635fdf
SHA256 (.footprint) = 6727647eede586bf5661eb3960d705d2271ac99f6e23f57543624810fd4fe173
SHA256 (qt-everywhere-opensource-src-5.15.10.tar.xz) = b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca
SHA256 (qt-everywhere-opensource-src-5.15.10-kf5-1.patch) = 39848ffa81817b251db5f122b6942362174274e670ce51443878d4012c7ebf53
RWSE3ohX2g5d/bc/dTNB2JOgmLD4I/rkMT9BtkumF1BMSVHv/larKhi4fFMcnlwA67nLXnzJcZQ8YmQOxyQmJqU7CzqdrGmsjgM=
SHA256 (Pkgfile) = 2c2652d2936e5e7c55382eb999dc8919921ec544c92007eedea041e708f020d2
SHA256 (.footprint) = befcd167d7f0262e49e230ea666bc55b7cd632472b5412bf3e0fea816d77fe28
SHA256 (qt-everywhere-opensource-src-5.15.11.tar.xz) = 7426b1eaab52ed169ce53804bdd05dfe364f761468f888a0f15a308dc1dc2951
SHA256 (qt-everywhere-opensource-src-5.15.11-kf5-1.patch) = 613a339712a37f583e575a9855fb203960639ac144f9f48516c8cf1dbdd797d1
SHA256 (qtbase-5.15.8-fix-missing-qtsan-include.patch) = 65b435d09220fc66584f9613cdf7518367185af4e166c5b670301be6af98e8b1
SHA256 (qt-5.15.11-xkbcommon160.patch) = ec3a75466a2c0f99b397103a8f0ff278c5b73c38c26460fc0943b91e89655d80
SHA256 (qt5-cflags.patch) = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e
SHA256 (qtbase-everywhere-src-5.14.2-no_relocatable.patch) = 1fed8b9e4eb5749e70d85d7678f08a5abc881e2a2ecab85fb21f59cb124500e5

View File

@ -5,11 +5,12 @@
# Optional: assimp bluez cups double-conversion gtk3 ibus icu krb5 libinput libsdl2 mariadb mtdev openal pulseaudio unixodbc vulkan-headers wayland-protocols xkeyboard-config
name=qt5
version=5.15.10
version=5.15.11
release=1
source=(https://download.qt.io/archive/qt/5.15/$version/single/qt-everywhere-opensource-src-$version.tar.xz
https://www.linuxfromscratch.org/patches/blfs/svn/qt-everywhere-opensource-src-$version-kf5-1.patch
qtbase-5.15.8-fix-missing-qtsan-include.patch
qt-5.15.11-xkbcommon160.patch
qt5-cflags.patch
qt5-logo.png
qtbase-everywhere-src-5.14.2-no_relocatable.patch
@ -26,6 +27,7 @@ build() {
cd qt-everywhere-src-$version
patch -p1 -i $SRC/qt-everywhere-opensource-src-$version-kf5-1.patch
patch -p1 -i $SRC/qt-5.15.11-xkbcommon160.patch
patch -d qtbase -p1 -i $SRC/qt5-cflags.patch
patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.14.2-no_relocatable.patch
patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.15.2-libglvnd.patch

View File

@ -0,0 +1,19 @@
diff -Naur qt-everywhere-src-5.15.11.orig/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp qt-everywhere-src-5.15.11/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
--- qt-everywhere-src-5.15.11.orig/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp 2023-10-12 17:55:18.450758031 +0200
+++ qt-everywhere-src-5.15.11/qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp 2023-10-12 17:56:18.261570820 +0200
@@ -273,11 +273,10 @@
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>,
- 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>,
-
+ Xkb2Qt<0xfe90, Qt::Key_Dead_Lowline>,
+ Xkb2Qt<0xfe91, Qt::Key_Dead_Aboveverticalline>,
+ Xkb2Qt<0xfe92, Qt::Key_Dead_Belowverticalline>,
+ Xkb2Qt<0xfe93, Qt::Key_Dead_Longsolidusoverlay>,
// Special keys from X.org - This include multimedia keys,
// wireless/bluetooth/uwb keys, special launcher keys, etc.
Xkb2Qt<XKB_KEY_XF86Back, Qt::Key_Back>,

View File

@ -1,9 +0,0 @@
diff -up qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py
--- qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me 2018-06-23 11:29:21.750066271 +0200
+++ qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py 2018-06-23 11:30:07.457292033 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#############################################################################
##