ubiquity: fix ubiquity-dm erroring out due gsettings

helpers/DATA/ubiquity/patch_changes/005-prevent_ubiquity-dm_error_due_missing_gsettings.patch

@@ -0,0 +1,21 @@
+# Present in first alpha Ecne ISO.
+
+diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm
+index 67ffdb27..ea14e068 100755
+--- a/bin/ubiquity-dm
++++ b/bin/ubiquity-dm
+@@ -505,9 +505,11 @@ EndSection
+                     gsettings_keys.append(
+                         ('org.gnome.settings-daemon.plugins.background',
+                          'active', 'false'))
+-                    gsettings_keys.remove(
+-                        ('org.gnome.desktop.wm.preferences', 'num-workspaces',
+-                         '1'))
++                    # Prevent error out if settings aren't there
++                    key = ('org.gnome.desktop.wm.preferences', 'num-workspaces', '1')
++                    if key in gsettings_keys:
++                        gsettings_keys.remove(key)
++
+                     os.environ['XDG_SESSION_TYPE'] = 'x11'
+ 
+                 if (osextras.find_on_path('gnome-shell')):

helpers/make-ubiquity

@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 #    Copyright (C) 2011-2025  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C)      2025  Luis Guzmán <ark@switnet.org>
 #    Copyright (C)      2019  Mason Hock <mason@masonhock.com>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -18,24 +19,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=38
+VERSION=39
 
 . ./config
 
 Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist"
 
-# Avoid the need for a custom cdrom:// repo
+## Apply patches upfront
-patch_p1 $DATA/grub-installer.patch
+# Avoid the need for a custom cdrom:// repo - 001-grub-installer.patch
 truncate -s 0 d-i/source/apt-setup/generators/40cdrom
-
+# Disable confirmation popups, as they are innacurate and buggy - 002-no_confrirmation_when_crypto.patch
-# Disable confirmation popups, as they are innacurate and buggy
+# Fix some gtk labels for Orca - 003-a11y.patch
-patch_p1 $DATA/no_confrirmation_when_crypto.patch
+# Point ubiquity crash to trisquel's forge. - 004-crash_report_point_to_trisquel_forge.patch
-
+# Prevent ubiquity-dm to error out due missing settings - 005-prevent_ubiquity-dm_error_due_missing_gsettings.patch
-# Fix some gtk labels for Orca
+apply_patch_changes
-patch_p1 $DATA/a11y.patch
-
-# Point ubiquity crash to trisquel's forge.
-patch_p1 $DATA/crash_report_point_to_trisquel_forge.patch
 
 # Remove test_timezone to prevent error out future builds on different daylight time.
 rm tests/test_timezone.py