apply upstream patches

5 files changed, 102 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4ae4dc7339f..a15f1102b330 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-terminal-transparency
 	pkgdesc = The GNOME Terminal Emulator, with background transparency
 	pkgver = 3.20.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.gnome.org/Apps/Terminal
 	changelog = gnome-terminal-transparency.changelog
 	arch = i686
@@ -24,8 +24,12 @@ pkgbase = gnome-terminal-transparency
 	conflicts = gnome-terminal
 	options = !emptydirs
 	source = https://download.gnome.org/sources/gnome-terminal/3.20/gnome-terminal-3.20.2.tar.xz
+	source = dnd-crash.patch
+	source = palette-color.patch
 	source = gnome-terminal-transparency.patch
 	sha256sums = f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23
+	sha256sums = 0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166
+	sha256sums = 1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573
 	sha256sums = b28361f4606f495ade3035fcabb5525d4561f2dd2458e25a7e79da8b8634c20d
 
 pkgname = gnome-terminal-transparency
diff --git a/PKGBUILD b/PKGBUILD
index 5e0654b3aa24..402cdaf51857 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=gnome-terminal-transparency
 _pkgname=gnome-terminal
 pkgver=3.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Terminal Emulator, with background transparency"
 url="https://wiki.gnome.org/Apps/Terminal"
 arch=(i686 x86_64)
@@ -14,22 +14,26 @@ license=(GPL)
 depends=(vte3 gsettings-desktop-schemas dconf)
 makedepends=(intltool itstool docbook-xsl libnautilus-extension appdata-tools
              gnome-shell gconf vala yelp-tools)
-provides=("${_pkgname}=${pkgver}")
-conflicts=("${_pkgname}")
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
 options=(!emptydirs)
 groups=(gnome)
 changelog=$pkgname.changelog
-source=("https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz"
-        'gnome-terminal-transparency.patch'
-)
+source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz
+        dnd-crash.patch
+        palette-color.patch
+        gnome-terminal-transparency.patch)
 sha256sums=('f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23'
-            'b28361f4606f495ade3035fcabb5525d4561f2dd2458e25a7e79da8b8634c20d'
-)
+            '0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166'
+            '1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573'
+            'b28361f4606f495ade3035fcabb5525d4561f2dd2458e25a7e79da8b8634c20d')
 
 prepare () {
-	cd "${_pkgname}-${pkgver}"
-	patch -p1 -i '../gnome-terminal-transparency.patch'
-	autoreconf -f -i
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../dnd-crash.patch
+  patch -Np1 -i ../palette-color.patch
+  patch -Np1 -i ../gnome-terminal-transparency.patch
+  autoreconf -f -i
 }
 
 build() {
diff --git a/dnd-crash.patch b/dnd-crash.patch
new file mode 100644
index 000000000000..baa66e5195fc
--- /dev/null
+++ b/dnd-crash.patch
@@ -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
+
diff --git a/gnome-terminal-transparency.changelog b/gnome-terminal-transparency.changelog
index 3b2b244eebb6..eb6793c3937b 100644
--- a/gnome-terminal-transparency.changelog
+++ b/gnome-terminal-transparency.changelog
@@ -1,3 +1,6 @@
+2016-08-09
+	apply upstream patches from from 3.20 branch
+
 2016-05-12
 	upstream update: 3.20.1 -> 3.20.2
 	modify patch for latvian translation to stay compatible
diff --git a/palette-color.patch b/palette-color.patch
new file mode 100644
index 000000000000..f5924094e62a
--- /dev/null
+++ b/palette-color.patch
@@ -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
+