From 7ddf2a1925edcf0d67f24a462d90a575ff3a67453e0f8640d19447b4c5e6d749 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 10 Mar 2018 21:44:34 +0000 Subject: [PATCH] - Update to version 1.20.0. OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=38 --- eom-1.18.3.tar.xz | 3 -- eom-1.20.0.tar.xz | 3 ++ eom-gtk-3.20.patch | 97 ++++++++++++++++++++++++++++++++++++++++++++++ eom.changes | 31 +++++++++++++++ eom.spec | 23 +++++++---- 5 files changed, 147 insertions(+), 10 deletions(-) delete mode 100644 eom-1.18.3.tar.xz create mode 100644 eom-1.20.0.tar.xz create mode 100644 eom-gtk-3.20.patch diff --git a/eom-1.18.3.tar.xz b/eom-1.18.3.tar.xz deleted file mode 100644 index 17ccd51..0000000 --- a/eom-1.18.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4548f14f89300cf74849e197eaf40e58430c00dc5800e067449d38b0692c28ff -size 2198324 diff --git a/eom-1.20.0.tar.xz b/eom-1.20.0.tar.xz new file mode 100644 index 0000000..f056b3f --- /dev/null +++ b/eom-1.20.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a78226d1be0c563d9fb92d49b8dcf50cc7c9304c1cfed1d231540cf0cbc400c +size 2204444 diff --git a/eom-gtk-3.20.patch b/eom-gtk-3.20.patch new file mode 100644 index 0000000..f22dc7b --- /dev/null +++ b/eom-gtk-3.20.patch @@ -0,0 +1,97 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -84,9 +84,9 @@ YELP_HELP_INIT + # MATE Libs + # ********** + +-GLIB_REQUIRED=2.50.0 +-GIO_REQUIRED=2.50.0 +-GTK_REQUIRED=3.22.0 ++GLIB_REQUIRED=2.48.0 ++GIO_REQUIRED=2.48.0 ++GTK_REQUIRED=3.20.0 + MATE_DESKTOP_REQUIRED=1.17.0 + GDKPIXBUF_REQUIRED=2.30.0 + SHARED_MIME_INFO_REQUIRED=0.20 +--- a/src/eom-scroll-view.c ++++ b/src/eom-scroll-view.c +@@ -2146,8 +2146,14 @@ view_on_button_press_event_cb (GtkWidget + /* Ignore double-clicks and triple-clicks */ + if (event->button == 3 && event->type == GDK_BUTTON_PRESS) + { ++#if GTK_CHECK_VERSION (3, 22, 0) + gtk_menu_popup_at_pointer (GTK_MENU (view->priv->menu), + (const GdkEvent*) event); ++#else ++ gtk_menu_popup (GTK_MENU (view->priv->menu), ++ NULL, NULL, NULL, NULL, ++ event->button, event->time); ++#endif + + return TRUE; + } +--- a/src/eom-thumb-view.c ++++ b/src/eom-thumb-view.c +@@ -1063,6 +1063,12 @@ eom_thumb_view_popup_menu (EomThumbView + { + g_return_if_fail (event != NULL); + ++#if GTK_CHECK_VERSION (3, 22, 0) + gtk_menu_popup_at_pointer (GTK_MENU (thumbview->priv->menu), + (const GdkEvent*) event); ++#else ++ gtk_menu_popup (GTK_MENU (thumbview->priv->menu), ++ NULL, NULL, NULL, NULL, ++ event->button, event->time); ++#endif + } +--- a/src/eom-util.c ++++ b/src/eom-util.c +@@ -53,7 +53,11 @@ eom_util_show_help (const gchar *section + if (section) + uri = g_strdup_printf ("help:eom/%s", section); + ++#if GTK_CHECK_VERSION (3, 22, 0) + gtk_show_uri_on_window (parent, ((uri != NULL) ? uri : "help:eom"), ++#else ++ gtk_show_uri (NULL, ((uri != NULL) ? uri : "help:eom"), ++#endif + gtk_get_current_event_time (), &error); + + g_free (uri); +--- a/src/eom-window.c ++++ b/src/eom-window.c +@@ -1198,9 +1198,16 @@ eom_window_obtain_desired_size (EomImage + screen = gtk_window_get_screen (GTK_WINDOW (window)); + display = gdk_screen_get_display (screen); + ++#if GTK_CHECK_VERSION (3, 22, 0) + gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display, + gtk_widget_get_window (GTK_WIDGET (window))), + &monitor); ++#else ++ gdk_screen_get_monitor_geometry (screen, ++ gdk_screen_get_monitor_at_window (screen, ++ gtk_window_get_window (GTK_WINDOW (window))), ++ &monitor); ++#endif + + screen_width = monitor.width; + screen_height = monitor.height; +@@ -1649,9 +1656,16 @@ eom_window_update_fullscreen_popup (EomW + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + display = gdk_screen_get_display (screen); + ++#if GTK_CHECK_VERSION (3, 22, 0) + gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display, + gtk_widget_get_window (GTK_WIDGET (window))), + &screen_rect); ++#else ++ gdk_screen_get_monitor_geometry (screen, ++ gdk_screen_get_monitor_at_window(screen, ++ gtk_widget_get_window (GTK_WIDGET (window))), ++ &screen_rect); ++#endif + + gtk_widget_set_size_request (popup, + screen_rect.width, diff --git a/eom.changes b/eom.changes index 81a26b0..5be3df2 100644 --- a/eom.changes +++ b/eom.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Mar 9 19:10:07 UTC 2018 - sor.alexei@meowr.ru + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * EomThumbView, EomScrollView: Replace the deprecated + gtk_menu_popup() function. + * UI: Avoid using deprecaded widgets. + * Fix a few GtkStock deprecations. + * A bunch of instrospection warning fixes. + * EomScrollView: Fix the override_background deprecated call. + * EomPropertiesDialog: Fix deprecation warnings. + * EomThumbNav: Fix a deprecated function warning. + * EomScrollView: Switch from GdkDeviceManager to GdkSeat. + * settings: Use the rgb colour definition as defaults. + * EomFileChooser: Use MateThumbnailFactory to create the preview + image. + * EomPropertiesDialog: Allow RGBA for transparent background + colour. + * preferences-ui: Drop usage of MateColorButton. + * EomScrollView: Switch to GdkRGBA for background and transparent + colours. + * EomPrintPreview: Avoid unnecessary colour parsing. + * toolbar-editor: Avoid deprecated GtkAlignment. + * gtk 3.22: Avoid deprecated gdk_screen_get_monitor_ functions. + * Don't use deprecated gtk_show_uri(). + * Avoid deprecated gdk_screen_get_number(). + * print-preview: Replace custom code with a GDK function call. + * Update translations. +- Add eom-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 support. + ------------------------------------------------------------------- Wed Nov 8 17:56:12 UTC 2017 - sor.alexei@meowr.ru diff --git a/eom.spec b/eom.spec index 9f8393a..9b07389 100644 --- a/eom.spec +++ b/eom.spec @@ -1,7 +1,7 @@ # # spec file for package eom # -# 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 @@ -17,15 +17,17 @@ %define typelib typelib-1_0-Eom-1_0 -%define _version 1.18 +%define _version 1.20 Name: eom -Version: 1.18.3 +Version: 1.20.0 Release: 0 Summary: MATE Desktop graphics viewer -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +# PATCH-FEATURE-OPENSUSE eom-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: eom-gtk-3.20.patch BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libxml2-python @@ -36,8 +38,9 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(gtk+-unix-print-3.0) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libexif) @@ -87,6 +90,7 @@ simplicity and standards compliance. %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -101,7 +105,7 @@ make %{?_smp_mflags} V=1 find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file %{name} -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -114,7 +118,12 @@ find %{buildroot} -type f -name "*.la" -delete -print %endif %files -%doc AUTHORS COPYING NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_bindir}/%{name} %{_libdir}/%{name}/ %{_datadir}/%{name}/