diff --git a/profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/.calculate_directory new file mode 100644 index 000000000..615bc8bdf --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/use_elogind.patch b/profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/use_elogind.patch new file mode 100644 index 000000000..f0a21d3aa --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/use_elogind.patch @@ -0,0 +1,31 @@ +# Calculate format=diff +diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c +index 5a83072..4fedfeb 100644 +--- a/plugins/common/csd-power-helper.c ++++ b/plugins/common/csd-power-helper.c +@@ -32,8 +32,6 @@ + #define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" + #define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" + +-#ifdef HAVE_LOGIND +- + static gboolean + use_logind (void) + { +@@ -49,16 +47,6 @@ + return should_use_logind; + } + +-#else /* HAVE_LOGIND */ +- +-static gboolean +-use_logind (void) +-{ +- return FALSE; +-} +- +-#endif /* HAVE_LOGIND */ +- + static void + logind_stop (void) + { diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200805-rebuild_cinnamon-settings-daemon b/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200805-rebuild_cinnamon-settings-daemon new file mode 100644 index 000000000..7246f0e13 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200805-rebuild_cinnamon-settings-daemon @@ -0,0 +1,4 @@ +# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=gnome-extra/cinnamon-settings-daemon + +[overlay-calculate] +revision = #-cut(0,-,#-cl_pass_file-#)-#