From 3db95a57ea97cda85d0527dbbf3a69a05bd701fa Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sat, 24 Mar 2018 14:11:52 -0400
Subject: [PATCH] update nautilus for 3.28

---
 .../nautilus/0001-find-libm-correctly.patch   | 25 +++++++++++++++++++
 .../0001-meson-find-libm-correctly.patch      | 25 -------------------
 ...{nautilus_3.26.0.bb => nautilus_3.28.0.bb} | 12 ++++-----
 3 files changed, 30 insertions(+), 32 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-meson-find-libm-correctly.patch
 rename meta-gnome/recipes-gnome/nautilus/{nautilus_3.26.0.bb => nautilus_3.28.0.bb} (85%)

diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch
new file mode 100644
index 0000000..bd6b3cd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-find-libm-correctly.patch
@@ -0,0 +1,25 @@
+From 1fc676b74ad3c95670496bcabed0aa2837fc3e8c Mon Sep 17 00:00:00 2001
+From: Bruce Leidl <bruce@subgraph.com>
+Date: Fri, 23 Mar 2018 21:20:39 -0400
+Subject: [PATCH] find libm correctly
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 340caa0..36bd4a1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -67,7 +67,7 @@ libgd = subproject(
+ )
+ libgd_dep = libgd.get_variable('libgd_dep')
+ 
+-libm = cc.find_library('libm')
++libm = cc.find_library('m')
+ 
+ gail = dependency('gail-3.0')
+ if get_option('extensions')
+-- 
+2.16.2
+
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-meson-find-libm-correctly.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-meson-find-libm-correctly.patch
deleted file mode 100644
index 1ffe738..0000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-meson-find-libm-correctly.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ac6e603cbb7578d5148fb0ec780252c290cd7dca Mon Sep 17 00:00:00 2001
-From: brl <bruce@subgraph.com>
-Date: Tue, 9 Jan 2018 13:24:29 -0500
-Subject: [PATCH] meson find libm correctly
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0816d74..62c6af1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,7 +53,7 @@ gio_unix = dependency ('gio-unix-2.0', version: glib_ver)
- gsettings_desktop_schemas = dependency ('gsettings-desktop-schemas',
-                                         version: schemas_ver)
- 
--libm = cc.find_library ('libm')
-+libm = cc.find_library ('m')
- 
- conf = configuration_data ()
- conf.set_quoted ('VERSION', meson.project_version ())
--- 
-2.14.3
-
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.26.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb
similarity index 85%
rename from meta-gnome/recipes-gnome/nautilus/nautilus_3.26.0.bb
rename to meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb
index 131157f..68ccbc0 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.26.0.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.28.0.bb
@@ -8,22 +8,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gobject-introspection gettext
 
-#SRC_URI = "https://download.gnome.org/sources/nautilus/3.26/nautilus-${PV}.tar.xz 
-
-SRC_URI += "file://0001-meson-find-libm-correctly.patch"
-SRC_URI[archive.md5sum] = "1b1d05e4d734e2e0710275849e83b85e"
-SRC_URI[archive.sha256sum] = "a02b30ef9033f6f92fbc5e29abaceeb58ce6a600ed9fa5a4697ba82901d07924"
+SRC_URI += "file://0001-find-libm-correctly.patch"
+SRC_URI[archive.md5sum] = "b929e5c132cdb6e3cbdf216967e7baf0"
+SRC_URI[archive.sha256sum] = "b60035352903d792553e5cb2624dcbad927dd6121594a1dfdb7860c5e53bf620"
 
 
 FILES_${PN} += "\
     ${datadir}/glib-2.0/schemas \
     ${datadir}/gnome-shell/search-providers/nautilus-search-provider.ini \
-    ${datadir}/appdata/org.gnome.Nautilus.appdata.xml \
+    ${datadir}/metainfo/org.gnome.Nautilus.appdata.xml \
     ${datadir}/icons/hicolor/ \
     ${datadir}/dbus-1/services \
 "
 
-DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker"
+DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker gexiv2"
 # This probably belongs in meson.bbclass
 #
 # 1) write out a wrapper script that can execute target binaries