diff --git a/cinnamon.spec b/cinnamon.spec index e0a91a2..2a4b963 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -15,7 +15,7 @@ Name: cinnamon Version: 4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} @@ -31,6 +31,7 @@ Patch3: default_panal_launcher.patch Patch4: remove_crap_from_menu.patch Patch5: replace-metacity-with-openbox.patch Patch6: notification.patch +Patch7: %{url}/pull/8855.patch#/fix_cs_default.patch BuildRequires: gcc-c++ @@ -278,6 +279,9 @@ EOF %changelog +* Sat Sep 14 2019 Leigh Scott - 4.2.4-2 +- Fix cinnamon-settings default issue (rhbz#1752134) + * Wed Sep 04 2019 Leigh Scott - 4.2.4-1 - Update to 4.2.4 release diff --git a/fix_cs_default.patch b/fix_cs_default.patch new file mode 100644 index 0000000..db0bc98 --- /dev/null +++ b/fix_cs_default.patch @@ -0,0 +1,22 @@ +From e45b0d60685e7a0b7a94877d009fa2dc7773dd9a Mon Sep 17 00:00:00 2001 +From: Stephen Collins +Date: Sat, 14 Sep 2019 10:23:12 -0600 +Subject: [PATCH] cs_default.py: fix missing declaration causing crash when + desc not found + +--- + files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py +index 85a90d6c2b..5c23e4da9c 100755 +--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py ++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py +@@ -443,6 +443,7 @@ def acceptContentType(self, content_type): + return True + + def getDescription(self, content_type): ++ description = None + for d in other_defs: + if content_type == d[DEF_CONTENT_TYPE]: + s = d[DEF_LABEL]