[oe] [PATCH 08/13] ristretto: upgrade 0.8.4 -> 0.10.0

[Andreas Müller]

* GTK3 port
* overall recipe cleanup

Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
 ...001-Fix-build-after-update-of-xfconf.patch | 40 -------------------
 ...ristretto_0.8.4.bb => ristretto_0.10.0.bb} | 12 +++---
 2 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch
 rename meta-xfce/recipes-apps/ristretto/{ristretto_0.8.4.bb => ristretto_0.10.0.bb} (33%)

diff --git a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch
deleted file mode 100644
index 5cdc8c728..000000000
--- a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2b6bdb860ef53975c7e866f393b61d253c00754d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
-Date: Mon, 22 Jan 2018 15:52:09 +0100
-Subject: [PATCH] Fix build after update of xfconf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-xfconf stopped using dbus-glib so required flags must be included here
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
----
- src/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 36a31dc..3dd56bc 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,6 +30,7 @@ ristretto_CFLAGS = \
- 	$(GIO_UNIX_CFLAGS) \
- 	$(LIBEXIF_CFLAGS) \
- 	$(XFCONF_CFLAGS) \
-+	$(DBUS_GLIB_CFLAGS) \
- 	$(EXO_CFLAGS) \
- 	$(CAIRO_CFLAGS) \
- 	$(LIBXFCE4UTIL_CFLAGS) \
-@@ -48,6 +49,7 @@ ristretto_LDADD = \
- 	$(GIO_UNIX_LIBS) \
- 	$(LIBEXIF_LIBS) \
- 	$(XFCONF_LIBS) \
-+	$(DBUS_GLIB_LIBS) \
- 	$(EXO_LIBS) \
- 	$(CAIRO_LIBS) \
- 	$(LIBXFCE4UTIL_LIBS) \
--- 
-2.14.3
-
diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb
similarity index 33%
rename from meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb
rename to meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb
index 416ac2adc..9c5bb12e8 100644
--- a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb
+++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb
@@ -1,16 +1,16 @@
 SUMMARY = "Tiny image-viewer"
-HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto"
+HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start"
 SECTION = "x11/application"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b"
-DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo file"
+
+DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file"
 
 inherit xfce-app
 
 RRECOMMENDS_${PN} += "tumbler"
 
-SRC_URI[md5sum] = "0142c8b9c492cf447e563b00c6204359"
-SRC_URI[sha256sum] = "3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e5b00cea2"
-SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch"
+SRC_URI[md5sum] = "4249e14fba78728481d89ce61a8771fc"
+SRC_URI[sha256sum] = "16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769"
 
-FILES_${PN} += "${datadir}/appdata"
+FILES_${PN} += "${datadir}/metainfo"
-- 
2.21.0