pool/gnome-terminal
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 415276 from GNOME:Next

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/415276
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=168
This commit is contained in:
Bjørn Lie 2016-07-28 12:17:20 +00:00 committed by Git OBS Bridge
parent 696554bbbe
commit 2c4e1af819
4 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnome-terminal-notebook-avoid-crash-on-tab-DND.patch Normal file
View File

@ -0,0 +1,39 @@
From 69e82e354de26cd7e6957b95740c724ed1c31c10 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Mon, 25 Jul 2016 19:38:18 +0200
Subject: notebook: avoid crash on tab DND
See "gtk_notebook_detach_tab" API documentation. Using it instead
of gtk_container_remove avoids an assertion crash in gtk+ when
dragging and dropping a tab between terminal windows.
See also original bug report at
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825818
https://bugzilla.gnome.org/show_bug.cgi?id=769161
(cherry picked from commit 85b448f7c9e219e82d4d8abafe405d73349c08c1)
---
src/terminal-notebook.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
index 9d488fc..b054676 100644
--- a/src/terminal-notebook.c
+++ b/src/terminal-notebook.c
@@ -152,8 +152,13 @@ terminal_notebook_remove_screen (TerminalMdiContainer *container,
update_tab_visibility (notebook, -1);
screen_container = terminal_screen_container_get_from_screen (screen);
+#if GTK_CHECK_VERSION(3, 16, 0)
+ gtk_notebook_detach_tab (GTK_NOTEBOOK (notebook),
+ GTK_WIDGET (screen_container));
+#else
gtk_container_remove (GTK_CONTAINER (notebook),
GTK_WIDGET (screen_container));
+#endif
}
static TerminalScreen *
--
cgit v0.12

40
gnome-terminal-profile-editor-initialize-palette.patch Normal file
View File

@ -0,0 +1,40 @@
From 2a10e0ed7d6210b0522ffc2faf8483c64f1d183d Mon Sep 17 00:00:00 2001
From: Egmont Koblinger <egmont@gmail.com>
Date: Fri, 22 Jul 2016 16:42:14 +0200
Subject: profile: editor: Properly initialize the first palette color
https://bugzilla.gnome.org/show_bug.cgi?id=768850
(cherry picked from commit 6447aded26416e49bf5fdce8a8fd13c16c0ebb44)
---
src/profile-editor.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/profile-editor.c b/src/profile-editor.c
index ff26df6..82cc7a9 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -405,18 +405,13 @@ profile_palette_notify_colorpickers_cb (GSettings *profile,
for (i = 0; i < n_colors; i++)
{
char name[32];
- GdkRGBA old_color;
g_snprintf (name, sizeof (name), "palette-colorpicker-%" G_GSIZE_FORMAT, i + 1);
w = (GtkWidget *) gtk_builder_get_object (builder, name);
- gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (w), &old_color);
- if (!rgba_equal (&old_color, &colors[i]))
- {
- g_signal_handlers_block_by_func (w, G_CALLBACK (palette_color_notify_cb), profile);
- gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &colors[i]);
- g_signal_handlers_unblock_by_func (w, G_CALLBACK (palette_color_notify_cb), profile);
- }
+ g_signal_handlers_block_by_func (w, G_CALLBACK (palette_color_notify_cb), profile);
+ gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &colors[i]);
+ g_signal_handlers_unblock_by_func (w, G_CALLBACK (palette_color_notify_cb), profile);
}
}
--
cgit v0.12

8
gnome-terminal.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 25 22:19:39 UTC 2016 - zaitor@opensuse.org
- Add gnome-terminal-notebook-avoid-crash-on-tab-DND.patch and
gnome-terminal-profile-editor-initialize-palette.patch: Two
cherrypicked bugfix commits from upstream stable branch
(bgo#768850, bgo#769161, boo#980474).
-------------------------------------------------------------------
Thu Jul 21 18:07:36 CEST 2016 - fcrozat@suse.com

6
gnome-terminal.spec
View File

@ -26,6 +26,10 @@ Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-terminal/3.20/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-terminal-resize-fix.patch bgo#760944 zaitor@opensuse.org -- Fix resizing of gnome-terminal, patches from upstream bug.
Patch0: gnome-terminal-resize-fix.patch
# PATCH-FIX-UPSTREAM gnome-terminal-profile-editor-initialize-palette.patch bgo#768850 zaitor@opensuse.org -- profile: editor: Properly initialize the first palette color
Patch1: gnome-terminal-profile-editor-initialize-palette.patch
# PATCH-FIX-UPSTREAM gnome-terminal-notebook-avoid-crash-on-tab-DND.patch bgo#769161 zaitor@opensuse.org -- notebook: avoid crash on tab DND
Patch2: gnome-terminal-notebook-avoid-crash-on-tab-DND.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.
BuildRequires: gnome-shell
@ -84,6 +88,8 @@ arbitrary folders.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
translation-update-upstream
%build