Hello community,

here is the log from the commit of package gnome-desktop for openSUSE:Factory 
checked in at 2020-09-25 16:24:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-desktop (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-desktop.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-desktop"

Fri Sep 25 16:24:59 2020 rev:161 rq:836035 version:3.36.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-desktop/gnome-desktop.changes      
2020-08-15 21:16:56.431505537 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-desktop.new.4249/gnome-desktop.changes    
2020-09-25 16:27:59.315701929 +0200
@@ -1,0 +2,13 @@
+Wed Sep 16 20:16:37 UTC 2020 - Michael Gorse <[email protected]>
+
+- Add gnome-desktop-invalid-size-crash.patch: fix a crash caused
+  by a malformed background xml file (bsc#1176596
+  glgo#GNOME/gnome-desktop#169).
+
+-------------------------------------------------------------------
+Fri Sep 11 10:57:08 UTC 2020 - Bjørn Lie <[email protected]>
+
+- Update to version 3.36.6:
+  + No changes, version bump only.
+
+-------------------------------------------------------------------

Old:
----
  gnome-desktop-3.36.5.tar.xz

New:
----
  gnome-desktop-3.36.6.tar.xz
  gnome-desktop-invalid-size-crash.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-desktop.spec ++++++
--- /var/tmp/diff_new_pack.twgZxu/_old  2020-09-25 16:27:59.851702403 +0200
+++ /var/tmp/diff_new_pack.twgZxu/_new  2020-09-25 16:27:59.855702407 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           gnome-desktop
-Version:        3.36.5
+Version:        3.36.6
 Release:        0
 Summary:        The GNOME Desktop API Library
 License:        LGPL-2.1-or-later
@@ -28,6 +28,8 @@
 
 # PATCH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch 
bnc#1029083 boo#1056289 [email protected] -- Switch new user's default input 
engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus 
input frame-work condition.
 Patch1:         gnome-desktop-switch-Japanese-default-input-to-mozc.patch
+# PATCH-FIX-UPSTREAM gnome-desktop-invalid-size-crash.patch bsc#1176596 
[email protected] -- fix a crash caused by a mal-formed background xml file.
+Patch2:         gnome-desktop-invalid-size-crash.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel

++++++ gnome-desktop-3.36.5.tar.xz -> gnome-desktop-3.36.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gnome-desktop-3.36.5/NEWS 
new/gnome-desktop-3.36.6/NEWS
--- old/gnome-desktop-3.36.5/NEWS       2020-08-10 21:33:37.858517600 +0200
+++ new/gnome-desktop-3.36.6/NEWS       2020-09-09 12:13:03.819116000 +0200
@@ -1,4 +1,10 @@
 ===============
+Version 3.36.6
+===============
+
+- No changes
+
+===============
 Version 3.36.5
 ===============
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/gnome-desktop-3.36.5/libgnome-desktop/gnome-desktop-thumbnail-script.c 
new/gnome-desktop-3.36.6/libgnome-desktop/gnome-desktop-thumbnail-script.c
--- old/gnome-desktop-3.36.5/libgnome-desktop/gnome-desktop-thumbnail-script.c  
2020-08-10 21:33:37.876517800 +0200
+++ new/gnome-desktop-3.36.6/libgnome-desktop/gnome-desktop-thumbnail-script.c  
2020-09-09 12:13:03.840116300 +0200
@@ -556,6 +556,18 @@
   if (!g_str_has_prefix (FONTCONFIG_CACHE_PATH, "/usr/"))
     add_args (array, "--ro-bind-try", FONTCONFIG_CACHE_PATH, 
FONTCONFIG_CACHE_PATH, NULL);
 
+  /*
+   * Used in various distributions. On those distributions, /usr is not
+   * complete without it: some files in /usr might be a symbolic link
+   * like /usr/bin/composite -> /etc/alternatives/composite ->
+   * /usr/bin/composite-im6.q16.
+   *
+   * https://manpages.debian.org/stable/dpkg/update-alternatives.1.en.html
+   * https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/
+   * https://en.opensuse.org/openSUSE:Packaging_Multiple_Version_guidelines
+   */
+  add_args (array, "--ro-bind-try", "/etc/alternatives", "/etc/alternatives", 
NULL);
+
   add_args (array,
            "--proc", "/proc",
            "--dev", "/dev",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gnome-desktop-3.36.5/meson.build 
new/gnome-desktop-3.36.6/meson.build
--- old/gnome-desktop-3.36.5/meson.build        2020-08-10 21:33:37.879517800 
+0200
+++ new/gnome-desktop-3.36.6/meson.build        2020-09-09 12:13:03.843116300 
+0200
@@ -1,6 +1,6 @@
 project('gnome-desktop', 'c',
   meson_version: '>= 0.49.0',
-  version: '3.36.5',
+  version: '3.36.6',
   license: ['GPL2+', 'LGPL2+']
 )
 
@@ -14,7 +14,7 @@
 # to 0. When bumping the second version, set the third one to zero.
 #
 # A lot easier than libtool, right?
-libversion = '19.0.5'
+libversion = '19.0.6'
 soversion = libversion.split('.')[0]
 
 gdk_pixbuf_req = '>= 2.36.5'

++++++ gnome-desktop-invalid-size-crash.patch ++++++
>From d35c6e0e41ec8c0426d1317b9f28f485b7b4530d Mon Sep 17 00:00:00 2001
From: Mike Gorse <[email protected]>
Date: Wed, 16 Sep 2020 15:02:30 -0500
Subject: [PATCH] gnome_bg_slide_show_get_current_slide: add NULL check

Ensure that a file is present. Guards against a crash in case of a
malformed xml file.

    Resolves: https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/169
---
 libgnome-desktop/gnome-bg-slide-show.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libgnome-desktop/gnome-bg-slide-show.c 
b/libgnome-desktop/gnome-bg-slide-show.c
index cad3cb6c..760ed566 100644
--- a/libgnome-desktop/gnome-bg-slide-show.c
+++ b/libgnome-desktop/gnome-bg-slide-show.c
@@ -543,7 +543,7 @@ gnome_bg_slide_show_get_current_slide (GnomeBGSlideShow  
*self,
                         if (is_fixed)
                             *is_fixed = slide->fixed;
 
-                        if (file1)
+                        if (file1 && slide->file1)
                             *file1 = find_best_size (slide->file1, width, 
height);
 
                         if (file2 && slide->file2)
-- 
2.28.0


Reply via email to