[packages/qt6] up to 6.6.1
atler
atler at pld-linux.org
Tue Nov 28 10:39:48 CET 2023
commit ccb19b01ac9edd36ca3dd7cb1d2a73219b5c0adb
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Nov 28 09:28:17 2023 +0100
up to 6.6.1
ffmpeg-binutils.patch | 85 ---------------------------------------------------
libxkbcommon1.6.patch | 42 -------------------------
ninja-program.patch | 2 +-
qt6.spec | 14 +++------
4 files changed, 6 insertions(+), 137 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index 56dffa5..f584477 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -108,21 +108,19 @@
Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
-Version: 6.6.0
-Release: 3
+Version: 6.6.1
+Release: 1
License: LGPL v3 or GPL v2 or GPL v3 or commercial
Group: X11/Libraries
Source0: https://download.qt.io/official_releases/qt/6.6/%{version}/single/qt-everywhere-src-%{version}.tar.xz
-# Source0-md5: efc59647689c2548961a7312d075baf6
+# Source0-md5: 91aad0b55cf01be5a08ca9bece490f39
Patch0: system-cacerts.patch
Patch1: ninja-program.patch
Patch2: %{name}-gn.patch
Patch3: no-implicit-sse2.patch
Patch4: x32.patch
Patch5: qtwebengine-cmake-build-type.patch
-Patch6: libxkbcommon1.6.patch
-Patch7: ffmpeg-binutils.patch
-Patch8: libxml2.12.patch
+Patch6: libxml2.12.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -3646,9 +3644,7 @@ narzędzia.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1 -d qtbase
-%patch7 -p1 -d qtwebengine/src/3rdparty
-%patch8 -p1 -d qtwebengine
+%patch6 -p1 -d qtwebengine
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
diff --git a/ffmpeg-binutils.patch b/ffmpeg-binutils.patch
deleted file mode 100644
index a8e17cb..0000000
--- a/ffmpeg-binutils.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 29354c7c7def7bdc66bcd25d401677fd9421f657 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: Fix ffmpeg assembly with newer binutil
-
-avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
-
-Deals with: "Error: operand type mismatch for `shr'"
-
-Fixes: QTBUG-116649
-Pick-to: 108-based
-Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
-Reviewed-by: Shawn Rutledge <shawn.rutledge at qt.io>
----
- .../third_party/ffmpeg/libavcodec/x86/mathops.h | 26 +++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5ed198..ca7e2dffc10 100644
---- a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
---
-cgit v1.2.3
-
diff --git a/libxkbcommon1.6.patch b/libxkbcommon1.6.patch
deleted file mode 100644
index 0be9f45..0000000
--- a/libxkbcommon1.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi at qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: xkb: fix build with libxkbcommon 1.6.0 and later
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
-https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
-https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
-
-Pick-to: 6.6 6.5 6.2 5.15
-Fixes: QTBUG-117950
-Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
----
- src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
-index 26d87c5ff5..7b611790c6 100644
---- a/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/src/gui/platform/unix/qxkbcommon.cpp
-@@ -237,10 +237,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.
---
-cgit v1.2.3
-
diff --git a/ninja-program.patch b/ninja-program.patch
index aba1fc5..9134684 100644
--- a/ninja-program.patch
+++ b/ninja-program.patch
@@ -1,9 +1,9 @@
--- qt-everywhere-src-6.3.1/qtwebengine/src/CMakeLists.txt.orig 2022-06-08 08:40:31.000000000 +0200
+++ qt-everywhere-src-6.3.1/qtwebengine/src/CMakeLists.txt 2022-07-27 21:47:18.766238322 +0200
@@ -137,6 +137,8 @@
- -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
-DWEBENGINE_ROOT_BUILD_DIR=${PROJECT_BINARY_DIR}
+ -DQT_ALLOW_SYMLINK_IN_PATHS=${QT_ALLOW_SYMLINK_IN_PATHS}
+ -DNinja_EXECUTABLE:FILEPATH=${Ninja_EXECUTABLE}
+ -DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}
)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/ccb19b01ac9edd36ca3dd7cb1d2a73219b5c0adb
More information about the pld-cvs-commit
mailing list