[neon/qt/qtwayland/Neon/release] debian: Drop 0003-Include-locale.h-for-setlocale-LC_CTYPE.patch.

Dmitry Shachnev null at kde.org
Fri Jul 15 12:22:56 BST 2022


Git commit b3bc6f1b7284640ceac17f66bdb54bad6342fe6e by Dmitry Shachnev.
Committed on 03/07/2022 at 14:08.
Pushed by jriddell into branch 'Neon/release'.

Drop 0003-Include-locale.h-for-setlocale-LC_CTYPE.patch.

Included in the new release.

M  +2    -0    debian/changelog
D  +0    -26   debian/patches/0003-Include-locale.h-for-setlocale-LC_CTYPE.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtwayland/commit/b3bc6f1b7284640ceac17f66bdb54bad6342fe6e

diff --git a/debian/changelog b/debian/changelog
index 410ef6d..dd2ea6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtwayland-opensource-src (5.15.5-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.5.
   * Bump ABI version to 5-15-5.
+  * Drop 0003-Include-locale.h-for-setlocale-LC_CTYPE.patch, included in the
+    new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Jul 2022 16:44:58 +0300
 
diff --git a/debian/patches/0003-Include-locale.h-for-setlocale-LC_CTYPE.patch b/debian/patches/0003-Include-locale.h-for-setlocale-LC_CTYPE.patch
deleted file mode 100644
index 1a0db4b..0000000
--- a/debian/patches/0003-Include-locale.h-for-setlocale-LC_CTYPE.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4f5bef9e6e0d16bb859e7a99ef5ebfca2ac93f45 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <albert.astals.cid at kdab.com>
-Date: Mon, 10 May 2021 14:38:49 +0200
-Subject: [PATCH] Include locale.h for setlocale/LC_CTYPE
-
-Pick-to: 5.15
-Change-Id: Iced32a31a63cec71008549c1e0961d59ffc45a37
-Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
-(cherry picked from commit e9522eda46028f351d87311d898ab985856970b0)
----
- src/client/qwaylandinputcontext.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/client/qwaylandinputcontext.cpp
-+++ b/src/client/qwaylandinputcontext.cpp
-@@ -51,6 +51,10 @@
- #include "qwaylandinputmethodeventbuilder_p.h"
- #include "qwaylandwindow_p.h"
- 
-+#if QT_CONFIG(xkbcommon)
-+#include <locale.h>
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
- Q_LOGGING_CATEGORY(qLcQpaInputMethods, "qt.qpa.input.methods")
diff --git a/debian/patches/series b/debian/patches/series
index 5d69456..70e6cf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0001-Client-Announce-an-output-after-receiving-more-compl.patch
 0002-Fix-issue-with-repeated-window-size-changes.patch
-0003-Include-locale.h-for-setlocale-LC_CTYPE.patch
 0004-Client-Connect-drags-being-accepted-to-updating-the-.patch
 0005-Client-Disconnect-registry-listener-on-destruction.patch
 0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch



More information about the Neon-commits mailing list