diff --git a/gnome-terminal-3.16.2.tar.xz b/gnome-terminal-3.16.2.tar.xz deleted file mode 100644 index 4077816..0000000 --- a/gnome-terminal-3.16.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0 -size 1798620 diff --git a/gnome-terminal-3.17.91.tar.xz b/gnome-terminal-3.17.91.tar.xz new file mode 100644 index 0000000..17396c1 --- /dev/null +++ b/gnome-terminal-3.17.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f4e190f64fcbfd425727801500cd7516376c229de50b654ecbe5410fadf6771 +size 1833336 diff --git a/gnome-terminal-dark-theme.patch b/gnome-terminal-dark-theme.patch index 737021f..6da9a96 100644 --- a/gnome-terminal-dark-theme.patch +++ b/gnome-terminal-dark-theme.patch @@ -12,11 +12,11 @@ This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18. src/terminal-schemas.h | 1 + 5 files changed, 34 insertions(+), 1 deletion(-) -diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 051bdc4..95c5405 100644 ---- a/src/org.gnome.Terminal.gschema.xml -+++ b/src/org.gnome.Terminal.gschema.xml -@@ -656,6 +656,11 @@ +Index: gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml +=================================================================== +--- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml ++++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml +@@ -658,6 +658,11 @@ Whether to show the menubar in new windows @@ -28,11 +28,11 @@ index 051bdc4..95c5405 100644 'window' Whether to open new terminals as windows or tabs -diff --git a/src/preferences.ui b/src/preferences.ui -index f64a11b..df82508 100644 ---- a/src/preferences.ui -+++ b/src/preferences.ui -@@ -139,6 +139,22 @@ +Index: gnome-terminal-3.17.91/src/preferences.ui +=================================================================== +--- gnome-terminal-3.17.91.orig/src/preferences.ui ++++ gnome-terminal-3.17.91/src/preferences.ui +@@ -99,6 +99,22 @@ @@ -55,11 +55,11 @@ index f64a11b..df82508 100644 True False -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 8a9434f..95302c5 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app) +Index: gnome-terminal-3.17.91/src/terminal-app.c +=================================================================== +--- gnome-terminal-3.17.91.orig/src/terminal-app.c ++++ gnome-terminal-3.17.91/src/terminal-app.c +@@ -409,6 +409,10 @@ terminal_app_init (TerminalApp *app) /* Terminal global settings */ app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA); @@ -70,45 +70,45 @@ index 8a9434f..95302c5 100644 /* Check if we need to migrate from gconf to dconf */ maybe_migrate_settings (app); -diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c -index 97f6c33..a57dde6 100644 ---- a/src/terminal-prefs.c -+++ b/src/terminal-prefs.c -@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, +Index: gnome-terminal-3.17.91/src/terminal-prefs.c +=================================================================== +--- gnome-terminal-3.17.91.orig/src/terminal-prefs.c ++++ gnome-terminal-3.17.91/src/terminal-prefs.c +@@ -560,7 +560,7 @@ terminal_prefs_show_preferences (GtkWind GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button; GtkWidget *disable_shortcuts_button; GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button; - GtkWidget *new_terminal_mode_combo; + GtkWidget *dark_theme_button, *new_terminal_mode_combo; GtkWidget *default_hbox, *default_label; + GtkWidget *close_button, *help_button; GtkTreeSelection *selection; - GSettings *settings; -@@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, - "preferences-dialog", - "preferences-dialog", &dialog, +@@ -584,6 +584,7 @@ terminal_prefs_show_preferences (GtkWind + "close-button", &close_button, + "help-button", &help_button, "default-show-menubar-checkbutton", &show_menubar_button, + "dark-theme-checkbutton", &dark_theme_button, "new-terminal-mode-combobox", &new_terminal_mode_combo, "disable-mnemonics-checkbutton", &disable_mnemonics_button, "disable-shortcuts-checkbutton", &disable_shortcuts_button, -@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, +@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWind + "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); - g_settings_bind (settings, ++ g_settings_bind (settings, + TERMINAL_SETTING_DARK_THEME_KEY, + dark_theme_button, + "active", + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + -+ g_settings_bind (settings, + g_settings_bind (settings, TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY, new_terminal_mode_combo, - "active-id", -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 0fcbf52..c6acd7c 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -69,6 +69,7 @@ G_BEGIN_DECLS +Index: gnome-terminal-3.17.91/src/terminal-schemas.h +=================================================================== +--- gnome-terminal-3.17.91.orig/src/terminal-schemas.h ++++ gnome-terminal-3.17.91/src/terminal-schemas.h +@@ -68,6 +68,7 @@ G_BEGIN_DECLS #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" @@ -116,27 +116,10 @@ index 0fcbf52..c6acd7c 100644 #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled" #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled" --- -2.1.0 - - -From 9fc68b087180e48cb4e2275f3134f66f2c43de14 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 17 Feb 2015 13:22:21 +0100 -Subject: [PATCH 2/2] Revert "help: Remove dark theme pref" - -This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b. ---- - help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++ - help/Makefile.am | 1 + - 2 files changed, 42 insertions(+) - create mode 100644 help/C/pref-theme.page - -diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page -new file mode 100644 -index 0000000..a997d14 +Index: gnome-terminal-3.17.91/help/C/pref-theme.page +=================================================================== --- /dev/null -+++ b/help/C/pref-theme.page ++++ gnome-terminal-3.17.91/help/C/pref-theme.page @@ -0,0 +1,41 @@ + + + -diff --git a/help/Makefile.am b/help/Makefile.am -index 33389c5..9c02a74 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am +Index: gnome-terminal-3.17.91/help/Makefile.am +=================================================================== +--- gnome-terminal-3.17.91.orig/help/Makefile.am ++++ gnome-terminal-3.17.91/help/Makefile.am @@ -35,6 +35,7 @@ HELP_FILES = \ pref-profile-encoding.page \ pref-scrolling.page \ @@ -191,6 +174,3 @@ index 33389c5..9c02a74 100644 pref-user-input.page \ profile.page \ prob-reset.page \ --- -2.1.0 - diff --git a/gnome-terminal-transparency.patch b/gnome-terminal-transparency.patch index 937ebd6..44f73f0 100644 --- 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(-) -Index: gnome-terminal-3.15.90/src/org.gnome.Terminal.gschema.xml +Index: gnome-terminal-3.17.91/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 @@ +--- gnome-terminal-3.17.91.orig/src/org.gnome.Terminal.gschema.xml ++++ gnome-terminal-3.17.91/src/org.gnome.Terminal.gschema.xml +@@ -334,6 +334,16 @@ 'narrow' Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding @@ -39,11 +39,11 @@ Index: gnome-terminal-3.15.90/src/org.gnome.Terminal.gschema.xml -Index: gnome-terminal-3.15.90/src/profile-editor.c +Index: gnome-terminal-3.17.91/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 +--- gnome-terminal-3.17.91.orig/src/profile-editor.c ++++ gnome-terminal-3.17.91/src/profile-editor.c +@@ -1097,7 +1097,18 @@ terminal_profile_edit (GSettings *profi "active-id", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); @@ -62,10 +62,10 @@ Index: gnome-terminal-3.15.90/src/profile-editor.c terminal_util_bind_mnemonic_label_sensitivity (editor); terminal_util_dialog_focus_widget (editor, widget_name); -Index: gnome-terminal-3.15.90/src/profile-preferences.ui +Index: gnome-terminal-3.17.91/src/profile-preferences.ui =================================================================== ---- gnome-terminal-3.15.90.orig/src/profile-preferences.ui -+++ gnome-terminal-3.15.90/src/profile-preferences.ui +--- gnome-terminal-3.17.91.orig/src/profile-preferences.ui ++++ gnome-terminal-3.17.91/src/profile-preferences.ui @@ -23,6 +23,11 @@ 1 100 @@ -78,7 +78,7 @@ Index: gnome-terminal-3.15.90/src/profile-preferences.ui -@@ -1045,6 +1050,93 @@ +@@ -991,6 +996,93 @@ 1 @@ -172,11 +172,11 @@ Index: gnome-terminal-3.15.90/src/profile-preferences.ui -Index: gnome-terminal-3.15.90/src/terminal-schemas.h +Index: gnome-terminal-3.17.91/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 +--- gnome-terminal-3.17.91.orig/src/terminal-schemas.h ++++ gnome-terminal-3.17.91/src/terminal-schemas.h +@@ -63,6 +63,9 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" @@ -186,11 +186,11 @@ Index: gnome-terminal-3.15.90/src/terminal-schemas.h #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" -Index: gnome-terminal-3.15.90/src/terminal-screen.c +Index: gnome-terminal-3.17.91/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 +--- gnome-terminal-3.17.91.orig/src/terminal-screen.c ++++ gnome-terminal-3.17.91/src/terminal-screen.c +@@ -765,7 +765,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: gnome-terminal-3.15.90/src/terminal-screen.c update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -816,6 +818,8 @@ update_color_scheme (TerminalScreen *scr +@@ -831,6 +833,8 @@ update_color_scheme (TerminalScreen *scr GdkRGBA fg, bg, bold, theme_fg, theme_bg; GdkRGBA *boldp; GtkStyleContext *context; @@ -209,8 +209,8 @@ Index: gnome-terminal-3.15.90/src/terminal-screen.c + gboolean transparent; context = gtk_widget_get_style_context (widget); - gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg); -@@ -836,9 +840,25 @@ update_color_scheme (TerminalScreen *scr + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg); +@@ -851,9 +855,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: gnome-terminal-3.15.90/src/terminal-screen.c } static void -Index: gnome-terminal-3.15.90/src/terminal-window.c +Index: gnome-terminal-3.17.91/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 +--- gnome-terminal-3.17.91.orig/src/terminal-window.c ++++ gnome-terminal-3.17.91/src/terminal-window.c +@@ -2586,6 +2586,8 @@ terminal_window_init (TerminalWindow *wi TerminalWindowPrivate *priv; TerminalApp *app; TerminalSettingsList *profiles_list; @@ -249,7 +249,7 @@ Index: gnome-terminal-3.15.90/src/terminal-window.c GtkActionGroup *action_group; GtkAction *action; GtkUIManager *manager; -@@ -2564,6 +2566,11 @@ terminal_window_init (TerminalWindow *wi +@@ -2601,6 +2603,11 @@ terminal_window_init (TerminalWindow *wi gtk_widget_init_template (GTK_WIDGET (window)); diff --git a/gnome-terminal.changes b/gnome-terminal.changes index 6967cc4..dd0e97b 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Thu Aug 20 15:15:44 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.17.91: + + build: + - Don't include empty CSS. + - Include missing terminal.common.css in tarballs. + + Update translations. +- Rebase gnome-terminal-dark-theme.patch and + gnome-terminal-transparency.patch. + +------------------------------------------------------------------- +Tue Aug 18 08:52:29 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.17.90: + + window: + - Move tabs menu into an arrow button on the notebook + (bgo#745329). + - Add new tab button to notebook action area (bgo#138020). + - Attach popup menus to their parent widgets (bgo#750755). + + notebook: + - Add API to create a box for the action buttons. + - Add pref to always show tabs bar. + - Add API to set the tab policy when to show the tabs bar. + + widgets: Remove close button CSS. + + app: + - Add CSS loading infrastructure. + - Let GtkApplication load the app menu automatically + (bgo#734791). + + util: + - Remove unused function. + - Add utility to parse /etc/shells. + + gterminal: Fix completion argument parsing. + + server: + - Stay around a bit after last window closes. + - Exit on unsupported locale. + - Simplify deprecated object property warning suppression + (bgo#749195). + + build: + - Update macros from upstream. + - Fix config.h include order. + - Use stable versions. + - Define min/max required/allowed glib and gtk+ versions. + + screen: + - Get process arguments without /proc on FreeBSD and OpenBSD. + - Update colors at the right spot (bgo#746425). + + Add new keyword 'cmd' to .desktop (bgo#749239). + + profile: editor: Make the profile preferences a GtkWindow. + + prefs: + - Make profile editors not transient. + - Make the preferences a GtkWindow (bgo#748342). + + client: legacy: Fall back to default profile (bgo#747106). + + profile: prefs: Remove update-records pref. + + Updated translations. + ------------------------------------------------------------------- Mon May 11 07:10:17 UTC 2015 - dimstar@opensuse.org diff --git a/gnome-terminal.spec b/gnome-terminal.spec index e4cec9e..2c4246e 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -17,16 +17,16 @@ Name: gnome-terminal -Version: 3.16.2 +Version: 3.17.91 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.16/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-terminal/3.17/%{name}-%{version}.tar.xz BuildRequires: appdata-tools BuildRequires: fdupes -# PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimmstar@opensuse.org -- Allow gnome-terminal to have transparent windows +# PATCH-FEATURE-OPENSUSE gnome-terminal-transparency.patch dimstar@opensuse.org -- Allow gnome-terminal to have transparent windows Patch100: gnome-terminal-transparency.patch # PATCH-FEATURE-OPENSUSE gnome-terminal-transparency-fix-for-broken-themes.patch dimstar@opensuse.org -- Ensure the window is always painted Patch101: gnome-terminal-transparency-fix-for-broken-themes.patch @@ -39,19 +39,19 @@ BuildRequires: intltool >= 0.50.0 BuildRequires: libtool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: vala +BuildRequires: vala >= 0.26 BuildRequires: yelp-tools BuildRequires: pkgconfig(dconf) >= 0.12.0 BuildRequires: pkgconfig(gconf-2.0) >= 2.31.3 BuildRequires: pkgconfig(gio-2.0) >= 2.34.0 -BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.42.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) # for gtk-builder-convert 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.40.2 +BuildRequires: pkgconfig(vte-2.91) >= 0.41.90 BuildRequires: pkgconfig(x11) Recommends: %{name}-lang Obsoletes: gnome-core