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 4ef39d44f9..0000000000 Binary files a/desktop/misc/lxdm/files/login.png and /dev/null differ diff --git a/desktop/misc/lxdm/files/lxdm-0.5.3-upstream-fixes.patch b/desktop/misc/lxdm/files/lxdm-0.5.3-upstream-fixes.patch deleted file mode 100644 index 0360ebff8d..0000000000 --- a/desktop/misc/lxdm/files/lxdm-0.5.3-upstream-fixes.patch +++ /dev/null @@ -1,236 +0,0 @@ -From c6836939c6fd603f86f469bb7c6502b28b1ca583 Mon Sep 17 00:00:00 2001 -From: dgod -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.