Bug#876092: stretch-pu: package caja/1.16.6-1+deb9u1

[Mike Gabriel]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org at packages.debian.org
Usertags: pu

Hi,

upstream fixed an issue where high CPU load occurred during
desktop refreshing (pressing the F5 key). The attached .debdiff
fixes this issue for Debian stretch.

Please approve upload to stretch-pu. Thanks!

-- System Information:
Debian Release: 9.1
  APT prefers stable
  APT policy: (990, 'stable')
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), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru caja-1.16.6/debian/changelog caja-1.16.6/debian/changelog
--- caja-1.16.6/debian/changelog	2017-04-28 22:41:10.000000000 +0200
+++ caja-1.16.6/debian/changelog	2017-09-18 13:36:12.000000000 +0200
@@ -1,3 +1,12 @@
+caja (1.16.6-1+deb9u1) stretch; urgency=medium
+
+  [ Pablo Barciela ]
+  * debian/patches:
+    + Add 0001_fix-high-cpu-while-loading-background-image.patch. (Closes:
+      #875717).
+
+ -- Mike Gabriel <sunweaver at debian.org>  Mon, 18 Sep 2017 13:36:12 +0200
+
 caja (1.16.6-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #862155).
diff -Nru caja-1.16.6/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch caja-1.16.6/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch
--- caja-1.16.6/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch	1970-01-01 01:00:00.000000000 +0100
+++ caja-1.16.6/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch	2017-09-18 12:36:21.000000000 +0200
@@ -0,0 +1,29 @@
+From b9cf3667fa5563d52bffb9e3618aa41c7c908aa6 Mon Sep 17 00:00:00 2001
+From: Pablo Barciela <scow at riseup.net>
+Date: Fri, 1 Sep 2017 02:25:53 +0200
+Subject: [PATCH] Fix: high cpu while loading background image
+
+Fixes https://github.com/mate-desktop/caja/issues/606
+---
+ eel/eel-background.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/eel/eel-background.c b/eel/eel-background.c
+index a3392c2b..53e0a652 100644
+--- a/eel/eel-background.c
++++ b/eel/eel-background.c
+@@ -1062,6 +1062,14 @@ void
+ eel_bg_load_from_gsettings (EelBackground *self,
+ 			    GSettings     *settings)
+ {
++    char *keyfile = g_settings_get_string (settings, MATE_BG_KEY_PICTURE_FILENAME);
++
++    if (!g_file_test (keyfile, G_FILE_TEST_EXISTS) && (*keyfile != '\0'))
++    {
++        *keyfile = '\0';
++        g_settings_set_string (settings, MATE_BG_KEY_PICTURE_FILENAME, keyfile);
++    }
++
+     if (self->details->bg)
+         mate_bg_load_from_gsettings (self->details->bg,
+         			     settings);
diff -Nru caja-1.16.6/debian/patches/series caja-1.16.6/debian/patches/series
--- caja-1.16.6/debian/patches/series	2017-04-28 22:40:33.000000000 +0200
+++ caja-1.16.6/debian/patches/series	2017-09-18 13:35:49.000000000 +0200
@@ -1 +1,2 @@
 0000_do-not-show-property-browser-in-menu.patch
+0001_fix-high-cpu-while-loading-background-image.patch