Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2020-04-02 17:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Thu Apr 2 17:44:47 2020 rev:40 rq:790821 version:4.4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2020-03-17 13:11:17.877852070 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new.3248/cinnamon.changes 2020-04-02 17:45:11.713517739 +0200 @@ -1,0 +2,15 @@ +Thu Apr 2 05:05:02 UTC 2020 - Marguerite Su <[email protected]> + +- fix an error in cinnamon-settings-4.4.8-tinycss2.patch, + now "cinnamon-settings -> themes" can start (boo#1166981) +- add cinnamon-4.4.8-python3-platform.linux_distribution.patch + * python3.7 deprecates "platform.linux_distribution", use + "distro.linux_distribution" instead + +------------------------------------------------------------------- +Thu Apr 2 04:36:48 UTC 2020 - Marguerite Su <[email protected]> + +- add cinnamon-4.4.8-python3-is-with-literal.patch + * fix 'using "is" with a literal warning + +------------------------------------------------------------------- New: ---- cinnamon-4.4.8-python3-is-with-literal.patch cinnamon-4.4.8-python3-platform.linux_distribution.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.UH1etV/_old 2020-04-02 17:45:12.357518517 +0200 +++ /var/tmp/diff_new_pack.UH1etV/_new 2020-04-02 17:45:12.365518527 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon # -# Copyright (c) 2020 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,6 +43,10 @@ Patch8: %{name}-fix-typelib-false-positive.patch # PATCH-FIX-UPSTREAM cinnamon-settings-4.4.8-tinycss2.patch [email protected] - port deprecated tinycss to tinycss2 Patch9: %{name}-settings-4.4.8-tinycss2.patch +# PATCH-FIX-UPSTREAM cinnamon-4.4.8-python3-is-with-literal.patch +Patch10: %{name}-4.4.8-python3-is-with-literal.patch +# PATCH-FIX-UPSTREAM cinnamon-4.4.8-python3-platform.linux_distribution.patch +Patch11: %{name}-4.4.8-python3-platform.linux_distribution.patch BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -92,6 +96,7 @@ Requires: polkit-gnome Requires: python3-Pillow Requires: python3-cairo +Requires: python3-distro Requires: python3-gobject Requires: python3-gobject-Gdk Requires: python3-gobject-cairo @@ -189,6 +194,8 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 cp -a %{SOURCE1} . for file in files%{_datadir}/%{name}/%{name}-settings/bin/*.py files%{_datadir}/%{name}/%{name}-looking-glass/*.py \ ++++++ cinnamon-4.4.8-python3-is-with-literal.patch ++++++ Index: cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py =================================================================== --- cinnamon-4.4.8.orig/files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py +++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py @@ -194,7 +194,7 @@ class LauncherEditor(ItemEditor): def resync_validity(self, *args): name_text = self.builder.get_object('name-entry').get_text().strip() exec_text = self.builder.get_object('exec-entry').get_text().strip() - name_valid = name_text is not "" + name_valid = name_text != "" exec_valid = self.validate_exec_line(exec_text) self.sync_widgets(name_valid, exec_valid) @@ -236,7 +236,7 @@ class DirectoryEditor(ItemEditor): def resync_validity(self, *args): name_text = self.builder.get_object('name-entry').get_text().strip() - valid = (name_text is not "") + valid = (name_text != "") self.builder.get_object('ok').set_sensitive(valid) def load(self): @@ -281,7 +281,7 @@ class CinnamonLauncherEditor(ItemEditor) def resync_validity(self, *args): name_text = self.builder.get_object('name-entry').get_text().strip() exec_text = self.builder.get_object('exec-entry').get_text().strip() - name_valid = name_text is not "" + name_valid = name_text != "" exec_valid = self.validate_exec_line(exec_text) self.sync_widgets(name_valid, exec_valid) Index: cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py =================================================================== --- cinnamon-4.4.8.orig/files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py +++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py @@ -339,13 +339,13 @@ class TimeChooserButton(Gtk.Button): def __init__(self, follow_current=False, time=None, show_seconds='default'): super(TimeChooserButton, self).__init__() - if show_seconds is 'default': + if show_seconds == 'default': self.show_seconds_override_default = False else: self.show_seconds_override_default = True - if show_seconds is 'true': + if show_seconds == 'true': self.show_seconds = True - elif show_seconds is 'false': + elif show_seconds == 'false': self.show_seconds = False else: raise ValueError('Invalid argument: show_seconds must be default, true, or false') Index: cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py =================================================================== --- cinnamon-4.4.8.orig/files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py +++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py @@ -239,7 +239,7 @@ class JSONSettingsRevealer(Gtk.Revealer) break if self.key is None: - if key[:1] is '!': + if key[:1] == '!': self.invert = True self.key = key[1:] else: Index: cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py =================================================================== --- cinnamon-4.4.8.orig/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py +++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py @@ -419,7 +419,7 @@ class Module: categories, iter = tree.get_selection().get_selected() if iter: category = categories[iter][2] - if category.int_name is not "custom": + if category.int_name != "custom": for keybinding in category.keybindings: self.kb_store.append((keybinding.label, keybinding)) else: @@ -428,7 +428,7 @@ class Module: def loadCustoms(self): for category in self.main_store: - if category.int_name is "custom": + if category.int_name == "custom": category.clear() parent = Gio.Settings.new(CUSTOM_KEYS_PARENT_SCHEMA) @@ -443,7 +443,7 @@ class Module: schema.get_strv("binding")) self.kb_store.append((custom_kb.label, custom_kb)) for category in self.main_store: - if category.int_name is "custom": + if category.int_name == "custom": category.add(custom_kb) def onKeyBindingChanged(self, tree): @@ -453,7 +453,7 @@ class Module: if iter: keybinding = keybindings[iter][1] for entry in keybinding.entries: - if entry is not "_invalid_": + if entry != "_invalid_": self.entry_store.append((entry,)) self.remove_custom_button.set_property('sensitive', isinstance(keybinding, CustomKeyBinding)) @@ -536,7 +536,7 @@ class Module: new_schema.set_strv("binding", ()) i = 0 for cat in self.cat_store: - if cat[2].int_name is "custom": + if cat[2].int_name == "custom": self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False) i += 1 i = 0 @@ -574,7 +574,7 @@ class Module: i = 0 for cat in self.cat_store: - if cat[2].int_name is "custom": + if cat[2].int_name == "custom": self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False) i += 1 @@ -600,7 +600,7 @@ class Module: i = 0 for cat in self.cat_store: - if cat[2].int_name is "custom": + if cat[2].int_name == "custom": self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False) i += 1 i = 0 @@ -691,7 +691,7 @@ class KeyBinding(): def writeSettings(self): array = [] for entry in self.entries: - if entry is not "": + if entry != "": array.append(entry) self.settings.set_strv(self.key, array) @@ -731,7 +731,7 @@ class CustomKeyBinding(): array = [] for entry in self.entries: - if entry is not "": + if entry != "": array.append(entry) settings.set_strv("binding", array) @@ -777,6 +777,6 @@ class AddCustomDialog(Gtk.Dialog): self.command_entry.set_text(path) def onEntriesChanged(self, widget): - ok_enabled = self.name_entry.get_text().strip() is not "" and self.command_entry.get_text().strip() is not "" + ok_enabled = self.name_entry.get_text().strip() != "" and self.command_entry.get_text().strip() != "" self.set_response_sensitive(Gtk.ResponseType.OK, ok_enabled) - \ No newline at end of file + Index: cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py =================================================================== --- cinnamon-4.4.8.orig/files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py +++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py @@ -118,7 +118,7 @@ class CinnamonSlideshow(dbus.service.Obj def on_next_file_complete(obj, res, user_data=all_files): files = obj.next_files_finish(res) file_list = all_files - if len(files) is not 0: + if len(files) != 0: file_list = file_list.extend(files) enumerator.next_files_async(100, GLib.PRIORITY_LOW, None, on_next_file_complete, None) else: ++++++ cinnamon-4.4.8-python3-platform.linux_distribution.patch ++++++ Index: cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py =================================================================== --- cinnamon-4.4.8.orig/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py +++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py @@ -6,6 +6,7 @@ import shlex import os import re import threading +import distro from SettingsWidgets import SidePage from xapp.GSettingsWidgets import * @@ -105,7 +106,7 @@ def createSystemInfos(): title = ' '.join(contents[:2]) or "Manjaro Linux" infos.append((_("Operating System"), title)) else: - s = '%s (%s)' % (' '.join(platform.linux_distribution()), arch) + s = '%s (%s)' % (' '.join(distro.linux_distribution()), arch) # Normalize spacing in distribution name s = re.sub('\s{2,}', ' ', s) infos.append((_("Operating System"), s)) ++++++ cinnamon-settings-4.4.8-tinycss2.patch ++++++ --- /var/tmp/diff_new_pack.UH1etV/_old 2020-04-02 17:45:12.413518585 +0200 +++ /var/tmp/diff_new_pack.UH1etV/_new 2020-04-02 17:45:12.417518590 +0200 @@ -54,7 +54,7 @@ self._contents = content_bytes.decode() - self.stylesheet = self.parser.parse_stylesheet(self._contents) + stylesheet = tinycss2.parse_stylesheet(self._contents) -+ for rs in stylesheet[0]: ++ for rs in stylesheet: + if isinstance(rs, tinycss2.ast.ParseError): + continue + rules.append(rs)
