[mate-terminal] Update patch again

Dan Mashal vicodan at fedoraproject.org
Tue May 14 04:25:01 UTC 2013


commit 733d7dc9e12a7f5f4b1b558970e63b1d54660990
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon May 13 21:24:57 2013 -0700

    Update patch again

 better_defaults.patch |   34 ++++++++++++++++++++++++++--------
 mate-terminal.spec    |    5 ++++-
 2 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/better_defaults.patch b/better_defaults.patch
index e01a808..c23799d 100644
--- a/better_defaults.patch
+++ b/better_defaults.patch
@@ -1,7 +1,13 @@
-diff -uNrp b/src/org.mate.terminal.gschema.xml.in a/src/org.mate.terminal.gschema.xml.in
---- b/src/org.mate.terminal.gschema.xml.in	2013-05-07 16:06:11.890203089 -0700
-+++ a/src/org.mate.terminal.gschema.xml.in	2013-05-07 16:14:56.158723118 -0700
-@@ -94,7 +94,7 @@
+diff -uNrp a/src/org.mate.terminal.gschema.xml.in b/src/org.mate.terminal.gschema.xml.in
+--- a/src/org.mate.terminal.gschema.xml.in	2013-05-13 20:45:20.912285104 -0700
++++ b/src/org.mate.terminal.gschema.xml.in	2013-05-13 20:55:13.398521909 -0700
+@@ -89,22 +89,22 @@
+       <description>True if the menubar should be shown in new windows,  for windows/tabs with this profile.</description>
+     </key>
+     <key name="foreground-color" type="s">
+-      <default>'#000000'</default>
++      <default>'#E6E6E6'</default>
+       <summary>Default color of text in the terminal</summary>
        <description>Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red").</description>
      </key>
      <key name="background-color" type="s">
@@ -10,6 +16,18 @@ diff -uNrp b/src/org.mate.terminal.gschema.xml.in a/src/org.mate.terminal.gschem
        <summary>Default color of terminal background</summary>
        <description>Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red").</description>
      </key>
+     <key name="bold-color" type="s">
+-      <default>'#000000'</default>
++      <default>'#FFFFFF'</default>
+       <summary>Default color of bold text in the terminal</summary>
+       <description>Default color of bold text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is ignored if bold_color_same_as_fg is true.</description>
+     </key>
+     <key name="bold-color-same-as-fg" type="b">
+-      <default>true</default>
++      <default>false</default>
+       <summary>Whether bold text should use the same color as normal text</summary>
+       <description>If true, boldface text will be rendered using the same color as normal text.</description>
+     </key>
 @@ -159,7 +159,7 @@
        <description>Number of scrollback lines to keep around. You can scroll back in the terminal by this number of lines; lines that don't fit in the scrollback are discarded. If scrollback_unlimited is true, this value is ignored.</description>
      </key>
@@ -28,9 +46,9 @@ diff -uNrp b/src/org.mate.terminal.gschema.xml.in a/src/org.mate.terminal.gschem
        <summary>Whether to use the colors from the theme for the terminal widget</summary>
        <description>If true, the theme color scheme used for text entry boxes will  be used for the terminal, instead of colors provided by the user.</description>
      </key>
-diff -uNrp b/src/terminal-profile.c a/src/terminal-profile.c
---- b/src/terminal-profile.c	2013-05-07 16:06:11.888203068 -0700
-+++ a/src/terminal-profile.c	2013-05-07 16:13:21.167722957 -0700
+diff -uNrp a/src/terminal-profile.c b/src/terminal-profile.c
+--- a/src/terminal-profile.c	2013-05-13 20:45:20.916283308 -0700
++++ b/src/terminal-profile.c	2013-05-13 20:56:46.104236949 -0700
 @@ -127,7 +127,7 @@ enum
  
  /* Keep these in sync with the GSettings schema! */
@@ -45,7 +63,7 @@ diff -uNrp b/src/terminal-profile.c a/src/terminal-profile.c
  #define DEFAULT_EXIT_ACTION           (TERMINAL_EXIT_CLOSE)
  #define DEFAULT_FONT                  ("Monospace 12")
 -#define DEFAULT_FOREGROUND_COLOR      ("#000000")
-+#define DEFAULT_FOREGROUND_COLOR      ("#FFFFFF")
++#define DEFAULT_FOREGROUND_COLOR      ("#E6E6E6")
  #define DEFAULT_LOGIN_SHELL           (FALSE)
  #define DEFAULT_NAME                  (NULL)
  #define DEFAULT_PALETTE               (terminal_palettes[TERMINAL_PALETTE_TANGO])
diff --git a/mate-terminal.spec b/mate-terminal.spec
index 527f9fc..a6b8c48 100644
--- a/mate-terminal.spec
+++ b/mate-terminal.spec
@@ -1,7 +1,7 @@
 Summary:        Terminal emulator for MATE
 Name:           mate-terminal
 Version:        1.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv3+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
@@ -73,6 +73,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.mate.terminal.gschema.xml
 
 %changelog
+* Fri May 03 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.1-5
+- Update patch again
+
 * Fri May 03 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.1-4
 - Update patch (again) to really fix annoying default settings
 


More information about the scm-commits mailing list