diff --git a/srcpkgs/cinnamon/patches/6e7ea0640ddb97d54febfbb76ac0e5cd0c0349d4.patch b/srcpkgs/cinnamon/patches/6e7ea0640ddb97d54febfbb76ac0e5cd0c0349d4.patch deleted file mode 100644 index c6f8f559e7..0000000000 --- a/srcpkgs/cinnamon/patches/6e7ea0640ddb97d54febfbb76ac0e5cd0c0349d4.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6e7ea0640ddb97d54febfbb76ac0e5cd0c0349d4 Mon Sep 17 00:00:00 2001 -From: Stephen Collins -Date: Sat, 14 Sep 2019 10:47:29 -0600 -Subject: [PATCH] cs_default.py: fix missing declaration causing crash when - desc not found (#8855) - ---- - .../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 ---- files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py -+++ 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] diff --git a/srcpkgs/cinnamon/patches/cross-muffin.patch b/srcpkgs/cinnamon/patches/cross-muffin.patch new file mode 100644 index 0000000000..11f72ccff9 --- /dev/null +++ b/srcpkgs/cinnamon/patches/cross-muffin.patch @@ -0,0 +1,14 @@ +--- src/Makefile.am ++++ src/Makefile.am +@@ -227,11 +227,6 @@ + $(CINNAMON_LIBS) \ + libst-1.0.la \ + libtray.la \ +- $(libdir)/muffin/libmuffin-clutter-0.so \ +- $(libdir)/muffin/libmuffin-cogl-0.so \ +- $(libdir)/muffin/libmuffin-cogl-pango-0.so \ +- $(libdir)/muffin/libmuffin-cogl-path-0.so \ +- $(MUFFIN_LIBS) + $(NULL) + + libcinnamon_la_LDFLAGS = $(WARN_LDFLAGS) -avoid-version -L$(libdir)/muffin diff --git a/srcpkgs/cinnamon/patches/python3.8.patch b/srcpkgs/cinnamon/patches/python3.8.patch new file mode 100644 index 0000000000..4768cacb61 --- /dev/null +++ b/srcpkgs/cinnamon/patches/python3.8.patch @@ -0,0 +1,172 @@ +diff --git files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py +index f1a9b9a..6778299 100755 +--- files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py ++++ 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) + +diff --git files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py +index 12f506b..f04e227 100644 +--- files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py ++++ 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') +diff --git files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py +index e24bf7b..f531baa 100644 +--- files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py ++++ 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: +diff --git files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py +index a648973..8c9c2e5 100755 +--- files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py ++++ 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,5 @@ 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 +diff --git files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py +index c5338ab..f833c34 100755 +--- files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py ++++ files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py +@@ -118,7 +118,7 @@ class CinnamonSlideshow(dbus.service.Object): + 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 files: + file_list = file_list.extend(files) + enumerator.next_files_async(100, GLib.PRIORITY_LOW, None, on_next_file_complete, None) + else: diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 91888f46df..57877a6599 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,11 +1,12 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=4.2.4 -revision=3 +version=4.4.8 +revision=1 +build_helper=gir build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-compile-warnings=no --disable-gtk-doc" -hostmakedepends="automake libtool pkg-config gobject-introspection +hostmakedepends="automake libtool pkg-config gobject-introspection gettext gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc" makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel @@ -19,45 +20,40 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*} gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify - python3-tinycss" + python3-tinycss python3-pytz libtimezonemap" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd -nocross="gobject-introspection" +checksum=5bc7db4e519aed8b3b76d6b68abc02be966633005a92579071a77d23d33c8af4 pycompile_version="$py3_ver" pycompile_dirs=" - /usr/share/cinnamon/cinnamon-slideshow - /usr/share/cinnamon/cinnamon-settings-users - /usr/share/cinnamon/cinnamon-settings - /usr/share/cinnamon/cinnamon-screensaver-lock-dialog - /usr/share/cinnamon/cinnamon-menu-editor - /usr/share/cinnamon/cinnamon-looking-glass - /usr/share/cinnamon/cinnamon-json-makepot - /usr/share/cinnamon/cinnamon-desktop-editor" + usr/share/cinnamon/applets + usr/share/cinnamon/cinnamon-desktop-editor + usr/share/cinnamon/cinnamon-looking-glass + usr/share/cinnamon/cinnamon-menu-editor + usr/share/cinnamon/cinnamon-screensaver-lock-dialog + usr/share/cinnamon/cinnamon-settings + usr/share/cinnamon/cinnamon-settings-users + usr/share/cinnamon/cinnamon-settings + usr/share/cinnamon/cinnamon-slideshow + usr/share/cinnamon/desklets" pre_configure() { # Add polkit agent to required components - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session - - # Use pkexec instead of gksu - sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users + vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \ + -i files/cinnamon2d.session.in files/cinnamon.session.in # Check for the cc-panel path, not for the unneeded binary - sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings + vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead - sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ + vsed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py - # Fix selected background color in Cinnamon Settings for Adwaita theme - sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ - files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py - # Remove broken symlink rm -f files/etc/xdg/menus/cinnamon-applications-merged