diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | 0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch | 43 | ||||
| -rw-r--r-- | 0001-window-Exit-early-from-screen-removed-handler-for-no.patch | 62 | ||||
| -rw-r--r-- | 0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch | 39 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
5 files changed, 9 insertions, 168 deletions
@@ -1,7 +1,7 @@ pkgbase = gnome-terminal-fedora pkgdesc = The GNOME Terminal Emulator with Fedora patches - pkgver = 3.18.0 - pkgrel = 2 + pkgver = 3.18.1 + pkgrel = 1 url = https://www.gnome.org install = gnome-terminal-fedora.install arch = i686 @@ -22,24 +22,18 @@ pkgbase = gnome-terminal-fedora depends = gsettings-desktop-schemas depends = dconf optdepends = gconf: settings migration when upgrading from older version - provides = gnome-terminal=3.18.0 + provides = gnome-terminal=3.18.1 conflicts = gnome-terminal options = !emptydirs - source = https://download.gnome.org/sources/gnome-terminal/3.18/gnome-terminal-3.18.0.tar.xz + source = https://download.gnome.org/sources/gnome-terminal/3.18/gnome-terminal-3.18.1.tar.xz source = 0001-build-Don-t-treat-warnings-as-errors.patch source = gnome-terminal-symbolic-new-tab-icon.patch - source = 0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch - source = 0001-window-Exit-early-from-screen-removed-handler-for-no.patch - source = 0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch source = gnome-terminal-restore-dark-transparency.patch source = gnome-terminal-command-notify.patch source = org.gnome.Terminal.gschema.override - sha256sums = 776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6 + sha256sums = 6eecc81f38c8019d9f49b8950cd814da88d84a8d98c9da98a57be06a1b9f4119 sha256sums = 83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7 sha256sums = 5a3d70ffca64e81f10ede0ed222199581bfb8e92bec26d89dc86130243f8994d - sha256sums = d6dbc0c09781d6a75604c7f01aa2554131bd00194c89d9a5fa33fa503587632e - sha256sums = f342a1fd7785b53961c2b74f54d966bb6418c3a72ee06d37c562d20873451884 - sha256sums = 70454385d5f6c51a1524928976526df00da80aa6a7061bb37e669040645a5f11 sha256sums = d912e5e889c50ecdae880728dc78bf227f4f736ab27a3748f97f343658e2c30a sha256sums = d7ca2a58dfd0c44352dbb70ec48a3ba20ea514be7652cc023785a4cdb5257e05 sha256sums = e2797c0591e45b7cf4e7e8d3b926803bcff129d88dfe3b54f63dc61e0c8377de diff --git a/0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch b/0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch deleted file mode 100644 index 21d193ff5110..000000000000 --- a/0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ece6bbee10191c60674669c810915ae741ee6d7c Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@gnome.org> -Date: Sat, 19 Sep 2015 16:56:15 +0200 -Subject: [PATCH] notebook: Don't change show-tabs when going to empty notebook - -The window will close anyway, so the change is unnecessary. This fixes -a crash in terminal-window's show-tabs change handler. - -https://bugzilla.gnome.org/show_bug.cgi?id=755240 -(cherry picked from commit 7b7c38d01b198c9e2b32e2e6161472178f7492fa) ---- - src/terminal-notebook.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c -index d6c9dd101c94..34236f9e7a43 100644 ---- a/src/terminal-notebook.c -+++ b/src/terminal-notebook.c -@@ -58,14 +58,20 @@ update_tab_visibility (TerminalNotebook *notebook, - { - TerminalNotebookPrivate *priv = notebook->priv; - GtkNotebook *gtk_notebook = GTK_NOTEBOOK (notebook); -+ int new_n_pages; - gboolean show_tabs; - -+ new_n_pages = gtk_notebook_get_n_pages (gtk_notebook) + change; -+ /* Don't do anything if we're going to have zero pages (and thus close the window) */ -+ if (new_n_pages == 0) -+ return; -+ - switch (priv->policy) { - case GTK_POLICY_ALWAYS: - show_tabs = TRUE; - break; - case GTK_POLICY_AUTOMATIC: -- show_tabs = (gtk_notebook_get_n_pages (gtk_notebook) + change) > 1; -+ show_tabs = new_n_pages > 1; - break; - case GTK_POLICY_NEVER: - #if GTK_CHECK_VERSION (3, 16, 0) --- -2.1.0 - diff --git a/0001-window-Exit-early-from-screen-removed-handler-for-no.patch b/0001-window-Exit-early-from-screen-removed-handler-for-no.patch deleted file mode 100644 index 67074dc5080c..000000000000 --- a/0001-window-Exit-early-from-screen-removed-handler-for-no.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 44c6df308a2e5c331b44797c8537da430bb92df7 Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@gnome.org> -Date: Sat, 19 Sep 2015 16:58:34 +0200 -Subject: [PATCH] window: Exit early from screen-removed handler for now empty - notebook - -When the notebook is now empty, it's not necessary to change anything else -since the window will be closed right away. Since GtkNotebook doesn't send -the switch-page signal when removing the last and only screen in the notebook, -priv->active_tab will point to an already freed object, which causes a -crash when the window tries to update itself for the new active tab. - -https://bugzilla.gnome.org/show_bug.cgi?id=755240 -(cherry picked from commit c8704ba3fef98d4acd59ec061566ff540b77c528) ---- - src/terminal-window.c | 20 +++++++++++++++----- - 1 file changed, 15 insertions(+), 5 deletions(-) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index e065ac1de49d..91279663fb50 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -3468,10 +3468,24 @@ mdi_screen_removed_cb (TerminalMdiContainer *container, - G_CALLBACK (screen_close_cb), - window); - -+ /* We already got a switch-page signal whose handler sets the active tab to the -+ * new active tab, unless this screen was the only one in the notebook, so -+ * priv->active_tab is valid here. -+ */ -+ -+ pages = terminal_mdi_container_get_n_screens (container); -+ if (pages == 0) -+ { -+ priv->active_screen = NULL; -+ -+ /* That was the last tab in the window; close it. */ -+ gtk_widget_destroy (GTK_WIDGET (window)); -+ return; -+ } -+ - terminal_window_update_tabs_menu_sensitivity (window); - terminal_window_update_search_sensitivity (screen, window); - -- pages = terminal_mdi_container_get_n_screens (container); - if (pages == 1) - { - TerminalScreen *active_screen = terminal_mdi_container_get_active_screen (container); -@@ -3479,10 +3493,6 @@ mdi_screen_removed_cb (TerminalMdiContainer *container, - - terminal_window_update_size (window); - } -- else if (pages == 0) -- { -- gtk_widget_destroy (GTK_WIDGET (window)); -- } - } - - gboolean --- -2.1.0 - diff --git a/0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch b/0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch deleted file mode 100644 index 36e7fda1a0b7..000000000000 --- a/0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 448cb610ed7c9f243275050b4b3a530561f0f8ab Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Mon, 5 Oct 2015 20:13:05 +0200 -Subject: [PATCH] window: Pass tab switching keys to the terminal for tabless - windows - -This was removed as a side effect of -a319aeb66f36e728af1b4929ddd69574df838702 - -https://bugzilla.gnome.org/show_bug.cgi?id=730128 ---- - src/terminal-window.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 91279663fb50..618425c0e4d5 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -1820,6 +1820,7 @@ static void - terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window) - { - TerminalWindowPrivate *priv = window->priv; -+ GAction *gaction; - GtkActionGroup *action_group = priv->action_group; - GtkAction *action; - int num_pages, page_num; -@@ -1856,6 +1857,9 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window) - gtk_action_set_sensitive (action, not_last); - #endif - -+ gaction = g_action_map_lookup_action (G_ACTION_MAP (window), "switch-tab"); -+ g_simple_action_set_enabled (G_SIMPLE_ACTION (gaction), num_pages > 1); -+ - action = gtk_action_group_get_action (action_group, "TabsMoveLeft"); - gtk_action_set_sensitive (action, not_first); - action = gtk_action_group_get_action (action_group, "TabsMoveRight"); --- -2.1.0 - @@ -4,8 +4,8 @@ pkgname=gnome-terminal-fedora _pkgname=gnome-terminal -pkgver=3.18.0 -pkgrel=2 +pkgver=3.18.1 +pkgrel=1 pkgdesc='The GNOME Terminal Emulator with Fedora patches' arch=('i686' 'x86_64') license=('GPL') @@ -19,23 +19,17 @@ provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") install="${pkgname}.install" source=( - "https://download.gnome.org/sources/${_pkgname}/${pkgver::4}/$_pkgname-${pkgver}.tar.xz" + "https://download.gnome.org/sources/${_pkgname}/${pkgver::4}/${_pkgname}-${pkgver}.tar.xz" '0001-build-Don-t-treat-warnings-as-errors.patch' 'gnome-terminal-symbolic-new-tab-icon.patch' - '0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch' - '0001-window-Exit-early-from-screen-removed-handler-for-no.patch' - '0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch' 'gnome-terminal-restore-dark-transparency.patch' 'gnome-terminal-command-notify.patch' 'org.gnome.Terminal.gschema.override' ) sha256sums=( - '776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6' + '6eecc81f38c8019d9f49b8950cd814da88d84a8d98c9da98a57be06a1b9f4119' '83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7' '5a3d70ffca64e81f10ede0ed222199581bfb8e92bec26d89dc86130243f8994d' - 'd6dbc0c09781d6a75604c7f01aa2554131bd00194c89d9a5fa33fa503587632e' - 'f342a1fd7785b53961c2b74f54d966bb6418c3a72ee06d37c562d20873451884' - '70454385d5f6c51a1524928976526df00da80aa6a7061bb37e669040645a5f11' 'd912e5e889c50ecdae880728dc78bf227f4f736ab27a3748f97f343658e2c30a' 'd7ca2a58dfd0c44352dbb70ec48a3ba20ea514be7652cc023785a4cdb5257e05' 'e2797c0591e45b7cf4e7e8d3b926803bcff129d88dfe3b54f63dc61e0c8377de' @@ -46,9 +40,6 @@ prepare () { patch -p1 -i '../0001-build-Don-t-treat-warnings-as-errors.patch' patch -p1 -i '../gnome-terminal-symbolic-new-tab-icon.patch' - patch -p1 -i '../0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch' - patch -p1 -i '../0001-window-Exit-early-from-screen-removed-handler-for-no.patch' - patch -p1 -i '../0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch' patch -p1 -i '../gnome-terminal-restore-dark-transparency.patch' patch -p1 -i '../gnome-terminal-command-notify.patch' |