From 760d2b69a86a11afa83ae2233ff9b74a3951734ec65d8325f437bc675455d731 Mon Sep 17 00:00:00 2001
From: Maurizio Galli <maurizio.galli@suse.com>
Date: Wed, 31 Jul 2019 01:55:34 +0000
Subject: [PATCH] Update MATE to 1.23

OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=50
---
 eom-1.22.1.tar.xz  |   3 -
 eom-1.23.0.tar.xz  |   3 +
 eom-gtk-3.20.patch | 248 ---------------------------------------------
 eom.changes        |  22 ++++
 eom.spec           |  12 +--
 5 files changed, 30 insertions(+), 258 deletions(-)
 delete mode 100644 eom-1.22.1.tar.xz
 create mode 100644 eom-1.23.0.tar.xz
 delete mode 100644 eom-gtk-3.20.patch

diff --git a/eom-1.22.1.tar.xz b/eom-1.22.1.tar.xz
deleted file mode 100644
index 1f49e23..0000000
--- a/eom-1.22.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64d73069ba4db8515a6c2c90fadba87e1c5cac67dd1e102b271f62e537ee970e
-size 2142132
diff --git a/eom-1.23.0.tar.xz b/eom-1.23.0.tar.xz
new file mode 100644
index 0000000..659acf8
--- /dev/null
+++ b/eom-1.23.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07fc964500c5c7b3fdc313d28ea1c4d24e2b345c1bed1ed301e4f5f12808bb23
+size 2153448
diff --git a/eom-gtk-3.20.patch b/eom-gtk-3.20.patch
deleted file mode 100644
index c6f9a8f..0000000
--- a/eom-gtk-3.20.patch
+++ /dev/null
@@ -1,248 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -85,9 +85,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/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-list-store.c
-+++ b/src/eom-list-store.c
-@@ -477,7 +477,11 @@ directory_visit (GFile *directory,
- 
- 	if (!g_str_has_prefix (name, ".")) {
- 		/* We support opening any image type, so let eom to add any images in the current directory to the store */
-+#if GLIB_CHECK_VERSION (2, 52, 0)
- 		if (g_content_type_is_mime_type (mime_type, "image/*") || eom_image_is_supported_mime_type (mime_type)) {
-+#else
-+		if (g_content_type_is_a (mime_type, "image/*") || eom_image_is_supported_mime_type (mime_type)) {
-+#endif
- 			load_uri = TRUE;
- 		}
- 	}
---- a/src/eom-scroll-view.c
-+++ b/src/eom-scroll-view.c
-@@ -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)
-     {
-+#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-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
-@@ -1062,6 +1062,11 @@ 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);
-@@ -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
-@@ -1200,9 +1200,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_widget_get_window (GTK_WIDGET (window))),
-+	                                 &monitor);
-+#endif
- 
- 	screen_width  = monitor.width;
- 	screen_height = monitor.height;
-@@ -1651,9 +1658,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 1e55464..ec1f29d 100644
--- a/eom.changes
+++ b/eom.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jul 18 11:22:45 UTC 2019 - Jonathan Brielmaier <jbrielmaier@suse.de>
+
+- Update to version 1.23.0:
+  * update translations
+  * require GLib 2.52
+  * Restore image types list and add wildcard
+  * Disconnect callbacks for "Open with" menu items before connecting new ones.
+  * Unref GtkUIManager so "Open with" menu is freed.
+  * update image of eom_toolbar_editor_window
+  * Use ITS in docbook article info, validate with dbits schemas
+  * store: Add any image file in the current directory to the store
+  * Simplify the installation process of the icons
+  * help: update copyright
+  * Upgrade the manual to docbook 5.0
+  * Use persistent page setup
+- remove patches:
+  * eom-gtk-3.20.patch: we don't support systems with gtk-3.20
+    anymore
+- BuildRequire gtk3 >= 3.22
+ 
+
 -------------------------------------------------------------------
 Sun May 12 18:13:56 UTC 2019 - Alexei Sorokin <sor.alexei@meowr.ru>
 
diff --git a/eom.spec b/eom.spec
index 1a57c6f..b46d0cd 100644
--- a/eom.spec
+++ b/eom.spec
@@ -17,20 +17,19 @@
 
 
 %define typelib typelib-1_0-Eom-1_0
-%define _version 1.22
+%define _version 1.23
 Name:           eom
-Version:        1.22.1
+Version:        1.23.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/
 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
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libjpeg-devel
-BuildRequires:  mate-common >= %{_version}
+# set to _version when mate-common has an equal release
+BuildRequires:  mate-common >= 1.22
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
@@ -39,7 +38,7 @@ 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.20
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22
 BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libexif)
@@ -89,7 +88,6 @@ simplicity and standards compliance.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 NOCONFIGURE=1 mate-autogen