Hello community, here is the log from the commit of package metacity for openSUSE:Factory checked in at 2018-03-20 21:58:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metacity (Old) and /work/SRC/openSUSE:Factory/.metacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "metacity" Tue Mar 20 21:58:51 2018 rev:3 rq:587687 version:3.28.0 Changes: -------- --- /work/SRC/openSUSE:Factory/metacity/metacity.changes 2017-10-23 16:52:29.502931525 +0200 +++ /work/SRC/openSUSE:Factory/.metacity.new/metacity.changes 2018-03-20 21:59:13.496134170 +0100 @@ -1,0 +2,12 @@ +Sun Mar 11 21:17:38 UTC 2018 - [email protected] + +- Update to version 3.28.0: + * Require GTK+ 3.22. + * Fix build warnings. + * Fix missing shadows from some windows (bgo#789251). + * Update translations. +- Add metacity-lower-autotools.patch: Lower the requirements on + autotools. +- Add metacity-gtk-3.20.patch: Restore GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- metacity-3.26.0.tar.xz New: ---- metacity-3.28.0.tar.xz metacity-gtk-3.20.patch metacity-lower-autotools.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.6LSXGs/_old 2018-03-20 21:59:14.216108247 +0100 +++ /var/tmp/diff_new_pack.6LSXGs/_new 2018-03-20 21:59:14.220108103 +0100 @@ -1,7 +1,7 @@ # # spec file for package metacity # -# 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 @@ -18,23 +18,31 @@ %define soname libmetacity %define sover 1 -%define _version 3.26 +%define _version 3.28 Name: metacity -Version: 3.26.0 +Version: 3.28.0 Release: 0 Summary: Window Manager for the MATE and GNOME Flashback desktops -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Url: https://wiki.gnome.org/Projects/Metacity Source: https://download.gnome.org/sources/metacity/%{_version}/%{name}-%{version}.tar.xz +# PATCH-FEATURE-OPENSUSE metacity-lower-autotools.patch -- Lower the requirements on autotools. +Patch0: metacity-lower-autotools.patch +# PATCH-FEATURE-OPENSUSE metacity-gtk-3.20.patch -- Restore GTK+ 3.20 support. +Patch1: metacity-gtk-3.20.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext BuildRequires: intltool +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: zenity -BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.44 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libstartup-notification-1.0) @@ -53,7 +61,7 @@ Recommends: %{name}-lang Provides: windowmanager %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 && 0%{?is_opensuse} BuildRequires: pkgconfig(vulkan) %endif @@ -100,8 +108,11 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +autoreconf -fi %configure\ --disable-static make %{?_smp_mflags} V=1 @@ -112,7 +123,11 @@ %suse_update_desktop_file metacity %find_lang %{name} %{?no_lang_C} -%if 0%{?suse_version} <= 1320 +%post -n %{soname}%{sover} -p /sbin/ldconfig + +%postun -n %{soname}%{sover} -p /sbin/ldconfig + +%if 0%{?suse_version} < 1500 %post %desktop_database_post %glib2_gsettings_schema_post @@ -122,12 +137,13 @@ %glib2_gsettings_schema_postun %endif -%post -n %{soname}%{sover} -p /sbin/ldconfig - -%postun -n %{soname}%{sover} -p /sbin/ldconfig - %files -%doc AUTHORS COPYING ChangeLog NEWS rationales.txt README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS rationales.txt README %{_bindir}/metacity %{_bindir}/metacity-message %{_datadir}/applications/metacity.desktop ++++++ metacity-3.26.0.tar.xz -> metacity-3.28.0.tar.xz ++++++ ++++ 15990 lines of diff (skipped) ++++++ metacity-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,7 @@ dnl Check for required packages dnl ************************************************************************** GLIB_REQUIRED_VERSION=2.44.0 -GTK_REQUIRED_VERSION=3.22.0 +GTK_REQUIRED_VERSION=3.20.0 PANGO_REQUIRED_VERSION=1.2.0 XCOMPOSITE_REQUIRED_VERSION=0.3 --- a/src/core/display.c +++ b/src/core/display.c @@ -1973,8 +1973,13 @@ event_callback (XEvent *event, if (meta_prefs_get_raise_on_click ()) meta_window_raise (window); +#if GTK_CHECK_VERSION (3, 22, 0) rect.x = event->xbutton.x; rect.y = event->xbutton.y; +#else + rect.x = event->xbutton.x_root; + rect.y = event->xbutton.y_root; +#endif rect.width = 0; rect.height = 0; --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -2803,6 +2803,7 @@ handle_activate_window_menu (MetaDisplay GdkRectangle rect; GdkEvent *gdk_event; +#if GTK_CHECK_VERSION (3, 22, 0) if (display->focus_window->frame) { rect.x = display->focus_window->rect.x; @@ -2816,6 +2817,15 @@ handle_activate_window_menu (MetaDisplay rect.width = display->focus_window->rect.width; rect.height = 0; +#else + meta_window_get_position (display->focus_window, &rect.x, &rect.y); + + if (meta_ui_get_direction() == META_UI_DIRECTION_RTL) + rect.x += display->focus_window->rect.width; + + rect.width = 0; + rect.height = 0; +#endif if (meta_window_is_client_decorated (display->focus_window)) { --- a/src/ui/fixedtip.c +++ b/src/ui/fixedtip.c @@ -36,12 +36,24 @@ get_monitor_geometry (gint root GdkRectangle *geometry) { GdkDisplay *display; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; +#else + GdkScreen *screen; + int monitor; +#endif display = gdk_display_get_default (); +#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_point (display, root_x, root_y); gdk_monitor_get_geometry (monitor, geometry); +#else + screen = gdk_display_get_default_screen (display); + monitor = gdk_screen_get_monitor_at_point (screen, root_x, root_y); + + gdk_screen_get_monitor_geometry (screen, monitor, geometry); +#endif } void --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -1663,8 +1663,13 @@ meta_frame_titlebar_event (MetaFrames { GdkRectangle rect; +#if GTK_CHECK_VERSION (3, 22, 0) rect.x = event->x; rect.y = event->y; +#else + rect.x = event->x_root; + rect.y = event->y_root; +#endif rect.width = 0; rect.height = 0; @@ -1834,6 +1839,15 @@ meta_frames_button_press_event (GtkWidge return FALSE; } +#if !GTK_CHECK_VERSION (3, 22, 0) + rect.x += event->x_root - event->x; + rect.y += rect.height + event->y_root - event->y; + + /* Align to the right end of the menu rectangle if RTL */ + if (meta_ui_get_direction() == META_UI_DIRECTION_RTL) + rect.x += rect.width; +#endif + frame->ignore_leave_notify = TRUE; meta_core_show_window_menu (frames->xdisplay, frame->xwindow, --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -444,11 +444,39 @@ meta_window_menu_new (MetaFrames return menu; } +#if !GTK_CHECK_VERSION (3, 22, 0) +static void +popup_position_func (GtkMenu *menu, + gint *x, + gint *y, + gboolean *push_in, + gpointer user_data) +{ + GtkRequisition req; + GdkPoint *pos; + + pos = user_data; + + gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL); + + *x = pos->x; + *y = pos->y; + + if (meta_ui_get_direction() == META_UI_DIRECTION_RTL) + *x = MAX (0, *x - req.width); + + /* Ensure onscreen */ + *x = CLAMP (*x, 0, MAX (0, gdk_screen_width () - req.width)); + *y = CLAMP (*y, 0, MAX (0, gdk_screen_height () - req.height)); +} +#endif + void meta_window_menu_popup (MetaWindowMenu *menu, const GdkRectangle *rect, const GdkEvent *event) { +#if GTK_CHECK_VERSION (3, 22, 0) GdkEventAny *any; any = (GdkEventAny *) event; @@ -458,6 +486,33 @@ meta_window_menu_popup (MetaWindowMenu GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, event); +#else + GdkPoint *pt; + int button; + guint32 timestamp; + + pt = g_new (GdkPoint, 1); + + g_object_set_data_full (G_OBJECT (menu->menu), "destroy-point", pt, g_free); + + pt->x = rect->x; + pt->y = rect->y; + + if (event->type == GDK_KEY_PRESS) + { + button = 0; + timestamp = ((GdkEventKey *) event)->time; + } + else + { + button = ((GdkEventButton *) event)->button; + timestamp = ((GdkEventButton *) event)->time; + } + + gtk_menu_popup (GTK_MENU (menu->menu), NULL, NULL, + popup_position_func, pt, + button, timestamp); +#endif if (!gtk_widget_get_visible (menu->menu)) { ++++++ metacity-lower-autotools.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ dnl ************************************ dnl Initialize automake dnl ************************************************************************** -AM_INIT_AUTOMAKE([1.14 no-dist-gzip dist-xz tar-ustar -Wno-portability subdir-objects]) +AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz tar-ustar -Wno-portability subdir-objects]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) @@ -69,7 +69,7 @@ dnl Internationalization dnl ************************************************************************** AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.19.4]) +AM_GNU_GETTEXT_VERSION([0.19.2]) GETTEXT_PACKAGE=metacity AC_SUBST([GETTEXT_PACKAGE])
