From 10b3d490e1180cbcc3bb92db7d70b573a1971b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayhan=20Yal=C3=A7=C4=B1nsoy?= Date: Fri, 17 Apr 2020 07:00:06 +0300 Subject: [PATCH] lxdm:added new pisilinux theme --- desktop/misc/lxdm/actions.py | 9 +- .../files/customizetion_for_pisilinux.patch | 50 + desktop/misc/lxdm/files/default_config.patch | 28 - desktop/misc/lxdm/files/default_session.patch | 12 - desktop/misc/lxdm/files/login.png | Bin 11195 -> 0 bytes .../files/lxdm-0.5.3-upstream-fixes.patch | 236 - .../misc/lxdm/files/onscreenkeyboard.patch | 62 + desktop/misc/lxdm/files/wave.svg | 6622 ----------------- desktop/misc/lxdm/pspec.xml | 33 +- 9 files changed, 130 insertions(+), 6922 deletions(-) create mode 100644 desktop/misc/lxdm/files/customizetion_for_pisilinux.patch delete mode 100644 desktop/misc/lxdm/files/default_config.patch delete mode 100644 desktop/misc/lxdm/files/default_session.patch delete mode 100644 desktop/misc/lxdm/files/login.png delete mode 100644 desktop/misc/lxdm/files/lxdm-0.5.3-upstream-fixes.patch create mode 100644 desktop/misc/lxdm/files/onscreenkeyboard.patch delete mode 100644 desktop/misc/lxdm/files/wave.svg diff --git a/desktop/misc/lxdm/actions.py b/desktop/misc/lxdm/actions.py index 6e98b174d2..da0a705afb 100644 --- a/desktop/misc/lxdm/actions.py +++ b/desktop/misc/lxdm/actions.py @@ -7,13 +7,13 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get - +from pisi.actionsapi import shelltools def setup(): + #shelltools.system("./autogen.sh") autotools.configure("--prefix=/usr \ --sysconfdir=/etc \ --with-pam \ - --enable-gtk3 \ - --with-systemdsystemunitdir=no") + --enable-gtk3") def build(): autotools.make() @@ -22,6 +22,7 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) #install Pisi Linux default theme - #pisitools.insinto("/usr/share/lxdm/themes", "lxdm-pisilinux-theme") + pisitools.dodir("/usr/share/lxdm/themes/lxdm-pisilinux-theme") + pisitools.insinto("/usr/share/lxdm/themes/lxdm-pisilinux-theme", "lxdm-pisilinux-theme-0.1/*") #pisitools.remove("/usr/share/lxdm/themes/lxdm-pisilinux-theme/login.png") pisitools.dodoc("COPYING", "AUTHORS", "TODO", "README", "ChangeLog", "NEWS") diff --git a/desktop/misc/lxdm/files/customizetion_for_pisilinux.patch b/desktop/misc/lxdm/files/customizetion_for_pisilinux.patch new file mode 100644 index 0000000000..684fcd4a3c --- /dev/null +++ b/desktop/misc/lxdm/files/customizetion_for_pisilinux.patch @@ -0,0 +1,50 @@ +diff -Nuar a/data/lxdm.conf.in b/data/lxdm.conf.in +--- a/data/lxdm.conf.in 2014-11-23 11:56:36.000000000 +0200 ++++ b/data/lxdm.conf.in 2020-04-16 22:20:06.073013398 +0300 +@@ -7,10 +7,10 @@ + # timeout=10 + + ## default session or desktop used when no systemwide config +-# session=/usr/bin/startlxde ++session=/usr/bin/startlxqt + + ## uncomment and set to set numlock on your keyboard +-# numlock=0 ++numlock=1 + + ## set this if you don't want to put xauth file at ~/.Xauthority + # xauth_path=/tmp +@@ -34,7 +34,7 @@ + gtk_theme=Clearlooks + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++#bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 +@@ -43,10 +43,15 @@ + lang=1 + + ## if show keyboard layout select control +-keyboard=0 ++keyboard=1 ++ ++## if set show onscreen-keyboard button and run content on click ++onscreenkeyboard=onboard + + ## the theme of greeter +-theme=Industrial ++theme=lxdm-pisilinux-theme ++ ++hide_time=1 + + [input] + +@@ -58,5 +63,5 @@ + white= + + ## blacklist user +-black= ++black=ftp + diff --git a/desktop/misc/lxdm/files/default_config.patch b/desktop/misc/lxdm/files/default_config.patch deleted file mode 100644 index 13af24cad3..0000000000 --- a/desktop/misc/lxdm/files/default_config.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nuar lxdm-0.5.0.orig/data/lxdm.conf.in lxdm-0.5.0/data/lxdm.conf.in ---- lxdm-0.5.0.orig/data/lxdm.conf.in 2012-02-27 13:28:25.000000000 +0200 -+++ lxdm-0.5.0/data/lxdm.conf.in 2014-08-18 14:01:59.955134485 +0300 -@@ -34,7 +34,7 @@ - gtk_theme=Clearlooks - - ## background of the greeter --bg=/usr/share/backgrounds/default.png -+#bg=/usr/share/backgrounds/default.png - - ## if show bottom pane - bottom_pane=1 -@@ -46,7 +46,7 @@ - keyboard=0 - - ## the theme of greeter --theme=Industrial -+theme=Industrial - - [input] - -@@ -58,5 +58,5 @@ - white= - - ## blacklist user --black= -+black=ftp - diff --git a/desktop/misc/lxdm/files/default_session.patch b/desktop/misc/lxdm/files/default_session.patch deleted file mode 100644 index 9b49c66a78..0000000000 --- a/desktop/misc/lxdm/files/default_session.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar lxdm-0.5.3.orig/data/lxdm.conf.in lxdm-0.5.3/data/lxdm.conf.in ---- lxdm-0.5.3.orig/data/lxdm.conf.in 2017-11-19 17:40:33.970019559 +0300 -+++ lxdm-0.5.3/data/lxdm.conf.in 2017-11-19 17:41:50.406021375 +0300 -@@ -7,7 +7,7 @@ - # timeout=10 - - ## default session or desktop used when no systemwide config --# session=/usr/bin/startlxde -+session=/usr/bin/startkde - - ## uncomment and set to set numlock on your keyboard - # numlock=0 diff --git a/desktop/misc/lxdm/files/login.png b/desktop/misc/lxdm/files/login.png deleted file mode 100644 index 4ef39d44f9a4b08823c2267c43ace07b9cdc168c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11195 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 -Date: Sun, 3 Jan 2016 11:53:13 +0800 -Subject: [PATCH 01/07] create user specific directory under /var/run - ---- - src/lxdm.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lxdm.c b/src/lxdm.c -index a37f051..d81b587 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -750,7 +750,13 @@ static char ** create_client_auth(struct passwd *pw,char **env) - if(xauth_write_file(authfile,s->display,s->mcookie)==-1) - { - g_free(authfile); -- authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid); -+ -+ gchar *authdir = g_strdup_printf("/var/run/lxdm/%d", pw->pw_uid); -+ g_mkdir_with_parents(authdir, S_IRWXU); -+ chown(authdir, pw->pw_uid, pw->pw_gid); -+ -+ authfile = g_strdup_printf("%s/.Xauthority", authdir); -+ g_free(authdir); - remove(authfile); - xauth_write_file(authfile,s->display,s->mcookie); - } --- -2.1.4 - - -From 7258b57fd305182c6c031eb8c1ded96c5a06f6da Mon Sep 17 00:00:00 2001 -From: dgod -Date: Sat, 20 Feb 2016 22:36:59 +0800 -Subject: [PATCH 02/07] fix build before gtk 2.22 - ---- - src/greeter-gdk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c -index 1abbefa..ad3267a 100644 ---- a/src/greeter-gdk.c -+++ b/src/greeter-gdk.c -@@ -22,6 +22,7 @@ - - #define XLIB_ILLEGAL_ACCESS - -+#include - #include - #include - #include -@@ -88,12 +89,14 @@ static void on_ui_expose(void) - } - - cr=gdk_cairo_create(win); -+#if GTK_CHECK_VERSION(3,0,0) - cairo_pattern_t *pattern=gdk_window_get_background_pattern(win); - if(pattern) - { - cairo_set_source(cr,pattern); - cairo_paint(cr); - } -+#endif - - gdk_cairo_set_source_color(cr, &bg); - cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height); --- -2.1.4 - - -From 5d36a53702f1e60bb316946f1edccb2dbc3c01bd Mon Sep 17 00:00:00 2001 -From: dgod -Date: Sun, 21 Feb 2016 10:45:58 +0800 -Subject: [PATCH 03/07] fix with user_list only: problem when password check - fail - ---- - src/greeter.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/greeter.c b/src/greeter.c -index 10b7f3f..03503b6 100644 ---- a/src/greeter.c -+++ b/src/greeter.c -@@ -146,7 +146,7 @@ static void switch_to_input_user(void) - if(user_list_scrolled) - gtk_widget_show(user_list_scrolled); - else -- gtk_widget_hide(user_list); -+ gtk_widget_show(user_list); - gtk_widget_grab_focus(user_list); - } - else --- -2.1.4 - - -From fe121ce70ad5e99bd3b3b896dfcbe439dd22716c Mon Sep 17 00:00:00 2001 -From: dgod -Date: Sun, 21 Feb 2016 11:45:35 +0800 -Subject: [PATCH 04/07] fix not honor ctl+alt+backspacer for restarting - ---- - src/lxdm.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/lxdm.c b/src/lxdm.c -index d81b587..e00d219 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -962,6 +962,11 @@ static void on_xserver_stop(void *data,int pid, int status) - s->dpy=NULL; - ui_drop(); - lxdm_startx(s); -+ #ifndef DISABLE_XAUTH -+ char temp[256]; -+ sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display); -+ setenv("XAUTHORITY",temp,1); -+ #endif - ui_prepare(); - lxsession_set_active(s); - } --- -2.1.4 - - -From 72812894cfd9454d70e4b0753531e46580416771 Mon Sep 17 00:00:00 2001 -From: dgod -Date: Mon, 21 Mar 2016 19:25:25 +0800 -Subject: [PATCH 05/07] fix css under gtk 3.20 - ---- - data/themes/Industrial/gtk.css | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css -index 179f0d6..f8e6432 100644 ---- a/data/themes/Industrial/gtk.css -+++ b/data/themes/Industrial/gtk.css -@@ -17,6 +17,7 @@ - color: #000000; - } - -+#bottom_pane label, - #bottom_pane GtkLabel { - font: Sans 12; - color: #9E9D9B; --- -2.1.4 - - -From 855c090f1330aedc97b9a486dcd0d0b4c7ff4f4e Mon Sep 17 00:00:00 2001 -From: dgod -Date: Sun, 16 Oct 2016 12:49:40 +0800 -Subject: [PATCH 06/07] Compile with the musl c library (no execinfo.h) - ---- - configure.ac | 2 +- - src/lxdm.c | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 52f2ac9..a9fca61 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,7 +32,7 @@ AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ]) - - # Checks for header files. - AC_PATH_X --AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) -+AC_CHECK_HEADERS([execinfo.h shadow.h stdlib.h string.h unistd.h utmpx.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_TYPE_PID_T -diff --git a/src/lxdm.c b/src/lxdm.c -index e00d219..53d2176 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -49,7 +49,9 @@ - #include - #include - -+#ifdef HAVE_EXECINFO_H - #include -+#endif - - #ifdef HAVE_UTMPX_H - #include -@@ -1552,6 +1554,7 @@ int lxdm_do_auto_login(void) - - static void log_sigsegv(void) - { -+#ifdef HAVE_EXECINFO_H - void *array[40]; - size_t size; - char **bt_strs; -@@ -1564,6 +1567,7 @@ static void log_sigsegv(void) - fprintf(stderr, "%s\n", bt_strs[i]); - - free(bt_strs); -+#endif - } - - static void sigsegv_handler(int sig) --- -2.1.4 - - -From a548c73e35d62ec334df5cd3a491ee409d0067bd Mon Sep 17 00:00:00 2001 -From: dgod -Date: Fri, 11 Nov 2016 20:24:30 +0800 -Subject: [PATCH 07/07] fix tcp_listen=1 does not work for mordern X.org - ---- - src/lxdm.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/lxdm.c b/src/lxdm.c -index 53d2176..722936f 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -490,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s) - { - arg[arc++] = g_strdup("-nolisten"); - arg[arc++] = g_strdup("tcp"); -+ } else { -+ arg[arc++] = g_strdup("-listen"); -+ arg[arc++] = g_strdup("tcp"); - } - if(!novtswitch) - { --- -2.1.4 - diff --git a/desktop/misc/lxdm/files/onscreenkeyboard.patch b/desktop/misc/lxdm/files/onscreenkeyboard.patch new file mode 100644 index 0000000000..1b345dcf14 --- /dev/null +++ b/desktop/misc/lxdm/files/onscreenkeyboard.patch @@ -0,0 +1,62 @@ +X-Git-Url: https://git.lxde.org/gitweb/?p=lxde%2Flxdm.git;a=blobdiff_plain;f=src%2Fgreeter.c;h=0e26b6d42e9ddb1d0d9069d3ae034f8485086668;hp=65c74550b88488f1ad2cabca273cabca0fd0376d;hb=cee37e0d27c07023cb08925330ae2db691e2429c;hpb=7ed5f86780a2de415b590b6ec5136e15b1fd888d + +diff --git a/src/greeter.c b/src/greeter.c +index 65c7455..0e26b6d 100644 +--- a/src/greeter.c ++++ b/src/greeter.c +@@ -70,6 +70,7 @@ static GtkWidget* user_list; + static GtkWidget* sessions; + static GtkWidget* lang; + ++static GtkWidget* onscreenkeyboard_btn; + static GtkWidget* exit_btn; + + static GtkWidget* exit_menu; +@@ -81,6 +82,8 @@ static char* pass = NULL; + static char* ui_file = NULL; + static char *ui_nobody = NULL; + ++static char* onscreenkeyboard_cmd = NULL; ++ + static GIOChannel *greeter_io; + + static int auto_login; +@@ -720,6 +723,15 @@ static void on_exit_clicked(GtkButton* exit_btn, gpointer user_data) + 0, gtk_get_current_event_time() ); + } + ++static void on_screenkeyboard_clicked(GtkButton* screenkeyboard_btn, ++ gpointer user_data) ++{ ++ gboolean res; ++ /* set the current xkb */ ++ res=g_spawn_command_line_async(onscreenkeyboard_cmd, NULL); ++ printf("spawn onscreenkeyboard: %s %d\n", onscreenkeyboard_cmd, res); ++} ++ + static void load_exit() + { + GtkWidget* item; +@@ -1248,6 +1260,21 @@ static void create_win() + load_exit(); + } + ++ onscreenkeyboard_btn = (GtkWidget*)gtk_builder_get_object(builder, "onscreenkeyboard"); ++ onscreenkeyboard_cmd = g_key_file_get_string(config, "display", "onscreenkeyboard",NULL); ++ ++ if(onscreenkeyboard_cmd && onscreenkeyboard_cmd[0]) ++ { ++ gtk_widget_show(onscreenkeyboard_btn); ++ g_signal_connect(onscreenkeyboard_btn, "clicked", G_CALLBACK(on_screenkeyboard_clicked), NULL); ++ } ++ else ++ { ++ if (onscreenkeyboard_btn != NULL) { ++ gtk_widget_hide(onscreenkeyboard_btn); ++ } ++ } ++ + ui_get_geometry(window,&rc); + gtk_window_move(GTK_WINDOW(win),rc.x,rc.y); + gtk_window_set_default_size(GTK_WINDOW(win),rc.width,rc.height); + diff --git a/desktop/misc/lxdm/files/wave.svg b/desktop/misc/lxdm/files/wave.svg deleted file mode 100644 index b34eb65691..0000000000 --- a/desktop/misc/lxdm/files/wave.svg +++ /dev/null @@ -1,6622 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Andre Luiz Rodrigues Ferreira - - - MoreBlue Orbit Wallpaper - Ago/2008 - - - General Public Licence 2 - - - - - Special Thanks to DebianArt Team: -- Valessio Soares Brito -- Gustavo Franco - -and all Debian Desktop Team. - - - - A 'clean and bealty' artwork for Debian Lenny. - - - - - - - - - - - - - diff --git a/desktop/misc/lxdm/pspec.xml b/desktop/misc/lxdm/pspec.xml index d5467391d8..0316a7fd36 100644 --- a/desktop/misc/lxdm/pspec.xml +++ b/desktop/misc/lxdm/pspec.xml @@ -13,14 +13,12 @@ app:gui LXDE Display Manager LXDM is the future display manager of LXDE. - mirrors://sourceforge/lxdm/lxdm-0.5.3.tar.xz - - + mirrors://sourceforge/lxdm/lxdm-0.5.3.tar.xz + https://github.com/ayhanyalcinsoy/lxdm-pisilinux-theme/archive/v0.1.tar.gz intltool iso-codes-devel gtk3-devel - cairo-devel pango-devel dbus-devel @@ -34,8 +32,9 @@ at-spi2-core-devel - default_config.patch - default_session.patch + onscreenkeyboard.patch + customizetion_for_pisilinux.patch + @@ -50,14 +49,10 @@ pam - iso-codes gtk3 - cairo pango gdk-pixbuf - at-spi2-atk - at-spi2-core dbus glib2 libX11 @@ -74,9 +69,7 @@ /etc/conf.d/xdm - lxdm.desktop - wave.svg - login.png + lxdm.desktop System.Service @@ -84,14 +77,14 @@ - - 2020-02-08 + + 2020-04-16 0.5.3 - Rebuild. - Mustafa Cinasal - muscnsl@gmail.com - - + Added new pisilinux theme + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + 2019-04-21 0.5.3 Rebuild at-spi2.