r42132 - in /desktop/unstable/gnome-terminal/debian: changelog patches/Don-t-allow-the-theme-to-set-black-on-black.patch patches/series rules

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Sat Aug 2 17:45:06 UTC 2014 

Author: smcv
Date: Sat Aug  2 17:45:06 2014
New Revision: 42132

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42132
Log:
* Team upload.
* When we ask the system theme how to draw a TerminalScreen widget,
  if it answers "black text on a black background" (like the built-in
  fallback theme in Gtk < 3.14, "Raleigh"), instead draw black text on
  a white background like the GNOME default theme "Adwaita" does.
  (Closes: #683744)
* Tell dh_makeshlibs that the libterminal-nautilus.so plugin is not
  a shared library (workaround for #204975)

Added:
    desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/patches/series
    desktop/unstable/gnome-terminal/debian/rules

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=42132&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Sat Aug  2 17:45:06 2014
@@ -1,3 +1,16 @@
+gnome-terminal (3.12.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * When we ask the system theme how to draw a TerminalScreen widget,
+    if it answers "black text on a black background" (like the built-in
+    fallback theme in Gtk < 3.14, "Raleigh"), instead draw black text on
+    a white background like the GNOME default theme "Adwaita" does.
+    (Closes: #683744)
+  * Tell dh_makeshlibs that the libterminal-nautilus.so plugin is not
+    a shared library (workaround for #204975)
+
+ -- Simon McVittie <smcv at debian.org>  Sat, 02 Aug 2014 17:33:44 +0100
+
 gnome-terminal (3.12.3-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch?rev=42132&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch	(added)
+++ desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch	[utf-8] Sat Aug  2 17:45:06 2014
@@ -0,0 +1,47 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Wed, 30 Jul 2014 10:38:16 +0100
+Subject: Don't allow the theme to set black-on-black
+
+Gtk 3.12's Raleigh theme (the default in non-GNOME environments)
+is rather minimal, and in particular results in the TerminalScreen widget
+being drawn in black-on-black whenever an application does not select
+other colours via ANSI escapes, which is rather hopeless for usability.
+Hard-code black-on-white (matching Adwaita) as a fallback.
+
+This affects users who meet all of these conditions:
+
+* run a desktop environment that does not set the Gtk theme via Xsettings
+  (as gnome-settings-daemon does)
+* have not configured the Adwaita theme (or some other reasonably
+  complete Gtk theme) in ~/.config/gtk-3.0/settings.ini
+* have left the "Use colors from system theme" preference enabled,
+  as it is by default
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683744
+Forwarded: not-needed, Adwaita will be the built-in default theme in Gtk 3.14
+---
+ src/terminal-screen.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index ac971c0..cbf1491 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -862,6 +862,17 @@ update_color_scheme (TerminalScreen *screen)
+   gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg);
+   gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &theme_bg);
+ 
++  if (theme_fg.red == 0.0 && theme_fg.green == 0.0 && theme_fg.blue == 0.0 &&
++      theme_bg.red == 0.0 && theme_bg.green == 0.0 && theme_bg.blue == 0.0)
++    {
++      /* The GTK-default Raleigh theme in 3.12 ends up assigning
++       * black background and black foreground, which is clearly not
++       * useful. */
++      theme_bg.red = 1.0;
++      theme_bg.green = 1.0;
++      theme_bg.blue = 1.0;
++    }
++
+   if (g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_THEME_COLORS_KEY) ||
+       (!terminal_g_settings_get_rgba (profile, TERMINAL_PROFILE_FOREGROUND_COLOR_KEY, &fg) ||
+        !terminal_g_settings_get_rgba (profile, TERMINAL_PROFILE_BACKGROUND_COLOR_KEY, &bg)))

Modified: desktop/unstable/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/series?rev=42132&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] Sat Aug  2 17:45:06 2014
@@ -1,3 +1,4 @@
 nautilus-x11.patch
 01_onlyshowin.patch
 10_kfreebsd-f_dupfd_cloexec.patch
+Don-t-allow-the-theme-to-set-black-on-black.patch

Modified: desktop/unstable/gnome-terminal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/rules?rev=42132&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/rules	[utf-8] Sat Aug  2 17:45:06 2014
@@ -17,6 +17,10 @@
     DEB_CONFIGURE_EXTRA_FLAGS += --disable-search-provider
 endif
 
+# this is a plugin (loadable module), not version "nautilus" of libterminal
+# https://bugs.debian.org/204975
+DEB_DH_MAKESHLIBS_ARGS_ALL = -X/usr/lib/nautilus/extensions-3.0/libterminal-nautilus.so
+
 build/gnome-terminal::
 	/usr/bin/docbook-to-man debian/gnome-terminal.sgml > debian/gnome-terminal.1

More information about the pkg-gnome-commits mailing list