[arch-commits] Commit in gnome-terminal/trunk (3 files)

[Jan de Groot]

    Date: Friday, August 5, 2016 @ 11:19:53
  Author: jgc
Revision: 273101

upgpkg: gnome-terminal 3.20.2-2

Apply 2 upstream patches from 3.20 branch

Added:
  gnome-terminal/trunk/dnd-crash.patch
  gnome-terminal/trunk/palette-color.patch
Modified:
  gnome-terminal/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   16 +++++++++++++---
 dnd-crash.patch     |   39 +++++++++++++++++++++++++++++++++++++++
 palette-color.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-05 10:51:11 UTC (rev 273100)
+++ PKGBUILD	2016-08-05 11:19:53 UTC (rev 273101)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-terminal
 pkgver=3.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Terminal Emulator"
 url="https://wiki.gnome.org/Apps/Terminal"
 arch=(i686 x86_64)
@@ -13,9 +13,19 @@
              gnome-shell gconf vala)
 options=(!emptydirs)
 groups=(gnome)
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        dnd-crash.patch
+        palette-color.patch)
+sha256sums=('f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23'
+            '0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166'
+            '1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../dnd-crash.patch
+  patch -Np1 -i ../palette-color.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \

Added: dnd-crash.patch
===================================================================
--- dnd-crash.patch	                        (rev 0)
+++ dnd-crash.patch	2016-08-05 11:19:53 UTC (rev 273101)
@@ -0,0 +1,39 @@
+From 69e82e354de26cd7e6957b95740c724ed1c31c10 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at 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
+

Added: palette-color.patch
===================================================================
--- palette-color.patch	                        (rev 0)
+++ palette-color.patch	2016-08-05 11:19:53 UTC (rev 273101)
@@ -0,0 +1,40 @@
+From 2a10e0ed7d6210b0522ffc2faf8483c64f1d183d Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont at 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
+