Accepting request 291483 from GNOME:Next

Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/291483 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=132
2015-03-19 14:34:06 +00:00 · 2015-03-19 14:34:06 +00:00 · 02928ec494
commit 02928ec494
parent 6171ffd0d6
6 changed files with 91 additions and 75 deletions
--- a/gnome-terminal-3.14.2.tar.xz
+++ b/gnome-terminal-3.14.2.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b
-size 1784996
--- a/gnome-terminal-3.15.92.tar.xz
+++ b/gnome-terminal-3.15.92.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:213cf8bdd44b1ee4295eed0a7bfc0ece7c330e08c833badf882ac01bfd49dd19
+size 1795512
--- a/gnome-terminal-fix-crash.patch
+++ b/gnome-terminal-fix-crash.patch
@ -1,27 +0,0 @@
-From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001
-From: Egmont Koblinger <egmont@gmail.com>
-Date: Thu, 8 Jan 2015 14:33:13 +0100
-Subject: screen: Fix crash with empty child process command line
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742560
-(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e)
-
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index ad78388..9f63239 100644
--- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
-@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
-   if (process_name)
-     gs_transfer_out_value (process_name, &name);
- 
-  for (i = 0; i < len - 1; i++)
-+  if (len > 0 && data[len - 1] == '\0')
-+    len--;
-+  for (i = 0; i < len; i++)
-     {
-       if (data[i] == '\0')
-         data[i] = ' ';
-- 
-cgit v0.10.1
-
-
--- a/gnome-terminal-transparency.patch
+++ b/gnome-terminal-transparency.patch
@ -18,11 +18,11 @@ was not restored.
 src/terminal-window.c              |    7 +++
 6 files changed, 144 insertions(+), 1 deletions(-)

-diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index c7d0edb..8910ddd 100644
--- a/src/org.gnome.Terminal.gschema.xml
-+++ b/src/org.gnome.Terminal.gschema.xml
-@@ -318,6 +318,16 @@
+Index: gnome-terminal-3.15.90/src/org.gnome.Terminal.gschema.xml
+===================================================================
+--- gnome-terminal-3.15.90.orig/src/org.gnome.Terminal.gschema.xml
+++ gnome-terminal-3.15.90/src/org.gnome.Terminal.gschema.xml
+@@ -332,6 +332,16 @@
       <default>'narrow'</default>
       <summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
     </key>
@ -39,11 +39,11 @@ index c7d0edb..8910ddd 100644
   </schema>
 
   <!-- Keybinding settings -->
-diff --git a/src/profile-editor.c b/src/profile-editor.c
-index 8e5732d..dac5341 100644
--- a/src/profile-editor.c
-+++ b/src/profile-editor.c
-@@ -1099,7 +1099,18 @@ terminal_profile_edit (GSettings  *profile,
+Index: gnome-terminal-3.15.90/src/profile-editor.c
+===================================================================
+--- gnome-terminal-3.15.90.orig/src/profile-editor.c
+++ gnome-terminal-3.15.90/src/profile-editor.c
+@@ -1099,7 +1099,18 @@ terminal_profile_edit (GSettings  *profi
                    "active-id",
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
 
@ -62,10 +62,10 @@ index 8e5732d..dac5341 100644
   terminal_util_bind_mnemonic_label_sensitivity (editor);
 
   terminal_util_dialog_focus_widget (editor, widget_name);
-diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
-index de901ee..25a284e 100644
--- a/src/profile-preferences.ui
-+++ b/src/profile-preferences.ui
+Index: gnome-terminal-3.15.90/src/profile-preferences.ui
+===================================================================
+--- gnome-terminal-3.15.90.orig/src/profile-preferences.ui
+++ gnome-terminal-3.15.90/src/profile-preferences.ui
@@ -23,6 +23,11 @@
     <property name="step_increment">1</property>
     <property name="page_increment">100</property>
@ -78,7 +78,7 @@ index de901ee..25a284e 100644
   <object class="GtkListStore" id="model1">
     <columns>
       <!-- column-name gchararray -->
-@@ -1073,6 +1078,93 @@
+@@ -1045,6 +1050,93 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
@ -172,25 +172,25 @@ index de901ee..25a284e 100644
                           </object>
                         </child>
                       </object>
-diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
-index 90cc5a0..a3849eb 100644
--- a/src/terminal-schemas.h
-+++ b/src/terminal-schemas.h
-@@ -63,6 +63,9 @@ G_BEGIN_DECLS
- #define TERMINAL_PROFILE_USE_THEME_COLORS_KEY           "use-theme-colors"
+Index: gnome-terminal-3.15.90/src/terminal-schemas.h
+===================================================================
+--- gnome-terminal-3.15.90.orig/src/terminal-schemas.h
+++ gnome-terminal-3.15.90/src/terminal-schemas.h
+@@ -64,6 +64,9 @@ G_BEGIN_DECLS
 #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
+ #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY       "word-char-exceptions"
 
 +#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND      "use-transparent-background"
 +#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
 +
 #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
- #define TERMINAL_SETTING_DARK_THEME_KEY                 "dark-theme"
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index ad78388..d09d812 100644
--- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
-@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+ #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
+Index: gnome-terminal-3.15.90/src/terminal-screen.c
+===================================================================
+--- gnome-terminal-3.15.90.orig/src/terminal-screen.c
+++ gnome-terminal-3.15.90/src/terminal-screen.c
+@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSet
       prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) ||
       prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) ||
       prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) ||
@ -201,7 +201,7 @@ index ad78388..d09d812 100644
     update_color_scheme (screen);
 
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
-@@ -809,6 +811,8 @@ update_color_scheme (TerminalScreen *screen)
+@@ -816,6 +818,8 @@ update_color_scheme (TerminalScreen *scr
   GdkRGBA fg, bg, bold, theme_fg, theme_bg;
   GdkRGBA *boldp;
   GtkStyleContext *context;
@ -210,7 +210,7 @@ index ad78388..d09d812 100644
 
   context = gtk_widget_get_style_context (widget);
   gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg);
-@@ -829,9 +833,25 @@ update_color_scheme (TerminalScreen *screen)
+@@ -836,9 +840,25 @@ update_color_scheme (TerminalScreen *scr
     boldp = NULL;
 
   colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
@ -236,11 +236,11 @@ index ad78388..d09d812 100644
 }
 
 static void
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index ce85744..98acab4 100644
--- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *window)
+Index: gnome-terminal-3.15.90/src/terminal-window.c
+===================================================================
+--- gnome-terminal-3.15.90.orig/src/terminal-window.c
+++ gnome-terminal-3.15.90/src/terminal-window.c
+@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *wi
   TerminalWindowPrivate *priv;
   TerminalApp *app;
   TerminalSettingsList *profiles_list;
@ -249,7 +249,7 @@ index ce85744..98acab4 100644
   GtkActionGroup *action_group;
   GtkAction *action;
   GtkUIManager *manager;
-@@ -2564,6 +2566,11 @@ terminal_window_init (TerminalWindow *window)
+@@ -2564,6 +2566,11 @@ terminal_window_init (TerminalWindow *wi
 
   gtk_widget_init_template (GTK_WIDGET (window));
 
@ -261,7 +261,3 @@ index ce85744..98acab4 100644
   uuid_generate (u);
   uuid_unparse (u, uuidstr);
   priv->uuid = g_strdup (uuidstr);
-- 
-1.7.1
-
-
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Mon Mar 16 18:33:29 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 3.15.92:
+  + Bugs fixed: bgo#685742, bgo#733210, bgo#735242.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Feb 17 08:42:50 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 3.15.90:
+  + tab-label: Rely on new GTK+ API to center the label
+    (bgo#743663).
+  + profile: Remove the "Command" sub-heading (bgo#744327).
+  + gterminal: Add more profile functions: allow adding, removing
+    and cloning a profile.
+  + window: Add tab position setting (bgo#75420#c25).
+  + Bugs fixed: bgo#739410, bgo#730632, bgo#743395. bgo#743663,
+    bgo#742304.
+  + Updated translations.
+- Rebase gnome-terminal-transparency.patch.
+
+-------------------------------------------------------------------
+Thu Feb 12 10:19:27 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.15.0:
+  + notebook: Make tabs nondetachable.
+  + window:
+    - Focus the terminal if only a single tab remains in a
+      window (bgo#742422).
+    - window: Update size on tab title change (bgo#732588).
+  + Remove dark theme pref (bgo#707206, bgo#742040, bgo#742333,
+    bgo#649358).
+  + screen: Fix crash with empty child process command line
+    (bgo#742560).
+  + help:
+    - Update desc for text selection (bgo#742304).
+    - Fix window theme pref instructions (bgo#742040).
+    - fix tab/window pref instructions (bgo#742119).
+  + build: Use portable shell in configure.ac.
+  + client: Hide obsolete --title option. Accept it for
+    compatibility, but ignore it (bgo#740188).
+  + server:
+    - Sanitise the environment.
+    - Reorder atfork/setrlimit calls.
+    - Increase RLIMIT_NOFILE to the maximum allowed (bgo#646098).
+  + Updated translations.
+- Drop gnome-terminal-fix-crash.patch: fixed upstream.
+- Rebase gnome-terminal-transparency.patch.
+
 -------------------------------------------------------------------
 Thu Feb 12 10:19:26 UTC 2015 - dimstar@opensuse.org

--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@ -17,17 +17,15 @@


 Name:           gnome-terminal
-Version:        3.14.2
+Version:        3.15.92
 Release:        0
 Summary:        GNOME Terminal
 License:        GPL-3.0+ and LGPL-2.1+
 Group:          System/X11/Terminals
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-terminal/3.14/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-terminal/3.15/%{name}-%{version}.tar.xz
 BuildRequires:  appdata-tools
 BuildRequires:  fdupes
-# PATCH-FIX-UPSTREAM gnome-terminal-fix-crash.patch bgo#742560 dimstar@opensuse.org -- Fix crash with empty child process command line
-Patch0:         gnome-terminal-fix-crash.patch
 # PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimmstar@opensuse.org -- Allow gnome-terminal to have transparent windows
 Patch100:       gnome-terminal-transparency.patch
 # PATCH-FEATURE-OPENSSUE gnome-terminal-transparency-fix-for-broken-themes.patch dimstar@opensuse.org -- Ensure the window is always painted
@ -49,7 +47,7 @@ BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10.0
 BuildRequires:  pkgconfig(libnautilus-extension) >= 3.0.0
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(vte-2.91) >= 0.38.0
+BuildRequires:  pkgconfig(vte-2.91) >= 0.39.90
 BuildRequires:  pkgconfig(x11)
 Recommends:     %{name}-lang
 Obsoletes:      gnome-core
@ -85,7 +83,6 @@ arbitrary folders.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 %patch100 -p1
 %patch101 -p1
 translation-update-upstream