From 1969109805d5dd07c5173589fd03945cfdfc587311f0fa8cda9df212e7d44c4a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 14 Sep 2020 13:35:11 +0000 Subject: [PATCH 1/2] Accepting request 833751 from home:iznogood New stable rel OBS-URL: https://build.opensuse.org/request/show/833751 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=298 --- gnome-desktop-3.36.5.tar.xz | 3 --- gnome-desktop-3.36.6.tar.xz | 3 +++ gnome-desktop.changes | 6 ++++++ gnome-desktop.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 gnome-desktop-3.36.5.tar.xz create mode 100644 gnome-desktop-3.36.6.tar.xz diff --git a/gnome-desktop-3.36.5.tar.xz b/gnome-desktop-3.36.5.tar.xz deleted file mode 100644 index fc518b5..0000000 --- a/gnome-desktop-3.36.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eea1242994109fa3f05793963ee25c3df23bc84b0f0b81f03ec3c294c27ab753 -size 738956 diff --git a/gnome-desktop-3.36.6.tar.xz b/gnome-desktop-3.36.6.tar.xz new file mode 100644 index 0000000..a9f543e --- /dev/null +++ b/gnome-desktop-3.36.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d23c76947c781f447fb39538dec509408b161b291a75a4ce1c14c2b3d33344f6 +size 739160 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 162155f..5a949dd 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 11 10:57:08 UTC 2020 - Bjørn Lie + +- Update to version 3.36.6: + + No changes, version bump only. + ------------------------------------------------------------------- Mon Aug 10 19:57:31 UTC 2020 - Bjørn Lie diff --git a/gnome-desktop.spec b/gnome-desktop.spec index cd87268..4aa3d77 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -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 From b41cd7b7c8b9eff7c7de590372993e0933ccb8c390e056af125ec12cdffcd810 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Sep 2020 09:02:38 +0000 Subject: [PATCH 2/2] Accepting request 834993 from home:mgorse:branches:GNOME:Factory - Add gnome-desktop-invalid-size-crash.patch: fix a crash caused by a malformed background xml file (bsc#1176596 glgo#GNOME/gnome-desktop#169). OBS-URL: https://build.opensuse.org/request/show/834993 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=299 --- gnome-desktop-invalid-size-crash.patch | 29 ++++++++++++++++++++++++++ gnome-desktop.changes | 7 +++++++ gnome-desktop.spec | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 gnome-desktop-invalid-size-crash.patch diff --git a/gnome-desktop-invalid-size-crash.patch b/gnome-desktop-invalid-size-crash.patch new file mode 100644 index 0000000..93c53f5 --- /dev/null +++ b/gnome-desktop-invalid-size-crash.patch @@ -0,0 +1,29 @@ +From d35c6e0e41ec8c0426d1317b9f28f485b7b4530d Mon Sep 17 00:00:00 2001 +From: Mike Gorse +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 + diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 5a949dd..c3bbd7a 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 16 20:16:37 UTC 2020 - Michael Gorse + +- 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 diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 4aa3d77..37b4086 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -28,6 +28,8 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- 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 mgorse@suse.com -- fix a crash caused by a mal-formed background xml file. +Patch2: gnome-desktop-invalid-size-crash.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel