x11-terms/gnome-terminal: fix ubuntu patches

x11-terms/gnome-terminal/Manifest

@@ -1,10 +1,11 @@
 AUX 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch 2158 BLAKE2B f31ab43309fdab745d4ac79c0572d5fc0a31c9f8bc198876c9eb465eecdbcc8f466bfc97215c815e602baf20b36e2be3a232b4c0b2b1fdd86e7775fe7c36821d SHA512 bac7d1909421a2ef95a3c94872152a9a235c342220ba72fc86e8d8efa450714e080536f6839a69038b9ece70368f87f29aad42cfbdd9f1a6053cc8803736fe58
-AUX 0001-Restore-transparency.patch 98655 BLAKE2B ac2747cacb97cd32cb7a7976201e8aa947f313f306863428e3187a316f3afc079e21192eaa0c23d9b902893657298dc03488b214736c7b05e3e717f11a1fe7fd SHA512 0839fb588863b0e4c7fe608ffb2a964e90def3952e6c0a7c3dd51fbc6eeefb99988c8aa5e19438639c6009f06b56a5bb50fb80659f142ab800afd2b35d5a386d
+AUX 0001-Restore-transparency.patch 21579 BLAKE2B 0f9e76f4d77722b79359871df5cd4fecf11f6f5465ea2ab1f97b0d6ca83142baa1cc8b0c9ff8e233ec2392559edc16fabb735c72944b57b52ca8f36fcf543278 SHA512 845a3eb1a722bdcf7c2936abf042dd8fecd8407074f0268ad9671351f233be20fa36f19bb2a8a9381bf32f5a0986cda7343617e08f84a99309de72d3ba000010
+AUX 0001-screen-window-Extra-padding-around-transparent-termi.patch 4868 BLAKE2B 26e22bf0d2221917073f27458a9c1ed1b1b0a36958a8c3dfd2ceaacd10980b8afc2b2fe0fdf686e67846968d8f8931a3455b12bfc6d45fa6e17defc50fffb185 SHA512 31e48b88f1d134cefbf5ee8d180263aa42cb4f1eb10ec76f5d097226466ebc6cb8ee3a8639b965fbed9ba756cb83ea8803a71614eda6e71b2d41492eec582967
 AUX Provide-fallback-for-reading-current-directory-if-OS.patch 3021 BLAKE2B d92614048b5d42a52f88173801ed9122a51961245cadf5b90dfaf6221fa3dab73d34b29f8b90881b588881f31a19ac10eae062a7c7df128572f7de106ca44319 SHA512 60e51dcb06c59d328d4dbb67ff13ba3d9d5a5dcb3df22f3e9b3356ab892ef6e2da8f52e6304b7f5cfb39baf047ea3365810163761382bc4d219065454b7e7500
 AUX gnome-terminal-3.44.1-fix-missing-wexitcode.patch 727 BLAKE2B 5aa58dea55d8370d66f1b356bad0f8add6dc01359387b6e45c093800276ffe3a7c0beb125935afb67cd093397ed5779ba123ba61e572f34d0fa7f28bc7cd8b11 SHA512 b03c250e1d25464dc483b6a9398ade5cde4d40ad2ddb59ee709f25bd07101f7ba22faf98e519ee7e7fb8a4d20a56d9fc08e13d3b5546d5749ffa2882156a05f4
 AUX screen-Use-clean-env-when-creating-new-tab.patch 2369 BLAKE2B 99f558ee3eba43927a20f6513a6102670f9688aa25742b665ac7c7a3eb1bb84e5ebbe57afe33ceecb00f3fda8afd2b8f6c9b6fd6e9b68848526182e6f4ca7951 SHA512 1688d90f412e418b6cc68609fd9d7ae513c21fa5650df5fdb0920afb523358030824cac1f5f7fb3f0205a5087c18d6ffdd3c25f1bebdca88a24561717c1ed2bc
 AUX scrollbar-background-theming.patch 6861 BLAKE2B aed720c4fe49e335eff20a3d73b71a1312348a1ce80d5b1d393364d749798d8a8eedc449cdf662c801bf748bf380d1ef6c4a230ae695ab6bb5d372214a82a39a SHA512 2c092cc33abd86647ae14c017a44339b348d3566bdbd96b05c1a5f50835cac71c738f15bc404bf2b7147d3d25381a5574be1c3b3c6fdce7855da64187f2eed6b
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.46.8.tar.bz2 1691033 BLAKE2B efcf6aa6ab0071fd525e2b5d56bb7a6e53bd8072a5c774c3cab7b52f613e60112a5fccebbf6354953acf3a76182d60f9abc2f7122eef017e4a543a68d21b76f1 SHA512 07b8b9a31d5c1f87ff6d9902b56bfe1eb75b32f25e5b5c97448f990f4c4d6ca73709e5af30e09701d2dc55331a33b6f006fdcc696d5c9ffa83e50919ac74fdfc
-EBUILD gnome-terminal-3.46.8.ebuild 2689 BLAKE2B b3d5a54f4da4e4e16f07c44b781d935a4e6edea02ca2f4bc6d7b4fc1b4634f92f892fefe15aa96cb25638961c3fff777c9365e4d4dee8bf071155e645c433be2 SHA512 34507be750c35da8bacd3e2833c7015d038b81ae2905a17f769e5d5665c155417007b96448c6f4331caea0bfa1f0b72592daf562212733c1da48098e28b9f3ea
+EBUILD gnome-terminal-3.46.8.ebuild 2776 BLAKE2B 57949602b41dbc3e75e448ce0e87289186de9bfc1318dd5f9ca8bd6ad9d877914af17a9b26388ed3c3079b9f0fd6762b3e26c779381375dac7ad0e00c4fe6958 SHA512 7c5506f8dd2b0dac086118e4db22d80e9dd55c7752bfd4e3415c8b37b6c005a2b8e62bea0a93a461ddc98d034f29022687de77423f0e591d553cc5feb4a42d3f
 MISC metadata.xml 544 BLAKE2B 9e4dda0925c1f09a6109a01a522965c0bd2d811d91e19054fecf09e2d732f6f03245410e7472c3accf83bc015e2747cf96dcf3ededb62cf4733ece3241e51389 SHA512 e53acf30ece7ccb0307f9bb750ccfb3e90bf5d468098fe42112f4efa0fd1823d10124d8f50bf1ac56fbe4ad188bb7446e1627f1a05188f602e6e11a33496b75d

x11-terms/gnome-terminal/files/0001-screen-window-Extra-padding-around-transparent-termi.patch

@@ -0,0 +1,122 @@
+From: "Owen W. Taylor" <otaylor@fishsoup.net>
+Date: Fri, 13 Nov 2015 15:16:42 +0100
+Subject: [PATCH] screen,
+ window: Extra padding around transparent terminals in Wayland
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207943
+---
+ src/terminal-screen.cc | 40 +++++++++++++++++++++++++++++++++++++---
+ src/terminal-window.cc | 18 ++++++++++++------
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
+index bf41b6c..f8ede37 100644
+--- a/src/terminal-screen.cc
++++ b/src/terminal-screen.cc
+@@ -154,6 +154,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
+ static gboolean terminal_screen_popup_menu (GtkWidget *widget);
+ static gboolean terminal_screen_button_press (GtkWidget *widget,
+                                               GdkEventButton *event);
++static void terminal_screen_hierarchy_changed (GtkWidget *widget,
++                                               GtkWidget *previous_toplevel);
+ static void terminal_screen_child_exited  (VteTerminal *terminal,
+                                            int status);
+ 
+@@ -659,6 +661,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+   widget_class->drag_data_received = terminal_screen_drag_data_received;
+   widget_class->button_press_event = terminal_screen_button_press;
+   widget_class->popup_menu = terminal_screen_popup_menu;
++  widget_class->hierarchy_changed = terminal_screen_hierarchy_changed;
+ 
+   terminal_class->child_exited = terminal_screen_child_exited;
+ 
+@@ -1200,6 +1203,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+   g_object_thaw_notify (object);
+ }
+ 
++static void
++update_toplevel_transparency (TerminalScreen *screen)
++{
++  GtkWidget *widget = GTK_WIDGET (screen);
++  TerminalScreenPrivate *priv = screen->priv;
++  GSettings *profile = priv->profile;
++  GtkWidget *toplevel;
++
++  toplevel = gtk_widget_get_toplevel (widget);
++  if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
++    {
++      gboolean transparent;
++
++      transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
++      if (gtk_widget_get_app_paintable (toplevel) != transparent)
++        {
++          gtk_widget_set_app_paintable (toplevel, transparent);
++
++          /* The opaque region of the toplevel isn't updated until the toplevel is allocated;
++           * set_app_paintable() doesn't force an allocation, so do that manually.
++           */
++          gtk_widget_queue_resize (toplevel);
++        }
++    }
++}
++
+ static void
+ update_color_scheme (TerminalScreen *screen)
+ {
+@@ -1294,9 +1323,7 @@ update_color_scheme (TerminalScreen *screen)
+   vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
+   vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
+ 
+-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
+-  if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
+-    gtk_widget_set_app_paintable (toplevel, transparent);
++  update_toplevel_transparency (screen);
+ }
+ 
+ static void
+@@ -1816,6 +1843,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
+   terminal_screen_popup_info_unref (info);
+ }
+ 
++static void
++terminal_screen_hierarchy_changed (GtkWidget *widget,
++                                   GtkWidget *previous_toplevel)
++{
++  update_toplevel_transparency (TERMINAL_SCREEN (widget));
++}
++
+ static gboolean
+ terminal_screen_button_press (GtkWidget      *widget,
+                               GdkEventButton *event)
+diff --git a/src/terminal-window.cc b/src/terminal-window.cc
+index 269514f..96b7ba2 100644
+--- a/src/terminal-window.cc
++++ b/src/terminal-window.cc
+@@ -1969,15 +1969,21 @@ terminal_window_draw (GtkWidget *widget,
+ {
+   if (gtk_widget_get_app_paintable (widget))
+     {
++      GtkAllocation child_allocation;
+       GtkStyleContext *context;
+-      int width;
+-      int height;
++      GtkWidget *child;
++
++      /* Get the *child* allocation, so we don't overwrite window borders */
++      child = gtk_bin_get_child (GTK_BIN (widget));
++      gtk_widget_get_allocation (child, &child_allocation);
+ 
+       context = gtk_widget_get_style_context (widget);
+-      width = gtk_widget_get_allocated_width (widget);
+-      height = gtk_widget_get_allocated_height (widget);
+-      gtk_render_background (context, cr, 0, 0, width, height);
+-      gtk_render_frame (context, cr, 0, 0, width, height);
++      gtk_render_background (context, cr,
++                             child_allocation.x, child_allocation.y,
++                             child_allocation.width, child_allocation.height);
++      gtk_render_frame (context, cr,
++                        child_allocation.x, child_allocation.y,
++                        child_allocation.width, child_allocation.height);
+     }
+ 
+   return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);

x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild

@@ -54,6 +54,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/Provide-fallback-for-reading-current-directory-if-OS.patch
 		eapply "${FILESDIR}"/0001-Restore-transparency.patch
 		eapply "${FILESDIR}"/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
+		eapply "${FILESDIR}"/0001-screen-window-Extra-padding-around-transparent-termi.patch
 		eapply "${FILESDIR}"/scrollbar-background-theming.patch
 		eapply "${FILESDIR}"/screen-Use-clean-env-when-creating-new-tab.patch
 	fi