From e3c8a53497e43c157a316e938227ec0b40f43141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 5 Aug 2020 12:41:10 +0300 Subject: [PATCH] =?UTF-8?q?gnome-extra/cinnamon-settings-daemon:=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=82=D1=87=20=D0=BF=D1=80=D0=B8=D0=BD=D1=83=D0=B4=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20elogind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.calculate_directory | 1 + .../use_elogind.patch | 31 +++++++++++++++++++ .../20200805-rebuild_cinnamon-settings-daemon | 4 +++ 3 files changed, 36 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/gnome-extra/cinnamon-settings-daemon/use_elogind.patch create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2020/20200805-rebuild_cinnamon-settings-daemon 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-#)-#