Package: release.debian.org Severity: normal Tags: bullseye User: release.debian.org@packages.debian.org Usertags: pu [ Reason ]When an user attempts to add an online account that requires logging in through
a web component, such as, Google, Facebook, Microsoft and/or Foursquare, cinnamon-settings crashes and quits without any further prompt or message. [ Impact ]As reported in #1001536 for now is not possible add online account for many services in Bullseye
[ Tests ]With the fix add online account that require login account that before was impossible set it correctly and works, I tried the google one on my test, also the user that reported it have tested and reported that with the fix is working: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001536#36 I don't saw regression, other user that tested it also didn't reported regression and I don't saw regression upstream about it.
[ Risks ]The patch is small and already tested for long time upstream and other distros who have been using cinnamon 5.2.1 just released, even more than 2 months; on debian has instead delayed a lot due to inability/difficulty to upload packages for a period, the version including the fix has been in experimental since 2021-12-31 and unstable since 2022-01-27
[ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Changes ] Changes to /usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py [ Other info ] n/a
diff -Nru cinnamon-4.8.6/debian/changelog cinnamon-4.8.6/debian/changelog
--- cinnamon-4.8.6/debian/changelog 2021-02-15 01:12:15.000000000 +0100
+++ cinnamon-4.8.6/debian/changelog 2022-02-05 13:16:03.000000000 +0100
@@ -1,3 +1,11 @@
+cinnamon (4.8.6-2+deb11u1) bullseye; urgency=medium
+
+ * d/patches: add upstream patch that solves a crash adding
+ an online account with login on web component (Closes: #1001536)
+ * change vcs-git, CI and gbp to bullseye
+
+ -- Fabio Fantoni <fantonifabio@tiscali.it> Sat, 05 Feb 2022 13:16:03 +0100
+
cinnamon (4.8.6-2) unstable; urgency=medium
[ Fabio Fantoni ]
diff -Nru cinnamon-4.8.6/debian/control cinnamon-4.8.6/debian/control
--- cinnamon-4.8.6/debian/control 2021-02-15 01:12:15.000000000 +0100
+++ cinnamon-4.8.6/debian/control 2022-02-05 13:16:03.000000000 +0100
@@ -40,7 +40,7 @@
Standards-Version: 4.5.0
Homepage: http://cinnamon.linuxmint.com
Vcs-Browser: https://salsa.debian.org/cinnamon-team/cinnamon
-Vcs-Git: https://salsa.debian.org/cinnamon-team/cinnamon.git
+Vcs-Git: https://salsa.debian.org/cinnamon-team/cinnamon.git -b bullseye
Package: cinnamon
Architecture: any
diff -Nru cinnamon-4.8.6/debian/gbp.conf cinnamon-4.8.6/debian/gbp.conf
--- cinnamon-4.8.6/debian/gbp.conf 2021-02-15 01:12:15.000000000 +0100
+++ cinnamon-4.8.6/debian/gbp.conf 2022-02-05 13:16:03.000000000 +0100
@@ -1,2 +1,3 @@
[DEFAULT]
pristine-tar = True
+debian-branch = bullseye
diff -Nru cinnamon-4.8.6/debian/patches/fix-crash-online-account.patch cinnamon-4.8.6/debian/patches/fix-crash-online-account.patch
--- cinnamon-4.8.6/debian/patches/fix-crash-online-account.patch 1970-01-01 01:00:00.000000000 +0100
+++ cinnamon-4.8.6/debian/patches/fix-crash-online-account.patch 2022-02-05 13:16:03.000000000 +0100
@@ -0,0 +1,77 @@
+Author: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Nov 2021 21:33:02 -0500
+Description: [PATCH] Make cinnamon-settings a minimal GApplication to accomodate
+ webkit.
+
+GApplication is required for xdg-desktop-portal access in the WebKit sandbox.
+
+https://forums.fedoraforum.org/showthread.php?327343-Gnome-Online-Accounts-Unusable-In-F35-Cinnamon-GUI-Consistently-Crashes-Vanishes
+
+Origin: https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130
+---
+ .../cinnamon-settings/cinnamon-settings.py | 21 +++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+--- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+@@ -163,7 +163,7 @@
+ os.utime(fname, times)
+
+
+-class MainWindow:
++class MainWindow(Gio.Application):
+ # Change pages
+ def side_view_nav(self, side_view, path, cat):
+ selected_items = side_view.get_selected_items()
+@@ -257,6 +257,9 @@
+
+ # Create the UI
+ def __init__(self):
++ Gio.Application.__init__(self,
++ application_id="org.cinnamon.Settings_%d" % os.getpid(),
++ flags=Gio.ApplicationFlags.NON_UNIQUE | Gio.ApplicationFlags.HANDLES_OPEN)
+ self.builder = Gtk.Builder()
+ self.builder.set_translation_domain('cinnamon') # let it translate!
+ self.builder.add_from_file(config.currentPath + "/cinnamon-settings.ui")
+@@ -294,7 +297,7 @@
+ self.search_entry.connect("changed", self.onSearchTextChanged)
+ self.search_entry.connect("icon-press", self.onClearSearchBox)
+
+- self.window.connect("destroy", self.quit)
++ self.window.connect("destroy", self._quit)
+
+ self.builder.connect_signals(self)
+ self.unsortedSidePages = []
+@@ -445,6 +448,13 @@
+
+ self.window.show()
+
++ # If there are no arguments, do_active() is called, otherwise do_open().
++ def do_activate(self):
++ self.hold()
++
++ def do_open(self, files, n_files, hint):
++ self.hold()
++
+ def on_keypress(self, widget, event):
+ grab = False
+ device = Gtk.get_current_event_device()
+@@ -712,10 +722,9 @@
+
+ self.current_sidepage = None
+
+- def quit(self, *args):
++ def _quit(self, *args):
+ self.window.destroy()
+- Gtk.main_quit()
+-
++ self.quit()
+
+ if __name__ == "__main__":
+ setproctitle("cinnamon-settings")
+@@ -730,4 +739,4 @@
+
+ window = MainWindow()
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+- Gtk.main()
++ window.run(sys.argv)
diff -Nru cinnamon-4.8.6/debian/patches/series cinnamon-4.8.6/debian/patches/series
--- cinnamon-4.8.6/debian/patches/series 2021-02-15 01:12:15.000000000 +0100
+++ cinnamon-4.8.6/debian/patches/series 2022-02-05 13:16:03.000000000 +0100
@@ -3,3 +3,4 @@
new-iso-flags-folder.patch
always-add-default-theme.patch
GWL-fixes.patch
+fix-crash-online-account.patch
diff -Nru cinnamon-4.8.6/debian/salsa-ci.yml cinnamon-4.8.6/debian/salsa-ci.yml
--- cinnamon-4.8.6/debian/salsa-ci.yml 2021-02-15 01:12:15.000000000 +0100
+++ cinnamon-4.8.6/debian/salsa-ci.yml 2022-02-05 13:16:03.000000000 +0100
@@ -5,3 +5,4 @@
variables:
SALSA_CI_DISABLE_MISSING_BREAKS: 0
SALSA_CI_DISABLE_RC_BUGS: 0
+ RELEASE: 'bullseye'
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature