Hello community, here is the log from the commit of package mate-terminal for openSUSE:Factory checked in at 2018-03-20 21:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-terminal (Old) and /work/SRC/openSUSE:Factory/.mate-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-terminal" Tue Mar 20 21:57:46 2018 rev:19 rq:586592 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-terminal/mate-terminal.changes 2017-11-15 16:55:02.426100103 +0100 +++ /work/SRC/openSUSE:Factory/.mate-terminal.new/mate-terminal.changes 2018-03-20 21:58:13.430296850 +0100 @@ -1,0 +2,32 @@ +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Require GTK+ 3.22, GLib 2.50 and VTE 0.46. + * Avoid deprecated gdk_screen_get_monitor_, + gdk_screen_get_width/height(), gdk_screen_make_display_name(), + gdk_screen_get_number(), gdk_display_get_screen() functions. + * terminal-util: Avoid deprecated gtk_show_uri(). + * Spelling: Whitespace removed, in the terminal, Ctrl. + * Add Solarized themes from gnome-terminal. + * An implementation of WidthOfScreen and HeightOfScreen. + * Add the ability to switch tabs using [ctrl+tab] and + [ctrl+shift+tab]. + * Allow remapping "search" keyboard shortcuts. + * Support background images with VTE3. + * find-dialog.ui: Fix keyboard selection. + * Add a "select all" keyboard shortcut: + [control] + [shift] + [A]. + * screen: Stop setting TERM and COLORTERM environment variables. + * schema: Fix the summary and description of some keys. + * Remove "..." from Find keyboard shortcut. + * profile-editor: Properly initialise the first palette colour. + * terminal-screen.c: Drop unused variables. + * Fix build warnings: ignoring return value of 'chdir'. + * Add the gsettings key to enable middle click on a tab. + * Make indent more uniform in a few files. + * Fix a possible crash when handling a D-Bus method call. + * Update translations. +- Add mate-terminal-gtk-3.20.patch: Restore GLib 2.48, GTK+ 3.20 + and VTE 0.44 support. + +------------------------------------------------------------------- Old: ---- mate-terminal-1.18.2.tar.xz New: ---- mate-terminal-1.20.0.tar.xz mate-terminal-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-terminal.spec ++++++ --- /var/tmp/diff_new_pack.97YsK3/_old 2018-03-20 21:58:14.394262142 +0100 +++ /var/tmp/diff_new_pack.97YsK3/_new 2018-03-20 21:58:14.394262142 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-terminal # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,26 +16,27 @@ # -%define _version 1.18 +%define _version 1.20 Name: mate-terminal -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: MATE Desktop terminal emulator -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -BuildRequires: libxml2-python +# PATCH-FEATURE-OPENSUSE eom-gtk-3.20.patch -- Restore GLib 2.48, GTK+ 3.20 and VTE 0.44 support. +Patch0: mate-terminal-gtk-3.20.patch BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dconf) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(vte-2.91) +BuildRequires: pkgconfig(vte-2.91) >= 0.44 Requires: gsettings-backend-dconf Recommends: %{name}-lang %glib2_gsettings_schema_requires @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -65,7 +67,7 @@ # Axe out scrollkeeper stuff. rm -rf %{buildroot}%{_localstatedir}/ -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %glib2_gsettings_schema_post ++++++ mate-terminal-1.18.2.tar.xz -> mate-terminal-1.20.0.tar.xz ++++++ ++++ 226082 lines of diff (skipped) ++++++ mate-terminal-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -38,10 +38,10 @@ MATE_COMPILE_WARNINGS([maximum]) AM_GLIB_GNU_GETTEXT -GLIB_REQUIRED=2.50.0 -GIO_REQUIRED=2.50.0 -GTK_REQUIRED=3.22.0 -VTE_REQUIRED=0.46 +GLIB_REQUIRED=2.48.0 +GIO_REQUIRED=2.48.0 +GTK_REQUIRED=3.20.0 +VTE_REQUIRED=0.44 DCONF_REQUIRED=0.13.4 PKG_CHECK_MODULES([TERM], --- a/src/terminal-util.c +++ b/src/terminal-util.c @@ -139,7 +139,12 @@ terminal_util_show_help (const char *top url = g_strdup ("help:mate-terminal"); } +#if GTK_CHECK_VERSION (3, 22, 0) if (!gtk_show_uri_on_window (GTK_WINDOW (parent), url, gtk_get_current_event_time (), &error)) +#else + if (!gtk_show_uri (gtk_window_get_screen (GTK_WINDOW( parent)), url, + gtk_get_current_event_time (), &error)) +#endif { 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 g_assert_not_reached (); } +#if GTK_CHECK_VERSION (3, 22, 0) if (!gtk_show_uri_on_window (GTK_WINDOW (parent), uri, user_time, &error)) +#else + if (!gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (parent)), uri, + user_time, &error)) +#endif { terminal_util_show_error_dialog (GTK_WINDOW (parent), NULL, error, _("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; +#else + int monitor_num; + GdkScreen *screen; +#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); 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); +#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); +#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; +#if VTE_CHECK_VERSION (0, 46, 0) can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL; +#else + can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL; +#endif action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); gtk_action_set_sensitive (action, can_search);
