From 68a6046fa97a4e4e20222c8e688b95c20a2443fa267b299a24f60a80c12ac115 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Thu, 7 Mar 2019 14:36:40 +0000
Subject: [PATCH 1/2] - Update to version 1.22.0.

OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=45
---
 eom-1.20.2.tar.xz  |   3 -
 eom-1.22.0.tar.xz  |   3 +
 eom-gtk-3.20.patch | 153 ++++++++++++++++++++++++++++++++++++++++++---
 eom.changes        |   7 +++
 eom.spec           |  20 +++---
 5 files changed, 162 insertions(+), 24 deletions(-)
 delete mode 100644 eom-1.20.2.tar.xz
 create mode 100644 eom-1.22.0.tar.xz

diff --git a/eom-1.20.2.tar.xz b/eom-1.20.2.tar.xz
deleted file mode 100644
index 4587196..0000000
--- a/eom-1.20.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05f07cf2702c14938a11dd829aa9768261041ae56fabc28141f6c71697d38010
-size 2156196
diff --git a/eom-1.22.0.tar.xz b/eom-1.22.0.tar.xz
new file mode 100644
index 0000000..8ad102e
--- /dev/null
+++ b/eom-1.22.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4e4014216fd8c5a22fc4755484c45e6b2155e5e5af9018c4f7721826e5c7b24
+size 2171992
diff --git a/eom-gtk-3.20.patch b/eom-gtk-3.20.patch
index a07820c..670ea2d 100644
--- a/eom-gtk-3.20.patch
+++ b/eom-gtk-3.20.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -84,9 +84,9 @@ YELP_HELP_INIT
+@@ -85,9 +85,9 @@ YELP_HELP_INIT
  # MATE Libs
  # **********
  
@@ -13,9 +13,63 @@
  MATE_DESKTOP_REQUIRED=1.17.0
  GDKPIXBUF_REQUIRED=2.30.0
  SHARED_MIME_INFO_REQUIRED=0.20
+--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
++++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+@@ -358,7 +358,12 @@ popup_context_menu_cb (GtkWidget
+       menu = GTK_MENU (gtk_ui_manager_get_widget (etoolbar->priv->manager,
+ 						  etoolbar->priv->popup_path));
+       g_return_if_fail (menu != NULL);
++#if GTK_CHECK_VERSION (3, 22, 0)
+       gtk_menu_popup_at_pointer (menu, NULL);
++#else
++      gtk_menu_popup (menu, NULL, NULL,
++                      NULL, NULL, button_number, GDK_CURRENT_TIME);
++#endif
+       g_signal_connect_object (menu, "selection-done",
+ 			       G_CALLBACK (popup_context_deactivate),
+ 			       etoolbar, 0);
+@@ -380,7 +385,12 @@ button_press_event_cb (GtkWidget *widget
+       menu = GTK_MENU (gtk_ui_manager_get_widget (etoolbar->priv->manager,
+ 						  etoolbar->priv->popup_path));
+       g_return_val_if_fail (menu != NULL, FALSE);
++#if GTK_CHECK_VERSION (3, 22, 0)
+       gtk_menu_popup_at_pointer (menu, (const GdkEvent*) event);
++#else
++      gtk_menu_popup (menu, NULL, NULL,
++                      NULL, NULL, event->button, event->time);
++#endif
+       g_signal_connect_object (menu, "selection-done",
+ 			       G_CALLBACK (popup_context_deactivate),
+ 			       etoolbar, 0);
+--- a/data/eom-image-properties-dialog.ui
++++ b/data/eom-image-properties-dialog.ui
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="3.22"/>
++  <requires lib="gtk+" version="3.20"/>
+   <template class="EomPropertiesDialog" parent="GtkDialog">
+     <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+--- a/src/eom-properties-dialog.c
++++ b/src/eom-properties-dialog.c
+@@ -453,7 +453,12 @@ pd_folder_button_clicked_cb (GtkButton *
+ 	timestamp = gtk_get_current_event_time ();
+ 
+ 	window = GTK_WINDOW (data);
++#if GTK_CHECK_VERSION (3, 22, 0)
+ 	gtk_show_uri_on_window (window, priv->folder_button_uri, timestamp, NULL);
++#else
++	gtk_show_uri (gtk_window_get_screen (window), priv->folder_button_uri,
++	              timestamp, NULL);
++#endif
+ }
+ 
+ static gboolean
 --- a/src/eom-scroll-view.c
 +++ b/src/eom-scroll-view.c
-@@ -2146,8 +2146,14 @@ view_on_button_press_event_cb (GtkWidget
+@@ -2241,8 +2241,14 @@ view_on_button_press_event_cb (GtkWidget
      /* Ignore double-clicks and triple-clicks */
      if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
      {
@@ -30,9 +84,80 @@
  
  	    return TRUE;
      }
+--- a/src/eom-sidebar.c
++++ b/src/eom-sidebar.c
+@@ -218,6 +218,32 @@ eom_sidebar_class_init (EomSidebarClass
+ 			      GTK_TYPE_WIDGET);
+ }
+ 
++#if !GTK_CHECK_VERSION (3, 22, 0)
++static void
++eom_sidebar_menu_position_under_widget (GtkMenu *menu,
++                                        int     *x,
++                                        int     *y,
++                                        gboolean *push_in,
++                                        gpointer user_data)
++{
++    GtkWidget *widget;
++    GtkAllocation allocation;
++
++    g_return_if_fail (GTK_IS_WIDGET (user_data));
++    g_return_if_fail (!gtk_widget_get_has_window (GTK_WIDGET (user_data)));
++
++    widget = GTK_WIDGET (user_data);
++
++    gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
++    gtk_widget_get_allocation (widget, &allocation);
++
++    *x += allocation.x;
++    *y += allocation.y + allocation.height;
++
++    *push_in = FALSE;
++}
++#endif
++
+ static gboolean
+ eom_sidebar_select_button_press_cb (GtkWidget      *widget,
+ 				    GdkEventButton *event,
+@@ -241,11 +267,17 @@ eom_sidebar_select_button_press_cb (GtkW
+ 
+ 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ 
++#if GTK_CHECK_VERSION (3, 22, 0)
+ 		gtk_menu_popup_at_widget (GTK_MENU (eom_sidebar->priv->menu),
+ 		                          widget,
+ 		                          GDK_GRAVITY_SOUTH_WEST,
+ 		                          GDK_GRAVITY_NORTH_WEST,
+ 		                          (const GdkEvent*) event);
++#else
++		gtk_menu_popup (GTK_MENU (eom_sidebar->priv->menu), NULL, NULL,
++		                eom_sidebar_menu_position_under_widget, widget,
++		                event->button, event->time);
++#endif
+ 
+ 		return TRUE;
+ 	}
+@@ -266,11 +298,17 @@ eom_sidebar_select_button_key_press_cb (
+ 	    event->keyval == GDK_KEY_KP_Enter) {
+ 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ 
++#if GTK_CHECK_VERSION (3, 22, 0)
+ 		gtk_menu_popup_at_widget (GTK_MENU (eom_sidebar->priv->menu),
+ 		                          widget,
+ 		                          GDK_GRAVITY_SOUTH_WEST,
+ 		                          GDK_GRAVITY_NORTH_WEST,
+ 		                          (const GdkEvent*) event);
++#else
++		gtk_menu_popup (GTK_MENU (eom_sidebar->priv->menu), NULL, NULL,
++		                eom_sidebar_menu_position_under_widget, widget,
++				GDK_BUTTON_PRIMARY, 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
+@@ -1062,6 +1062,11 @@ eom_thumb_view_popup_menu (EomThumbView
  {
  	g_return_if_fail (event != NULL);
  
@@ -40,9 +165,8 @@
  	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);
++	gtk_menu_popup (GTK_MENU (thumbview->priv->menu), NULL, NULL,
++	                NULL, NULL, event->button, event->time);
 +#endif
  }
 --- a/src/eom-util.c
@@ -59,9 +183,22 @@
  		      gtk_get_current_event_time (), &error);
  
  	g_free (uri);
+@@ -362,7 +366,12 @@ _eom_util_show_file_in_filemanager_fallb
+ 		g_object_unref (parent_file);
+ 	}
+ 
++#if GTK_CHECK_VERSION (3, 22, 0)
+ 	if (uri && !gtk_show_uri_on_window (toplevel, uri, timestamp, &error)) {
++#else
++	if (uri && !gtk_show_uri (gtk_window_get_screen (toplevel), uri,
++	                          timestamp, &error)) {
++#endif
+ 		g_warning ("Couldn't show containing folder \"%s\": %s", uri,
+ 			   error->message);
+ 		g_error_free (error);
 --- a/src/eom-window.c
 +++ b/src/eom-window.c
-@@ -1198,9 +1198,16 @@ eom_window_obtain_desired_size (EomImage
+@@ -1200,9 +1200,16 @@ eom_window_obtain_desired_size (EomImage
  	screen = gtk_window_get_screen (GTK_WINDOW (window));
  	display = gdk_screen_get_display (screen);
  
@@ -78,7 +215,7 @@
  
  	screen_width  = monitor.width;
  	screen_height = monitor.height;
-@@ -1649,9 +1656,16 @@ eom_window_update_fullscreen_popup (EomW
+@@ -1651,9 +1658,16 @@ eom_window_update_fullscreen_popup (EomW
  	screen = gtk_widget_get_screen (GTK_WIDGET (window));
  	display = gdk_screen_get_display (screen);
  
diff --git a/eom.changes b/eom.changes
index bd8ed95..6617113 100644
--- a/eom.changes
+++ b/eom.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar  5 15:19:33 UTC 2019 - sor.alexei@meowr.ru
+
+- Update to version 1.22.0:
+  * See /usr/share/doc/packages/eom/NEWS
+- Rebase eom-gtk-3.20.patch.
+
 -------------------------------------------------------------------
 Sat Dec 22 20:48:48 UTC 2018 - sor.alexei@meowr.ru
 
diff --git a/eom.spec b/eom.spec
index 5a3364b..3a4b6f0 100644
--- a/eom.spec
+++ b/eom.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package eom
 #
-# 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
@@ -19,12 +19,12 @@
 %define typelib typelib-1_0-Eom-1_0
 %define _version 1.20
 Name:           eom
-Version:        1.20.2
+Version:        1.22.0
 Release:        0
 Summary:        MATE Desktop graphics viewer
 License:        GPL-2.0-or-later AND LGPL-2.1-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 eom-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support.
 Patch0:         eom-gtk-3.20.patch
@@ -43,7 +43,7 @@ BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20
 BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libexif)
-BuildRequires:  pkgconfig(libpeas-gtk-1.0)
+BuildRequires:  pkgconfig(libpeas-gtk-1.0) >= 1.8.0
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mate-desktop-2.0) >= %{_version}
@@ -54,11 +54,6 @@ Provides:       mate-image-viewer = %{version}
 Obsoletes:      mate-image-viewer < %{version}
 Obsoletes:      mate-image-viewer-lang < %{version}
 %glib2_gsettings_schema_requires
-%if 0%{?suse_version} >= 1500
-BuildRequires:  python2-libxml2-python
-%else
-BuildRequires:  libxml2-python
-%endif
 
 %description
 The Eye of MATE is a simple graphics viewer for the MATE Desktop
@@ -99,8 +94,7 @@ simplicity and standards compliance.
 %build
 NOCONFIGURE=1 mate-autogen
 %configure \
-  --libexecdir=%{_libexecdir}/%{name} \
-  --disable-python
+  --libexecdir=%{_libexecdir}/%{name}
 make %{?_smp_mflags} V=1
 
 %install
@@ -128,8 +122,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_datadir}/glib-2.0/schemas/*.xml
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/%{name}.appdata.xml
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_mandir}/man?/%{name}.?%{?ext_man}

From 5f8ccbf4e1ca7e1f61dc32d9be100459b6734198fc449c3bfc0d552045f1067b Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Thu, 7 Mar 2019 16:28:31 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=46

---
 eom.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eom.spec b/eom.spec
index 3a4b6f0..5f391bc 100644
--- a/eom.spec
+++ b/eom.spec
@@ -17,7 +17,7 @@
 
 
 %define typelib typelib-1_0-Eom-1_0
-%define _version 1.20
+%define _version 1.22
 Name:           eom
 Version:        1.22.0
 Release:        0