From de14a95bea7b76e313bee03ebff6e92c2e16db0b Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Sat, 14 May 2022 03:16:05 +0800 Subject: [PATCH] format patches --- ...ntext-provider-with-FALLBACK-priorit.patch | 16 +++++++------- debian/patches/91_keep_fds.patch | 21 ++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch b/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch index 5e08136..02b2084 100644 --- a/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch +++ b/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch @@ -11,13 +11,13 @@ This reverts commit bd86e7637d89a55941674756e3e223c82aee2305. Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=740123 --- - src/vtegtk.cc | 11 +++++++++++ - 1 file changed, 11 insertions(+) + src/vtegtk.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) -Index: vte2.91/src/vtegtk.cc -=================================================================== ---- vte2.91.orig/src/vtegtk.cc -+++ vte2.91/src/vtegtk.cc +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index 8edb9d9..8f2dd2d 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc @@ -74,6 +74,7 @@ struct _VteTerminalClassPrivate { @@ -36,7 +36,7 @@ Index: vte2.91/src/vtegtk.cc GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); /* Initialize private data. NOTE: place is zeroed */ -@@ -1813,6 +1817,7 @@ vte_terminal_class_init(VteTerminalClass +@@ -1813,6 +1817,7 @@ vte_terminal_class_init(VteTerminalClass *klass) klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, VTE_TYPE_TERMINAL, VteTerminalClassPrivate); klass->priv->style_provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ()); @@ -44,7 +44,7 @@ Index: vte2.91/src/vtegtk.cc gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (klass->priv->style_provider), "VteTerminal, " VTE_TERMINAL_CSS_NAME " {\n" "padding: 1px 1px 1px 1px;\n" -@@ -1821,6 +1826,11 @@ vte_terminal_class_init(VteTerminalClass +@@ -1821,6 +1826,11 @@ vte_terminal_class_init(VteTerminalClass *klass) "}\n", -1, NULL); diff --git a/debian/patches/91_keep_fds.patch b/debian/patches/91_keep_fds.patch index 9708a07..5553984 100644 --- a/debian/patches/91_keep_fds.patch +++ b/debian/patches/91_keep_fds.patch @@ -5,13 +5,14 @@ Subject: Keep file descriptors open on vte_fork_pty(). Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=320128 https://launchpad.net/bugs/1756238 --- - src/pty.cc | 38 ++++++++++++++++++++++++++++++++++++++ - 1 file changed, 38 insertions(+) + src/pty.cc | 37 +++++++++++++++++++++++++++++++++++++ + src/pty.hh | 2 ++ + 2 files changed, 39 insertions(+) -Index: vte2.91/src/pty.cc -=================================================================== ---- vte2.91.orig/src/pty.cc -+++ vte2.91/src/pty.cc +diff --git a/src/pty.cc b/src/pty.cc +index b0f56af..822edc0 100644 +--- a/src/pty.cc ++++ b/src/pty.cc @@ -249,6 +249,21 @@ Pty::child_setup() const noexcept close(fd); } @@ -70,10 +71,10 @@ Index: vte2.91/src/pty.cc _VTE_DEBUG_IF (VTE_DEBUG_MISC) { g_printerr ("Spawning command:\n"); for (i = 0; argv[i] != NULL; i++) { -Index: vte2.91/src/pty.hh -=================================================================== ---- vte2.91.orig/src/pty.hh -+++ vte2.91/src/pty.hh +diff --git a/src/pty.hh b/src/pty.hh +index f03d279..fb42f33 100644 +--- a/src/pty.hh ++++ b/src/pty.hh @@ -37,6 +37,8 @@ private: VtePtyFlags m_flags{VTE_PTY_DEFAULT};