Hello community, here is the log from the commit of package caja for openSUSE:Factory checked in at 2018-03-20 21:56:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caja (Old) and /work/SRC/openSUSE:Factory/.caja.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja" Tue Mar 20 21:56:20 2018 rev:28 rq:586515 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/caja/caja.changes 2017-11-15 17:00:25.482266396 +0100 +++ /work/SRC/openSUSE:Factory/.caja.new/caja.changes 2018-03-20 21:56:22.998273072 +0100 @@ -1,0 +2,53 @@ +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Use gtk+-3 bookmarks location. + * Expand grid width to canvas. + * Use atk_component_get_extents instead of + atk_component_get_position. + * don't parse .hidden files manually - GIO does it since 2.36. + * Don't check the nonexistent MATE22_USER_DIR env var. + * Don't check the nonexistent ~/.mate2 directory. + * eel-accessibility: Remove unused code and outdated comments. + * eel: Queue resizes on the canvas as elements change visibility. + * Add size_request to IconContainer to work around unncecessary + relayouting. + * eel: Remove unneeded #include with condition. + * eel: Remove some unused code from eel-gdk-pixbuf-extensions. + * gtk 3.22: Avoid deprecated gdk_screen_get_monitor_ functions. + * Refresh all rows on zoom change. + * Force widget redraw on zoom. + * libcaja-private: Remove wrong link from internal README. + * private: Ensure we allow launching .desktop files from trusted + symlinks. + * Fix scaling the desktop wallpaper not working. + * Avoid deprecated gdk_screen_width/height(), + gdk_screen_get_width/height(), gdk_screen_make_display_name(). + * libegg: Replace deprecated gtk_drag_begin() + * eggsmclient: Fix a build warning because of -Wcomment. + * Don't use deprecated gtk_show_uri. + * Avoid deprecated gdk_screen_get_number(). + * Add a feature: Present the size on the drive of files as we + present the size of the file. + * Reword the Size on Disk column description a bit. + * Make sure scaling the desktop wallpaper works in all monitors. + * An implementation of WidthOfScreen and HeightOfScreen. + * caja-places-sidebar: Fix refusal to unmount when sidebar is + wide. + * caja-places-sidebar: Disable the overlay scrollbar. + * Require GTK+ 3.22 and GLib 2.50. + * Fix tasklist icon change when opening new tab. + * Include local files with "" instead of <>. + * search_dispose and search_finilize can't be run after search + had finished. + * Add a missing window icon to the About dialogue for extensions. + * Move libegg to the top srcdir and drop some leftovers. + * Remove the +x attr from source files. + * Restore Polish translation credits from GNOME. + * Update translations. +- Add caja-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 support. +- Remove caja-gtk3-bookmarks.patch: fixed upstream. +- Make the library package require caja-gschemas less strictly + version-wise. + +------------------------------------------------------------------- Old: ---- caja-1.18.5.tar.xz caja-gtk3-bookmarks.patch New: ---- caja-1.20.0.tar.xz caja-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caja.spec ++++++ --- /var/tmp/diff_new_pack.mKpF40/_old 2018-03-20 21:56:24.350224393 +0100 +++ /var/tmp/diff_new_pack.mKpF40/_new 2018-03-20 21:56:24.362223961 +0100 @@ -1,7 +1,7 @@ # # spec file for package caja # -# 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,28 +18,29 @@ %define lname libcaja-extension1 %define typelib typelib-1_0-Caja-2_0 -%define _version 1.18 +%define _version 1.20 Name: caja -Version: 1.18.5 +Version: 1.20.0 Release: 0 Summary: File manager for the MATE desktop -License: GPL-2.0 AND LGPL-2.0 +License: GPL-2.0-only AND LGPL-2.0-only Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -# PATCH-FEATURE-UPSTREAM caja-gtk3-bookmarks.patch [email protected] -- Use the Gtk3 bookmarks location (commit 65f573c). -Patch0: caja-gtk3-bookmarks.patch +# PATCH-FEATURE-OPENSUSE caja-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: caja-gtk-3.20.patch BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gail) -BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.48 BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libxml-2.0) @@ -78,7 +79,7 @@ %package -n %{lname} Summary: Caja shared libraries Group: System/Libraries -Requires: %{name}-gschemas = %{version} +Requires: %{name}-gschemas >= %{version} %description -n %{lname} Caja is the official file manager for the MATE desktop. It allows to @@ -117,6 +118,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -148,7 +150,7 @@ %postun -n %{lname} -p /sbin/ldconfig -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -167,7 +169,12 @@ %endif %files -%doc AUTHORS COPYING COPYING.EXTENSIONS COPYING.LIB NEWS +%if 0%{?suse_version} >= 1500 +%license COPYING COPYING.EXTENSIONS COPYING.LIB +%else +%doc COPYING COPYING.EXTENSIONS COPYING.LIB +%endif +%doc AUTHORS NEWS %{_bindir}/caja %{_bindir}/caja-autorun-software %{_bindir}/caja-connect-server ++++++ caja-1.18.5.tar.xz -> caja-1.20.0.tar.xz ++++++ ++++ 641462 lines of diff (skipped) ++++++ caja-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ AC_PREREQ(2.54) dnl =========================================================================== -m4_define(glib_minver, 2.50.0) -m4_define(gio_minver, 2.50.0) +m4_define(glib_minver, 2.48.0) +m4_define(gio_minver, 2.48.0) m4_define(mate_desktop_minver, 1.17.3) m4_define(pango_minver, 1.1.2) -m4_define(gtk_minver, 3.22.0) +m4_define(gtk_minver, 3.20.0) m4_define(xml_minver, 2.4.7) m4_define(exif_minver, 0.6.14) m4_define(exempi_minver, 1.99.5) --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -80,7 +80,9 @@ struct EelBackgroundDetails gboolean is_active; }; +#if GTK_CHECK_VERSION (3, 22, 0) static GList *desktop_bg_objects = NULL; +#endif static void free_fade (EelBackground *self) @@ -129,12 +131,14 @@ eel_background_finalize (GObject *object free_background_surface (self); free_fade (self); +#if GTK_CHECK_VERSION (3, 22, 0) if (self->details->is_desktop) { desktop_bg_objects = g_list_remove (desktop_bg_objects, G_OBJECT (self)); } +#endif G_OBJECT_CLASS (eel_background_parent_class)->finalize (object); } @@ -492,8 +496,22 @@ fade_to_surface (EelBackground *self, if (!mate_bg_crossfade_is_started (self->details->fade)) { +#if GTK_CHECK_VERSION (3, 22, 0) mate_bg_crossfade_start_widget (self->details->fade, widget); +#else + GdkWindow *window; + if (EEL_IS_CANVAS (widget)) + { + window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); + } + else + { + window = gtk_widget_get_window (widget); + } + + mate_bg_crossfade_start (self->details->fade, window); +#endif if (self->details->is_desktop) { g_signal_connect (self->details->fade, @@ -540,6 +558,22 @@ eel_background_set_up_widget (EelBackgro if (self->details->is_desktop) { +#if !GTK_CHECK_VERSION (3, 22, 0) + if (self->details->bg_surface != NULL) + { + cairo_pattern_t *pattern = + cairo_pattern_create_for_surface (self->details->bg_surface); + gdk_window_set_background_pattern (window, pattern); + cairo_pattern_destroy (pattern); + } + else + { + GdkRGBA color = self->details->default_color; + make_color_inactive (self, &color); + gdk_window_set_background_rgba (window, &color); + } + gdk_window_invalidate_rect (window, NULL, TRUE); +#endif set_root_surface (self, window, gtk_widget_get_screen (widget)); } } @@ -714,7 +748,9 @@ eel_get_widget_background (GtkWidget *wi { EelBackground *self; gpointer data; +#if GTK_CHECK_VERSION (3, 22, 0) GList *l; +#endif g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); @@ -725,7 +761,7 @@ eel_get_widget_background (GtkWidget *wi g_assert (EEL_IS_BACKGROUND (data)); return data; } - +#if GTK_CHECK_VERSION (3, 22, 0) /* Check for an existing desktop window background. */ for (l = desktop_bg_objects; l != NULL; l = l->next) { @@ -736,6 +772,7 @@ eel_get_widget_background (GtkWidget *wi return self; } } +#endif self = eel_background_new (); self->details->widget = widget; @@ -850,12 +887,14 @@ eel_background_set_desktop (EelBackgroun if (is_desktop) { +#if GTK_CHECK_VERSION (3, 22, 0) self->details->widget = gtk_widget_get_toplevel (self->details->front_widget); desktop_bg_objects = g_list_prepend (desktop_bg_objects, G_OBJECT (self)); +#endif if (gtk_widget_get_realized (self->details->widget)) { widget_realized_setup (self->details->widget, self); @@ -863,9 +902,11 @@ eel_background_set_desktop (EelBackgroun } else { +#if GTK_CHECK_VERSION (3, 22, 0) desktop_bg_objects = g_list_remove (desktop_bg_objects, G_OBJECT (self)); self->details->widget = self->details->front_widget; +#endif } } @@ -897,7 +938,11 @@ eel_background_is_dark (EelBackground *s /* only check for the background on the 0th monitor */ GdkScreen *screen = gdk_screen_get_default (); GdkDisplay *display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (gdk_display_get_monitor (display, 0), &rect); +#else + gdk_screen_get_monitor_geometry (screen, 0, &rect); +#endif return mate_bg_is_dark (self->details->bg, rect.width, rect.height); } --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -4582,7 +4582,14 @@ realize (GtkWidget *widget) GTK_WIDGET_CLASS (caja_icon_container_parent_class)->realize (widget); container = CAJA_ICON_CONTAINER (widget); - +#if !GTK_CHECK_VERSION (3, 22, 0) + /* Ensure that the desktop window is native so the background + set on it is drawn by X. */ + if (container->details->is_desktop) + { + gdk_x11_window_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget))); + } +#endif /* Set up DnD. */ caja_icon_dnd_init (container); @@ -5242,16 +5249,25 @@ caja_icon_container_search_position_func GdkWindow *cont_window; GdkScreen *screen; GtkRequisition requisition; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor_num; +#else + int monitor_num; +#endif GdkRectangle monitor; cont_window = gtk_widget_get_window (GTK_WIDGET (container)); screen = gdk_window_get_screen (cont_window); +#if GTK_CHECK_VERSION (3, 22, 0) monitor_num = gdk_display_get_monitor_at_window (gdk_screen_get_display (screen), cont_window); gdk_monitor_get_geometry (monitor_num, &monitor); +#else + monitor_num = gdk_screen_get_monitor_at_window (screen, cont_window); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif gtk_widget_realize (search_dialog); --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -144,9 +144,15 @@ caja_bookmarks_window_response_callback { GError *error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/goscaja-36", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-user-guide/goscaja-36", + gtk_get_current_event_time (), &error); +#endif if (error) { --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -710,9 +710,15 @@ connect_dialog_response_cb (CajaConnectS break; case GTK_RESPONSE_HELP : error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/caja-server-connect", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-user-guide/caja-server-connect", + gtk_get_current_event_time (), &error); +#endif if (error) { eel_show_error_dialog (_("There was an error displaying help."), error->message, --- a/src/caja-desktop-window.c +++ b/src/caja-desktop-window.c @@ -249,6 +249,7 @@ realize (GtkWidget *widget) G_CALLBACK (caja_desktop_window_screen_size_changed), window); } +#if GTK_CHECK_VERSION (3, 22, 0) static gboolean draw (GtkWidget *widget, cairo_t *cr) @@ -257,6 +258,7 @@ draw (GtkWidget *widget, return GTK_WIDGET_CLASS (caja_desktop_window_parent_class)->draw (widget, cr); } +#endif static char * real_get_title (CajaWindow *window) @@ -280,7 +282,9 @@ caja_desktop_window_class_init (CajaDesk wclass->realize = realize; wclass->unrealize = unrealize; wclass->map = map; +#if GTK_CHECK_VERSION (3, 22, 0) wclass->draw = draw; +#endif nclass->window_type = CAJA_WINDOW_DESKTOP; nclass->get_title = real_get_title; --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -222,9 +222,15 @@ preferences_show_help (GtkWindow *parent help_string = g_strdup_printf ("help:%s/%s", helpfile, sect_id); +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (parent, help_string, gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (parent), + help_string, gtk_get_current_event_time (), + &error); +#endif g_free (help_string); if (error) --- a/src/caja-location-dialog.c +++ b/src/caja-location-dialog.c @@ -94,9 +94,15 @@ response_callback (CajaLocationDialog *d break; case GTK_RESPONSE_HELP : error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/caja-open-location", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-user-guide/caja-open-location", + gtk_get_current_event_time (), &error); +#endif if (error) { eel_show_error_dialog (_("There was an error displaying help."), error->message, --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -1648,9 +1648,15 @@ help_button_callback (GtkWidget *widget, GError *error = NULL; GtkWidget *dialog; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (property_browser), "help:mate-user-guide/goscaja-50", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_widget_get_screen (property_browser), + "help:mate-user-guide/goscaja-50", + gtk_get_current_event_time (), &error); +#endif if (error) { --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -575,11 +575,19 @@ action_caja_manual_callback (GtkAction * error = NULL; window = CAJA_WINDOW (user_data); +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (window), CAJA_IS_DESKTOP_WINDOW (window) ? "help:mate-user-guide" : "help:mate-user-guide/goscaja-1", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)), + CAJA_IS_DESKTOP_WINDOW (window) + ? "help:mate-user-guide" + : "help:mate-user-guide/goscaja-1", + gtk_get_current_event_time (), &error); +#endif if (error) { --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -144,7 +144,12 @@ menu_position_under_widget (GtkMenu *m 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 allocation; @@ -159,10 +164,18 @@ menu_position_under_widget (GtkMenu *m gtk_widget_get_allocation (widget, &allocation); display = gtk_widget_get_display (GTK_WIDGET (menu)); +#if GTK_CHECK_VERSION (3, 22, 0) monitor_num = gdk_display_get_monitor_at_window (display, gtk_widget_get_window (widget)); 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, gtk_widget_get_window (widget)); + if (monitor_num < 0) + monitor_num = 0; + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif gdk_window_get_origin (gtk_widget_get_window (widget), x, y); if (!gtk_widget_get_has_window (widget)) --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1170,9 +1170,15 @@ pattern_select_response_cb (GtkWidget *d break; case GTK_RESPONSE_HELP : error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/caja-select-pattern", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-user-guide/caja-select-pattern", + gtk_get_current_event_time (), &error); +#endif if (error) { eel_show_error_dialog (_("There was an error displaying help."), error->message, GTK_WINDOW (dialog)); --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -3418,9 +3418,11 @@ create_emblems_page (FMPropertiesWindow gtk_container_set_border_width (GTK_CONTAINER (emblems_table), 12); +#if GTK_CHECK_VERSION (3, 22, 0) /* stop GTK 3.22 builds from ballooning the properties dialog to full screen height */ gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (scroller), 300); +#endif gtk_widget_show (scroller); gtk_notebook_append_page (window->details->notebook, @@ -5401,10 +5403,17 @@ real_response (GtkDialog *dialog, switch (response) { case GTK_RESPONSE_HELP: +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/goscaja-51", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-user-guide/goscaja-51", + gtk_get_current_event_time (), + &error); +#endif if (error != NULL) { eel_show_error_dialog (_("There was an error displaying help."), error->message, GTK_WINDOW (dialog));
