Bug#864050: unblock: eom/1.16.1-1

[Mike Gabriel]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please consider unblocking planned upload of package eom.

This upload brings a new maintenance release of the eom component of the
MATE 1.16 release series.

Other than closing open Debian bug #816914 (Eom auto reload file is
broken), it brings in some other fixes cherry-picked to the 1.16 branch
of eom (targetting Debian 9). See debian/changelog for details in
attached .debdiff.

unblock eom/1.16.1-1

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru eom-1.16.0/configure.ac eom-1.16.1/configure.ac
--- eom-1.16.0/configure.ac	2016-09-19 07:48:00.000000000 +0200
+++ eom-1.16.1/configure.ac	2017-01-26 13:34:31.000000000 +0100
@@ -3,7 +3,7 @@
 
 m4_define(eom_major_version, 1)
 m4_define(eom_minor_version, 16)
-m4_define(eom_micro_version, 0)
+m4_define(eom_micro_version, 1)
 m4_define(eom_version, eom_major_version.eom_minor_version.eom_micro_version)
 
 AC_INIT([eom], eom_version, [http://www.mate-desktop.org], [eom])
diff -Nru eom-1.16.0/debian/changelog eom-1.16.1/debian/changelog
--- eom-1.16.0/debian/changelog	2017-01-24 21:25:45.000000000 +0100
+++ eom-1.16.1/debian/changelog	2017-06-03 16:05:48.000000000 +0200
@@ -1,3 +1,14 @@
+eom (1.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Fix EOM auto reload of externally modified files.
+      (Closes: #816914).
+    - Fix runtime warning.
+    - Fix memleak when loading SVG fails.
+    - GTK+3: force X11 backend.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Sat, 03 Jun 2017 16:05:48 +0200
+
 eom (1.16.0-2) unstable; urgency=medium
 
   * debian/control:
diff -Nru eom-1.16.0/NEWS eom-1.16.1/NEWS
--- eom-1.16.0/NEWS	2016-09-19 07:48:00.000000000 +0200
+++ eom-1.16.1/NEWS	2017-01-26 13:34:31.000000000 +0100
@@ -1,3 +1,11 @@
+eom 1.16.1
+==========
+
+ * Prefs dialog: fix runtime warning
+ * Fix auto-reload of externally modified image
+ * Fix memleak when loading SVG fails
+ * GTK+3: force X11 backend
+
 eom 1.16.0
 ==========
 
diff -Nru eom-1.16.0/src/eom-image.c eom-1.16.1/src/eom-image.c
--- eom-1.16.0/src/eom-image.c	2016-09-19 07:48:00.000000000 +0200
+++ eom-1.16.1/src/eom-image.c	2017-01-26 13:34:31.000000000 +0100
@@ -1050,7 +1050,10 @@
 	        }
 #ifdef HAVE_RSVG
 		if (eom_image_is_svg (img))
-			rsvg_handle_close (priv->svg, error);
+			/* Ignore the error if loading failed earlier
+			 * as the error will already be set in that case */
+			rsvg_handle_close (priv->svg,
+			                   (failed ? NULL : error));
 #endif
         }
 
diff -Nru eom-1.16.0/src/eom-list-store.c eom-1.16.1/src/eom-list-store.c
--- eom-1.16.0/src/eom-list-store.c	2016-09-19 07:48:00.000000000 +0200
+++ eom-1.16.1/src/eom-list-store.c	2017-01-26 13:34:31.000000000 +0100
@@ -392,7 +392,7 @@
 	EomImage *image;
 
 	switch (event) {
-	case G_FILE_MONITOR_EVENT_CHANGED:
+	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
 		file_info = g_file_query_info (file,
 					       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 					       0, NULL, NULL);
diff -Nru eom-1.16.0/src/eom-preferences-dialog.c eom-1.16.1/src/eom-preferences-dialog.c
--- eom-1.16.0/src/eom-preferences-dialog.c	2016-09-19 07:48:00.000000000 +0200
+++ eom-1.16.1/src/eom-preferences-dialog.c	2017-01-26 13:34:31.000000000 +0100
@@ -256,6 +256,7 @@
 	default:
 		// Log a warning and use EOM_TRANSP_BACKGROUND as fallback
 		g_warn_if_reached ();
+	case EOM_TRANSP_BACKGROUND:
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (background_radio), TRUE);
 		break;
 	}
diff -Nru eom-1.16.0/src/main.c eom-1.16.1/src/main.c
--- eom-1.16.0/src/main.c	2016-09-19 07:48:00.000000000 +0200
+++ eom-1.16.1/src/main.c	2017-01-26 13:34:31.000000000 +0100
@@ -203,6 +203,10 @@
 	gtk_rc_parse (EOM_DATA_DIR G_DIR_SEPARATOR_S "gtkrc");
 #endif
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gdk_set_allowed_backends ("x11");
+#endif
+
 	ctx = g_option_context_new (NULL);
 	g_option_context_add_main_entries (ctx, goption_options, PACKAGE);
 	/* Option groups are free'd together with the context