Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package mate-terminal (a) This version fixes RC bug #769947: occasional segfaults of mate-terminal in non-standard setup (mate-terminal with xmonad WM, mate-terminal used with enlightenment desktop environment). (b) drop a non-used patch file form debian/patches/ Thanks! Mike unblock mate-terminal/1.8.1+dfsg1-3 -- System Information: Debian Release: jessie/sid APT prefers stable APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru mate-terminal-1.8.1+dfsg1/debian/changelog mate-terminal-1.8.1+dfsg1/debian/changelog --- mate-terminal-1.8.1+dfsg1/debian/changelog 2014-10-24 12:42:23.000000000 +0200 +++ mate-terminal-1.8.1+dfsg1/debian/changelog 2014-11-30 20:25:43.000000000 +0100 @@ -1,3 +1,12 @@ +mate-terminal (1.8.1+dfsg1-3) unstable; urgency=medium + + * debian/patches: + + Add 1002_fix-occasional-segfaults-at-session-startup.patch. + Fix segfaults for mate-terminal in non-standard setups if started + during session startup. (Closes: #769947). + + -- Mike Gabriel <[email protected]> Sun, 30 Nov 2014 20:25:38 +0100 + mate-terminal (1.8.1+dfsg1-2) unstable; urgency=medium * A changelog fixup upload. The below two changes have already been diff -Nru mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch --- mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch 1970-01-01 01:00:00.000000000 +0100 +++ mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch 2014-11-30 20:20:32.000000000 +0100 @@ -0,0 +1,32 @@ +From bb659a752efbeedbe60fb6df5541a57c95777279 Mon Sep 17 00:00:00 2001 +From: Nikolay Martynov <[email protected]> +Date: Mon, 24 Nov 2014 22:46:51 -0500 +Subject: [PATCH] Properly check gdk_property_get result + +Check return value of gdk_property_get in get_initial_workspace before using its result + +Current implementation segfaults from to time if terminal is started at X session startup + +Looks like #769947 bug in Debian describes same issue +--- + src/terminal.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/terminal.c b/src/terminal.c +index a6bf43f..f9989a5 100644 +--- a/src/terminal.c ++++ b/src/terminal.c +@@ -532,10 +532,10 @@ get_initial_workspace (void) + atom = gdk_atom_intern_static_string ("_NET_CURRENT_DESKTOP"); + cardinal_atom = gdk_atom_intern_static_string ("CARDINAL"); + +- gdk_property_get (window, atom, cardinal_atom, 0, 8, FALSE, NULL, NULL, NULL, &data); +- +- ret = *(int *)data; +- g_free (data); ++ if (gdk_property_get (window, atom, cardinal_atom, 0, 8, FALSE, NULL, NULL, NULL, &data)) { ++ ret = *(int *)data; ++ g_free (data); ++ } + return ret; + } diff -Nru mate-terminal-1.8.1+dfsg1/debian/patches/add-alt-scroll.patch mate-terminal-1.8.1+dfsg1/debian/patches/add-alt-scroll.patch --- mate-terminal-1.8.1+dfsg1/debian/patches/add-alt-scroll.patch 2014-09-05 12:00:48.000000000 +0200 +++ mate-terminal-1.8.1+dfsg1/debian/patches/add-alt-scroll.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -Index: mate-terminal-1.8.0/src/org.mate.terminal.gschema.xml.in -=================================================================== ---- mate-terminal-1.8.0.orig/src/org.mate.terminal.gschema.xml.in 2014-01-26 02:33:17.000000000 +0400 -+++ mate-terminal-1.8.0/src/org.mate.terminal.gschema.xml.in 2014-07-10 14:53:17.000000000 +0400 -@@ -163,6 +163,11 @@ - <summary>Whether an unlimited number of lines should be kept in scrollback</summary> - <description>If true, scrollback lines will never be discarded. The scrollback history is stored on disk temporarily, so this may cause the system to run out of disk space if there is a lot of output to the terminal.</description> - </key> -+ <key name="alternate-screen-scroll" type="b"> -+ <default>true</default> -+ <summary>Whether to send keystrokes for alternate screen scrolling</summary> -+ <description>If true, send Up/Down keystrokes for scrolling when using alternate screen or when scrolling is restricted.</description> -+ </key> - <key name="scroll-on-keystroke" type="b"> - <default>true</default> - <summary>Whether to scroll to the bottom when a key is pressed</summary> -Index: mate-terminal-1.8.0/src/profile-editor.c -=================================================================== ---- mate-terminal-1.8.0.orig/src/profile-editor.c 2014-01-26 02:33:17.000000000 +0400 -+++ mate-terminal-1.8.0/src/profile-editor.c 2014-07-10 14:53:17.000000000 +0400 -@@ -290,6 +290,10 @@ - SET_SENSITIVE ("scroll-on-output-checkbutton", - !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SCROLL_ON_OUTPUT)); - -+ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)) -+ SET_SENSITIVE ("alternate-screen-scroll-checkbutton", -+ !terminal_profile_property_locked (profile, TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)); -+ - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_EXIT_ACTION)) - SET_SENSITIVE ("exit-action-combobox", - !terminal_profile_property_locked (profile, TERMINAL_PROFILE_EXIT_ACTION)); -@@ -931,6 +935,7 @@ - CONNECT ("scrollbar-position-combobox", TERMINAL_PROFILE_SCROLLBAR_POSITION); - CONNECT ("scroll-on-keystroke-checkbutton", TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE); - CONNECT ("scroll-on-output-checkbutton", TERMINAL_PROFILE_SCROLL_ON_OUTPUT); -+ CONNECT ("alternate-screen-scroll-checkbutton", TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL); - CONNECT ("show-menubar-checkbutton", TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR); - CONNECT ("solid-radiobutton", TERMINAL_PROFILE_BACKGROUND_TYPE); - CONNECT ("system-font-checkbutton", TERMINAL_PROFILE_USE_SYSTEM_FONT); -Index: mate-terminal-1.8.0/src/profile-preferences.ui -=================================================================== ---- mate-terminal-1.8.0.orig/src/profile-preferences.ui 2014-01-26 02:33:17.000000000 +0400 -+++ mate-terminal-1.8.0/src/profile-preferences.ui 2014-07-10 14:53:17.000000000 +0400 -@@ -2536,6 +2536,26 @@ - </packing> - </child> - <child> -+ <object class="GtkCheckButton" id="alternate-screen-scroll-checkbutton"> -+ <property name="visible">True</property> -+ <property name="can_focus">True</property> -+ <property name="label" translatable="yes">Use keystrokes to scroll on _alternate screen</property> -+ <property name="use_underline">True</property> -+ <property name="relief">GTK_RELIEF_NORMAL</property> -+ <property name="focus_on_click">True</property> -+ <property name="active">False</property> -+ <property name="inconsistent">False</property> -+ <property name="draw_indicator">True</property> -+ </object> -+ <packing> -+ <property name="left_attach">0</property> -+ <property name="right_attach">2</property> -+ <property name="top_attach">5</property> -+ <property name="bottom_attach">6</property> -+ <property name="y_options"/> -+ </packing> -+ </child> -+ <child> - <object class="GtkCheckButton" id="scroll-on-keystroke-checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> -Index: mate-terminal-1.8.0/src/terminal-profile.c -=================================================================== ---- mate-terminal-1.8.0.orig/src/terminal-profile.c 2014-02-23 22:17:25.000000000 +0400 -+++ mate-terminal-1.8.0/src/terminal-profile.c 2014-07-10 14:53:17.000000000 +0400 -@@ -73,6 +73,7 @@ - PROP_SCROLLBAR_POSITION, - PROP_SCROLL_ON_KEYSTROKE, - PROP_SCROLL_ON_OUTPUT, -+ PROP_ALTERNATE_SCREEN_SCROLL, - PROP_SILENT_BELL, - PROP_TITLE, - PROP_TITLE_MODE, -@@ -113,6 +114,7 @@ - #define KEY_SCROLLBAR_POSITION "scrollbar-position" - #define KEY_SCROLL_ON_KEYSTROKE "scroll-on-keystroke" - #define KEY_SCROLL_ON_OUTPUT "scroll-on-output" -+#define KEY_ALTERNATE_SCREEN_SCROLL "alternate-screen-scroll" - #define KEY_SILENT_BELL "silent-bell" - #define KEY_TITLE_MODE "title-mode" - #define KEY_TITLE "title" -@@ -153,6 +155,7 @@ - #define DEFAULT_SCROLLBAR_POSITION (TERMINAL_SCROLLBAR_RIGHT) - #define DEFAULT_SCROLL_ON_KEYSTROKE (TRUE) - #define DEFAULT_SCROLL_ON_OUTPUT (FALSE) -+#define DEFAULT_ALTERNATE_SCREEN_SCROLL (FALSE) - #define DEFAULT_SILENT_BELL (FALSE) - #define DEFAULT_TITLE_MODE (TERMINAL_TITLE_REPLACE) - #define DEFAULT_TITLE (N_("Terminal")) -@@ -1250,6 +1253,7 @@ - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLLBACK_UNLIMITED, DEFAULT_SCROLLBACK_UNLIMITED, KEY_SCROLLBACK_UNLIMITED); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_KEYSTROKE, DEFAULT_SCROLL_ON_KEYSTROKE, KEY_SCROLL_ON_KEYSTROKE); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_OUTPUT, DEFAULT_SCROLL_ON_OUTPUT, KEY_SCROLL_ON_OUTPUT); -+ TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALTERNATE_SCREEN_SCROLL, DEFAULT_ALTERNATE_SCREEN_SCROLL, KEY_ALTERNATE_SCREEN_SCROLL); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SILENT_BELL, DEFAULT_SILENT_BELL, KEY_SILENT_BELL); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (UPDATE_RECORDS, DEFAULT_UPDATE_RECORDS, KEY_UPDATE_RECORDS); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_CUSTOM_COMMAND, DEFAULT_USE_CUSTOM_COMMAND, KEY_USE_CUSTOM_COMMAND); -Index: mate-terminal-1.8.0/src/terminal-profile.h -=================================================================== ---- mate-terminal-1.8.0.orig/src/terminal-profile.h 2014-01-26 02:33:17.000000000 +0400 -+++ mate-terminal-1.8.0/src/terminal-profile.h 2014-07-10 14:53:17.000000000 +0400 -@@ -93,6 +93,7 @@ - #define TERMINAL_PROFILE_SCROLLBAR_POSITION "scrollbar-position" - #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE "scroll-on-keystroke" - #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT "scroll-on-output" -+#define TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL "alternate-screen-scroll" - #define TERMINAL_PROFILE_SILENT_BELL "silent-bell" - #define TERMINAL_PROFILE_TITLE_MODE "title-mode" - #define TERMINAL_PROFILE_TITLE "title" -Index: mate-terminal-1.8.0/src/terminal-screen.c -=================================================================== ---- mate-terminal-1.8.0.orig/src/terminal-screen.c 2014-02-23 22:17:25.000000000 +0400 -+++ mate-terminal-1.8.0/src/terminal-screen.c 2014-07-10 14:53:17.000000000 +0400 -@@ -984,6 +984,9 @@ - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_OUTPUT)) - vte_terminal_set_scroll_on_output (vte_terminal, - terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SCROLL_ON_OUTPUT)); -+ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)) -+ vte_terminal_set_alternate_screen_scroll (vte_terminal, -+ terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)); - if (!prop_name || - prop_name == I_(TERMINAL_PROFILE_SCROLLBACK_LINES) || - prop_name == I_(TERMINAL_PROFILE_SCROLLBACK_UNLIMITED)) diff -Nru mate-terminal-1.8.1+dfsg1/debian/patches/series mate-terminal-1.8.1+dfsg1/debian/patches/series --- mate-terminal-1.8.1+dfsg1/debian/patches/series 2014-03-13 17:03:42.000000000 +0100 +++ mate-terminal-1.8.1+dfsg1/debian/patches/series 2014-11-30 20:21:29.000000000 +0100 @@ -1,2 +1,3 @@ 1001_add-keywords-to-desktop-files.patch +1002_fix-occasional-segfaults-at-session-startup.patch 2001_omit-gfdl-licensed-help-files.patch
