From a8b09be6dd6ecdcd1ceb22ae4ad9b165226a8fc9 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: Thu, 22 Apr 2021 15:43:19 +0300 Subject: [PATCH] =?UTF-8?q?x11-misc/lightdm-gtk-greeter:=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=82=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * добавлен патч, позволяющий игнорировать событие изменения монитора при запуске greeter, что приводило к разовому морганию при запуске на ноутбуках --- .../lightdm-gtk-greeter/.calculate_directory | 1 + .../disable_blink_on_startup.patch | 51 +++++++++++++++++++ .../20210422.1-rebuild_lightdm-gtk-greeter | 4 ++ 3 files changed, 56 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/disable_blink_on_startup.patch create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2021/20210422.1-rebuild_lightdm-gtk-greeter diff --git a/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory new file mode 100644 index 000000000..615bc8bdf --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/disable_blink_on_startup.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/disable_blink_on_startup.patch new file mode 100644 index 000000000..b23c51ef2 --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/disable_blink_on_startup.patch @@ -0,0 +1,51 @@ +# Calculate format=diff +diff --git a/src/greeterbackground.c b/src/greeterbackground.c +index 9a33b6b..7a81fb6 100644 +--- a/src/greeterbackground.c ++++ b/src/greeterbackground.c +@@ -22,6 +22,8 @@ + #include "greeterbackground.h" + #include "greeterdeprecated.h" + ++extern int runts; ++ + typedef enum + { + /* Broken/uninitialized configuration */ +@@ -1018,6 +1020,10 @@ static void + greeter_background_monitors_changed_cb(GdkScreen* screen, + GreeterBackground* background) + { ++ int curts = (int)time(NULL); ++ if(curts > runts && curts - runts < 5) { ++ return; ++ } + g_return_if_fail(GREETER_IS_BACKGROUND(background)); + greeter_background_connect(background, screen); + } +--- a/src/lightdm-gtk-greeter.c ++++ b/src/lightdm-gtk-greeter.c +@@ -73,6 +73,7 @@ + + + static LightDMGreeter *greeter; ++int runts; + + /* List of spawned processes */ + static GSList *pids_to_close = NULL; +@@ -2857,6 +2858,7 @@ main (int argc, char **argv) + GdkRGBA lightdm_gtk_greeter_override_defaults; + guint fallback_css_priority = GTK_STYLE_PROVIDER_PRIORITY_APPLICATION; + GtkIconTheme *icon_theme; ++ runts = 0; + + /* Protect memory from being paged to disk, as we deal with passwords + +@@ -3433,6 +3435,7 @@ main (int argc, char **argv) + + gtk_widget_show (GTK_WIDGET (screen_overlay)); + ++ runts = (int)time(NULL); + g_debug ("Run Gtk loop..."); + gtk_main (); + g_debug ("Gtk loop exits"); diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210422.1-rebuild_lightdm-gtk-greeter b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210422.1-rebuild_lightdm-gtk-greeter new file mode 100644 index 000000000..6fb485136 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210422.1-rebuild_lightdm-gtk-greeter @@ -0,0 +1,4 @@ +# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=x11-misc/lightdm-gtk-greeter + +[overlay-calculate] +revision = #-cut(0,-,#-cl_pass_file-#)-#