From 7f83361fc496c2aa78a7dff7ca0abfb3c0b3956e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:35:26 +0000 Subject: import nautilus-3.22.3-5.el7 --- diff --git a/SOURCES/nautilus_785292.patch b/SOURCES/nautilus_785292.patch new file mode 100644 index 0000000..ae46870 --- /dev/null +++ b/SOURCES/nautilus_785292.patch @@ -0,0 +1,64 @@ +From 3651dd25ea23d7052d9f91672a3d586887e6277e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Fri, 6 Oct 2017 12:15:15 +0200 +Subject: [PATCH] Add missing xmp_init() to nautilus-desktop main() + +Also add missing xmp_terminate(). +--- + nautilus-desktop/main-desktop.c | 11 +++++++++++ + src/nautilus-main.c | 4 ++++ + 2 files changed, 15 insertions(+) + +diff --git a/nautilus-desktop/main-desktop.c b/nautilus-desktop/main-desktop.c +index 57abeae..c394763 100644 +--- a/nautilus-desktop/main-desktop.c ++++ b/nautilus-desktop/main-desktop.c +@@ -13,6 +13,10 @@ + #include + #include + ++#ifdef HAVE_EXEMPI ++#include ++#endif ++ + int + main (int argc, + char *argv[]) +@@ -29,6 +33,9 @@ main (int argc, + + gdk_set_allowed_backends ("x11"); + ++#ifdef HAVE_EXEMPI ++ xmp_init (); ++#endif + nautilus_register_resource (); + application = nautilus_desktop_application_new (); + +@@ -37,5 +44,9 @@ main (int argc, + + g_object_unref (application); + ++#ifdef HAVE_EXEMPI ++ xmp_terminate (); ++#endif ++ + return retval; + } +diff --git a/src/nautilus-main.c b/src/nautilus-main.c +index 1471e86..88d7ed2 100644 +--- a/src/nautilus-main.c ++++ b/src/nautilus-main.c +@@ -104,6 +104,10 @@ main (int argc, + + g_object_unref (application); + ++#ifdef HAVE_EXEMPI ++ xmp_terminate (); ++#endif ++ + eel_debug_shut_down (); + + return retval; +-- +2.13.6 + diff --git a/SPECS/nautilus.spec b/SPECS/nautilus.spec index 87138d6..f821402 100644 --- a/SPECS/nautilus.spec +++ b/SPECS/nautilus.spec @@ -8,7 +8,7 @@ Name: nautilus Version: 3.22.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: File manager for GNOME License: GPLv2+ @@ -19,6 +19,7 @@ Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{versio Patch0: 0001-general-remove-gnome-autoar.patch Patch1: 0001-translation-Add-Japanese.patch Patch2: 0001-mime-actions-use-file-metadata-for-trusting-desktop-.patch +Patch3: nautilus_785292.patch BuildRequires: pkgconfig(exempi-2.0) >= %{exempi_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -82,6 +83,7 @@ for developing nautilus extensions. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # For patch0 @@ -163,9 +165,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %doc %{_datadir}/gtk-doc/html/libnautilus-extension/ %changelog +* Thu Nov 02 2017 Carlos Soriano 3.22.3-5 +- Fix exempi not being initialized. Upstream bugzilla.gnome.org/785292 + Resolves: #1496713 + * Thu Nov 02 2017 Carlos Soriano 3.22.3-4 - Fix desktop files security issue (upstream bugzilla.gnome.org/777991) - Resolves: #1490949 + Resolves: #1490948 * Mon May 29 2017 Carlos Soriano 3.22.3-3 - Add Japanese translation