Hello community, here is the log from the commit of package mate-terminal for openSUSE:Factory checked in at 2019-05-16 22:04:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-terminal (Old) and /work/SRC/openSUSE:Factory/.mate-terminal.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-terminal" Thu May 16 22:04:48 2019 rev:22 rq:682581 version:1.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-terminal/mate-terminal.changes 2019-01-08 12:28:37.944262085 +0100 +++ /work/SRC/openSUSE:Factory/.mate-terminal.new.5148/mate-terminal.changes 2019-05-16 22:04:51.834576679 +0200 @@ -1,0 +2,29 @@ +Tue Mar 5 15:19:33 UTC 2019 - [email protected] + +- Update to version 1.22.0: + * term-screen: Avoid deprecated + gtk_style_context_get_background_color. + * terminal-screen: Avoid deprecated vte_terminal_spawn_sync. + * terminal-window: Avoid deprecated vte_terminal_copy_clipboard. + * terminal-app: Avoid gtk_dialog_add_buttons with stock ids. + * terminal-profile: Fix memory leaks. + * terminal-screen: Avoid deprecated "g_settings_list_schemas". + * terminal-window: Fix warnings with menu popup. + * terminal-window: Replace deprecated gtk_menu_popup. + * Avoid deprecated GtkStock. + * Remove unused files in help dir. + * Remove generated files. + * Add update-authors.pl which helps to update terminal.about. + * Drop umtp suport. + * Help - Window title when MATE Terminal is started for first + time. + * Help - alternative text for tabbed window picture. + * Help - TERM=xterm-256color. + * eggsmclient: Avoid deprecated g_type_class_add_private. + * src/terminal-screen.c: Set TERM to 'xterm-256color' (instead of + just 'xterm'). + * Move appdata to the metainfo/ directory. + * Update translations. +- Rebase mate-terminal-gtk-3.20.patch. + +------------------------------------------------------------------- Old: ---- mate-terminal-1.20.2.tar.xz New: ---- mate-terminal-1.22.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-terminal.spec ++++++ --- /var/tmp/diff_new_pack.VLZGof/_old 2019-05-16 22:04:52.482576072 +0200 +++ /var/tmp/diff_new_pack.VLZGof/_new 2019-05-16 22:04:52.486576068 +0200 @@ -1,7 +1,7 @@ # # spec file for package mate-terminal # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%define _version 1.20 +%define _version 1.22 Name: mate-terminal -Version: 1.20.2 +Version: 1.22.0 Release: 0 Summary: MATE Desktop terminal emulator License: GPL-3.0-or-later Group: System/GUI/Other -Url: https://mate-desktop.org/ +URL: https://mate-desktop.org/ Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE mate-terminal-gtk-3.20.patch -- Restore GLib 2.48, GTK+ 3.20 and VTE 0.44 support. Patch0: mate-terminal-gtk-3.20.patch @@ -85,8 +85,8 @@ %{_datadir}/%{name}/ %{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/%{name}.appdata.xml %{_mandir}/man?/%{name}.?%{?ext_man} %{_datadir}/help/C/%{name} ++++++ mate-terminal-1.20.2.tar.xz -> mate-terminal-1.22.0.tar.xz ++++++ ++++ 345612 lines of diff (skipped) ++++++ mate-terminal-gtk-3.20.patch ++++++ --- /var/tmp/diff_new_pack.VLZGof/_old 2019-05-16 22:04:53.482575135 +0200 +++ /var/tmp/diff_new_pack.VLZGof/_new 2019-05-16 22:04:53.482575135 +0200 @@ -7,7 +7,7 @@ -GLIB_REQUIRED=2.50.0 -GIO_REQUIRED=2.50.0 -GTK_REQUIRED=3.22.0 --VTE_REQUIRED=0.46 +-VTE_REQUIRED=0.48 +GLIB_REQUIRED=2.48.0 +GIO_REQUIRED=2.48.0 +GTK_REQUIRED=3.20.0 @@ -15,6 +15,47 @@ DCONF_REQUIRED=0.13.4 PKG_CHECK_MODULES([TERM], +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -1552,6 +1552,9 @@ terminal_screen_launch_child_cb (Termina + const char *working_dir; + VtePtyFlags pty_flags = VTE_PTY_DEFAULT; + GSpawnFlags spawn_flags = 0; ++#if !VTE_CHECK_VERSION(0, 48, 0) ++ GPid pid; ++#endif + + priv->launch_child_source_id = 0; + +@@ -1577,6 +1580,7 @@ terminal_screen_launch_child_cb (Termina + return FALSE; + } + ++#if VTE_CHECK_VERSION(0, 48, 0) + vte_terminal_spawn_async (terminal, + pty_flags, + working_dir, +@@ -1590,6 +1594,20 @@ terminal_screen_launch_child_cb (Termina + NULL, + (VteTerminalSpawnAsyncCallback) term_spawn_callback, + NULL); ++#else ++ vte_terminal_spawn_sync (terminal, ++ pty_flags, ++ working_dir, ++ argv, ++ env, ++ spawn_flags, ++ NULL, ++ NULL, ++ &pid, ++ NULL, ++ &err); ++ term_spawn_callback (GTK_WIDGET (terminal), pid, err, NULL);; ++#endif + + g_free (shell); + g_strfreev (argv); --- a/src/terminal-util.c +++ b/src/terminal-util.c @@ -139,7 +139,12 @@ terminal_util_show_help (const char *top @@ -30,7 +71,7 @@ { terminal_util_show_error_dialog (GTK_WINDOW (parent), NULL, error, _("There was an error displaying help")); -@@ -211,7 +215,12 @@ terminal_util_open_url (GtkWidget *paren +@@ -211,7 +216,12 @@ terminal_util_open_url (GtkWidget *paren g_assert_not_reached (); } @@ -45,46 +86,122 @@ _("Could not open the address “%s”"), --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -577,7 +577,12 @@ position_menu_under_widget (GtkMenu *men - GtkRequisition req; - GtkRequisition menu_req; - GdkRectangle monitor; -+#if GTK_CHECK_VERSION (3, 22, 0) - GdkMonitor *monitor_num; +@@ -1152,7 +1152,11 @@ terminal_window_update_search_sensitivit + if (screen != priv->active_screen) + return; + ++#if VTE_CHECK_VERSION (0, 46, 0) + can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL; +#else -+ int monitor_num; -+ GdkScreen *screen; ++ can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL; +#endif - GdkDisplay *display; - GtkAllocation widget_allocation; -@@ -589,10 +594,17 @@ position_menu_under_widget (GtkMenu *men - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL); + action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); + gtk_action_set_sensitive (action, can_search); +@@ -1502,7 +1506,13 @@ popup_clipboard_targets_received_cb (Gtk + + gdk_event_set_device (event, device); - display = gtk_widget_get_display (GTK_WIDGET (menu)); +#if GTK_CHECK_VERSION (3, 22, 0) - monitor_num = gdk_display_get_monitor_at_window (display, widget_window); - if (monitor_num == NULL) - monitor_num = gdk_display_get_monitor (display, 0); - gdk_monitor_get_geometry (monitor_num, &monitor); + gtk_menu_popup_at_pointer (GTK_MENU (popup_menu), (const GdkEvent*) event); +#else -+ screen = gdk_display_get_default_screen (display); -+ monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); -+ monitor_num = monitor_num > 0 ? monitor_num : 0; -+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); ++ gtk_menu_popup (GTK_MENU (popup_menu), ++ NULL, NULL, NULL, NULL, ++ info->button, info->timestamp); +#endif - gdk_window_get_origin (widget_window, x, y); - if (!gtk_widget_get_has_window (widget)) -@@ -1202,7 +1214,11 @@ terminal_window_update_search_sensitivit - if (screen != priv->active_screen) - return; + gdk_event_free (event); + } +@@ -2933,7 +2943,13 @@ notebook_button_press_cb (GtkWidget *wid + gtk_menu_detach (GTK_MENU (menu)); + tab = gtk_notebook_get_nth_page (notebook, tab_clicked); + gtk_menu_attach_to_widget (GTK_MENU (menu), tab, NULL); ++#if GTK_CHECK_VERSION (3, 22, 0) + gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL); ++#else ++ gtk_menu_popup (GTK_MENU (menu), ++ NULL, NULL, NULL, NULL, ++ event->button, event->time); ++#endif -+#if VTE_CHECK_VERSION (0, 46, 0) - can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL; + return TRUE; + } +@@ -2974,6 +2990,59 @@ window_key_press_cb (GtkWidget *widget, + return FALSE; + } + ++static void ++position_menu_under_widget (GtkMenu *menu, ++ gint *x, ++ gint *y, ++ gboolean *push_in, ++ gpointer user_data) ++{ ++ /* Adapted from gtktoolbar.c */ ++ GtkWidget *widget = GTK_WIDGET (user_data); ++ GdkWindow *widget_window; ++ GtkWidget *container; ++ GtkRequisition req; ++ GtkRequisition menu_req; ++ GdkRectangle monitor; ++ GdkScreen *screen; ++ gint monitor_num; ++ GtkAllocation widget_allocation; ++ ++ widget_window = gtk_widget_get_window (widget); ++ gtk_widget_get_allocation (widget, &widget_allocation); ++ container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER); ++ ++ gtk_widget_get_preferred_size (widget, &req, NULL); ++ gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL); ++ ++ screen = gtk_widget_get_screen (GTK_WIDGET (menu)); ++ monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); ++ monitor_num = monitor_num > 0 ? monitor_num : 0; ++ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); ++ ++ gdk_window_get_origin (widget_window, x, y); ++ if (!gtk_widget_get_has_window (widget)) ++ { ++ *x += widget_allocation.x; ++ *y += widget_allocation.y; ++ } ++ if (gtk_widget_get_direction (container) == GTK_TEXT_DIR_LTR) ++ *x += widget_allocation.width - req.width; ++ else ++ *x += req.width - menu_req.width; ++ ++ if ((*y + widget_allocation.height + menu_req.height) <= monitor.y + monitor.height) ++ *y += widget_allocation.height; ++ else if ((*y - menu_req.height) >= monitor.y) ++ *y -= menu_req.height; ++ else if (monitor.y + monitor.height - (*y + widget_allocation.height) > *y) ++ *y += widget_allocation.height; ++ else ++ *y -= menu_req.height; ++ ++ *push_in = FALSE; ++} ++ + static gboolean + notebook_popup_menu_cb (GtkWidget *widget, + TerminalWindow *window) +@@ -3000,11 +3068,18 @@ notebook_popup_menu_cb (GtkWidget *widge + if (gtk_menu_get_attach_widget (GTK_MENU (menu))) + gtk_menu_detach (GTK_MENU (menu)); + gtk_menu_attach_to_widget (GTK_MENU (menu), tab_label, NULL); ++#if GTK_CHECK_VERSION (3, 22, 0) + gtk_menu_popup_at_widget (GTK_MENU (menu), + tab_label, + GDK_GRAVITY_SOUTH_WEST, + GDK_GRAVITY_NORTH_WEST, + NULL); +#else -+ can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL; ++ gtk_menu_popup (GTK_MENU (menu), ++ NULL, NULL, ++ position_menu_under_widget, tab_label, ++ 0, GDK_CURRENT_TIME); +#endif + gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); - action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); - gtk_action_set_sensitive (action, can_search); + return TRUE;
