From e9172f3598e6cca5eab23d3ed878f0dd2dd74da9 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sat, 31 May 2025 21:34:56 -0600 Subject: [PATCH] ubiquity: fix ubiquity-dm erroring out due gsettings --- .../001-grub-installer.patch} | 0 .../002-no_confrirmation_when_crypto.patch} | 0 .../003-a11y.patch} | 0 ...rash_report_point_to_trisquel_forge.patch} | 0 ...quity-dm_error_due_missing_gsettings.patch | 21 +++++++++++++++++++ helpers/make-ubiquity | 21 ++++++++----------- 6 files changed, 30 insertions(+), 12 deletions(-) rename helpers/DATA/ubiquity/{grub-installer.patch => patch_changes/001-grub-installer.patch} (100%) rename helpers/DATA/ubiquity/{no_confrirmation_when_crypto.patch => patch_changes/002-no_confrirmation_when_crypto.patch} (100%) rename helpers/DATA/ubiquity/{a11y.patch => patch_changes/003-a11y.patch} (100%) rename helpers/DATA/ubiquity/{crash_report_point_to_trisquel_forge.patch => patch_changes/004-crash_report_point_to_trisquel_forge.patch} (100%) create mode 100644 helpers/DATA/ubiquity/patch_changes/005-prevent_ubiquity-dm_error_due_missing_gsettings.patch diff --git a/helpers/DATA/ubiquity/grub-installer.patch b/helpers/DATA/ubiquity/patch_changes/001-grub-installer.patch similarity index 100% rename from helpers/DATA/ubiquity/grub-installer.patch rename to helpers/DATA/ubiquity/patch_changes/001-grub-installer.patch diff --git a/helpers/DATA/ubiquity/no_confrirmation_when_crypto.patch b/helpers/DATA/ubiquity/patch_changes/002-no_confrirmation_when_crypto.patch similarity index 100% rename from helpers/DATA/ubiquity/no_confrirmation_when_crypto.patch rename to helpers/DATA/ubiquity/patch_changes/002-no_confrirmation_when_crypto.patch diff --git a/helpers/DATA/ubiquity/a11y.patch b/helpers/DATA/ubiquity/patch_changes/003-a11y.patch similarity index 100% rename from helpers/DATA/ubiquity/a11y.patch rename to helpers/DATA/ubiquity/patch_changes/003-a11y.patch diff --git a/helpers/DATA/ubiquity/crash_report_point_to_trisquel_forge.patch b/helpers/DATA/ubiquity/patch_changes/004-crash_report_point_to_trisquel_forge.patch similarity index 100% rename from helpers/DATA/ubiquity/crash_report_point_to_trisquel_forge.patch rename to helpers/DATA/ubiquity/patch_changes/004-crash_report_point_to_trisquel_forge.patch diff --git a/helpers/DATA/ubiquity/patch_changes/005-prevent_ubiquity-dm_error_due_missing_gsettings.patch b/helpers/DATA/ubiquity/patch_changes/005-prevent_ubiquity-dm_error_due_missing_gsettings.patch new file mode 100644 index 0000000..a39d8b3 --- /dev/null +++ b/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')): diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity index b384d7e..f2dac7e 100644 --- a/helpers/make-ubiquity +++ b/helpers/make-ubiquity @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2011-2025 Ruben Rodriguez +# Copyright (C) 2025 Luis Guzmán # Copyright (C) 2019 Mason Hock # # 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 -patch_p1 $DATA/grub-installer.patch +## Apply patches upfront +# 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 -patch_p1 $DATA/no_confrirmation_when_crypto.patch - -# Fix some gtk labels for Orca -patch_p1 $DATA/a11y.patch - -# Point ubiquity crash to trisquel's forge. -patch_p1 $DATA/crash_report_point_to_trisquel_forge.patch +# Disable confirmation popups, as they are innacurate and buggy - 002-no_confrirmation_when_crypto.patch +# Fix some gtk labels for Orca - 003-a11y.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 +apply_patch_changes # Remove test_timezone to prevent error out future builds on different daylight time. rm tests/test_timezone.py