From fb5a901875822f995255587f94a3db15a562ffdc16018b6bad37dc2eccadcbeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Sun, 9 Dec 2018 12:44:11 +0000
Subject: [PATCH] Accepting request 656113 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/656113
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=212
---
 ...Comment-out-tab-dragging-description.patch | 34 +++++++++++++++++
 ...inal-window-Fix-zoom-out-sensitivity.patch | 37 +++++++++++++++++++
 gnome-terminal.changes                        |  9 +++++
 gnome-terminal.spec                           |  4 ++
 4 files changed, 84 insertions(+)
 create mode 100644 gnome-terminal-Comment-out-tab-dragging-description.patch
 create mode 100644 gnome-terminal-window-Fix-zoom-out-sensitivity.patch

diff --git a/gnome-terminal-Comment-out-tab-dragging-description.patch b/gnome-terminal-Comment-out-tab-dragging-description.patch
new file mode 100644
index 0000000..a7570bf
--- /dev/null
+++ b/gnome-terminal-Comment-out-tab-dragging-description.patch
@@ -0,0 +1,34 @@
+From 34e3afa46e28de044e1a5094b6e319da2fa423d1 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Thu, 25 Oct 2018 16:49:55 +0200
+Subject: [PATCH] help: Comment out tab dragging description
+
+Dragging tabs is currently disabled.
+
+(cherry picked from commit adf7e5cf90907372cc7da878fcae302d5d6e4674)
+---
+ help/C/gs-tabs.page | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/help/C/gs-tabs.page b/help/C/gs-tabs.page
+index 283f8476..cd89476b 100644
+--- a/help/C/gs-tabs.page
++++ b/help/C/gs-tabs.page
+@@ -127,6 +127,7 @@
+ 
+   </section>
+ 
++  <!--
+   <section id="move-tab-another-window">
+     <title>Move a tab to another <app>Terminal</app> window</title>
+ 
+@@ -171,5 +172,6 @@
+       </item>
+     </steps>
+   </section>
++  -->
+ 
+ </page>
+-- 
+2.18.1
+
diff --git a/gnome-terminal-window-Fix-zoom-out-sensitivity.patch b/gnome-terminal-window-Fix-zoom-out-sensitivity.patch
new file mode 100644
index 0000000..60bf71f
--- /dev/null
+++ b/gnome-terminal-window-Fix-zoom-out-sensitivity.patch
@@ -0,0 +1,37 @@
+From 9143c23baec5eb361fbc01199fa8e62997dc14d2 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Sat, 3 Nov 2018 21:07:02 +0100
+Subject: [PATCH] window: Fix zoom-out sensitivity
+
+https://gitlab.gnome.org/GNOME/gnome-terminal/issues/47
+(cherry picked from commit 7a57e7d3ca5468ebab92a080abf8159bf96e23e1)
+---
+ src/terminal-window.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 4ed36474..f968c8be 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -1514,12 +1514,14 @@ terminal_window_update_zoom_sensitivity (TerminalWindow *window)
+   if (screen == NULL)
+     return;
+ 
+-  double zoom = vte_terminal_get_font_scale (VTE_TERMINAL (screen));
+-
++  double v;
++  double zoom = v = vte_terminal_get_font_scale (VTE_TERMINAL (screen));
+   g_simple_action_set_enabled (lookup_action (window, "zoom-in"),
+-                               find_larger_zoom_factor (&zoom));
++                               find_larger_zoom_factor (&v));
++
++  v = zoom;
+   g_simple_action_set_enabled (lookup_action (window, "zoom-out"),
+-                               find_smaller_zoom_factor (&zoom));
++                               find_smaller_zoom_factor (&v));
+ }
+ 
+ static void
+-- 
+2.18.1
+
diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index f7316ef..e53cb4a 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Dec  7 17:49:45 UTC 2018 - bjorn.lie@gmail.com
+
+- Add upstream bug fix patches:
+  + gnome-terminal-Comment-out-tab-dragging-description.patch:
+    help: Comment out tab dragging description.
+  + gnome-terminal-window-Fix-zoom-out-sensitivity.patch: window:
+    Fix zoom-out sensitivity.
+
 -------------------------------------------------------------------
 Wed Oct 24 10:04:05 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index bf6db06..72bfd89 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -24,6 +24,10 @@ License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          System/X11/Terminals
 URL:            https://wiki.gnome.org/Apps/Terminal
 Source0:        https://download.gnome.org/sources/gnome-terminal/3.30/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-terminal-Comment-out-tab-dragging-description.patch -- help: Comment out tab dragging description
+Patch0:         gnome-terminal-Comment-out-tab-dragging-description.patch
+# PATCH-FIX-UPSTREAM gnome-terminal-window-Fix-zoom-out-sensitivity.patch - window: Fix zoom-out sensitivity
+Patch1:         gnome-terminal-window-Fix-zoom-out-sensitivity.patch
 
 BuildRequires:  fdupes
 # Needed for search provider. It should not be needed in my opionion, we have to take this up with upstream, or just provide search provider interface definition file as source.