[neon/qt/qtbase/Neon/unstable] debian/patches: limit patches for neon using kde qt branches

Jonathan Riddell null at kde.org
Fri Apr 26 13:17:03 BST 2024


Git commit 7ecbceab2016e347d4e9b4af1373f31dad380fd1 by Jonathan Riddell.
Committed on 26/04/2024 at 12:17.
Pushed by jriddell into branch 'Neon/unstable'.

limit patches for neon using kde qt branches

M  +4    -4    debian/patches/cast_types_for_egl_x11_test.diff
M  +0    -17   debian/patches/series

https://invent.kde.org/neon/qt/qtbase/-/commit/7ecbceab2016e347d4e9b4af1373f31dad380fd1

diff --git a/debian/patches/cast_types_for_egl_x11_test.diff b/debian/patches/cast_types_for_egl_x11_test.diff
index 45297e63..8a33d29c 100644
--- a/debian/patches/cast_types_for_egl_x11_test.diff
+++ b/debian/patches/cast_types_for_egl_x11_test.diff
@@ -2,11 +2,11 @@ Description: properly cast types for libglvnd 1.3.4
 Origin: https://src.fedoraproject.org/rpms/qt5-qtbase/blob/rawhide/f/qtbase-everywhere-src-5.15.2-libglvnd.patch
 Author: Rex Dieter <rdieter at gmail.com>
 
-Index: qtbase-everywhere-src-5.15.13/src/gui/configure.json
+Index: qtbase-src/src/gui/configure.json
 ===================================================================
---- qtbase-everywhere-src-5.15.13.orig/src/gui/configure.json
-+++ qtbase-everywhere-src-5.15.13/src/gui/configure.json
-@@ -838,9 +838,9 @@
+--- qtbase-src.orig/src/gui/configure.json
++++ qtbase-src/src/gui/configure.json
+@@ -839,9 +839,9 @@
                  ],
                  "include": [ "EGL/egl.h", "X11/Xlib.h" ],
                  "main": [
diff --git a/debian/patches/series b/debian/patches/series
index fe69bdec..14cd072a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,23 +3,6 @@ a11y_root.diff
 gnome_wayland.diff
 qmenu_set_transient_parent.diff
 
-openssl3.diff
-qshapedpixmapwindow_no_tooltip.diff
-CVE-2023-32763.diff
-CVE-2023-32762.diff
-CVE-2023-33285.diff
-CVE-2023-34410.diff
-sql_odbc_more_unicode_checks.diff
-sql_odbc_fix_unicode_check.diff
-dont_use_O_PATH.diff
-fix_qdbusmacros_h.diff
-CVE-2023-37369.diff
-CVE-2023-38197.diff
-libxkbcommon_1.6.0.diff
-loongarch.diff
-CVE-2023-51714.diff
-CVE-2024-25580.diff
-
 # Debian specific.
 no_htmlinfo_example.diff
 remove_privacy_breaches.diff


More information about the Neon-commits mailing list