# HG changeset patch # User Aleksej Bobylev # Date 1503738659 -10800 # Node ID 2a1b70deab763257faa6f8a163b013034a81f414 # Parent 0ed344a8daeddc64587ed897fb1a149e86517014 Up cookutils, lxpanel, slim, tazlito. diff -r 0ed344a8daed -r 2a1b70deab76 cookutils/receipt --- a/cookutils/receipt Fri Aug 25 15:45:11 2017 +0300 +++ b/cookutils/receipt Sat Aug 26 12:10:59 2017 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="cookutils" -VERSION="957" +VERSION="960" CATEGORY="base-system" SHORT_DESC="SliTaz packages builder new generation" MAINTAINER="pankso@slitaz.org" diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel-dev/receipt --- a/lxpanel-dev/receipt Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="lxpanel-dev" -VERSION="0.6.2" -CATEGORY="x-window" -SHORT_DESC="LXDE panel (development)" -MAINTAINER="pankso@slitaz.org" -LICENSE="GPL2" -WEB_SITE="http://www.lxde.org/" -TAGS="LXDE" -HOST_ARCH="i486 arm" - -WANTED="lxpanel" -DEPENDS="pkg-config" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/pkgconfig $fs/usr/lib -} diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel-extra/receipt --- a/lxpanel-extra/receipt Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="lxpanel-extra" -VERSION="0.6.2" -CATEGORY="x-window" -SHORT_DESC="LXDE panel (extra files and plugins)" -MAINTAINER="pankso@slitaz.org" -LICENSE="GPL2" -WEB_SITE="http://www.lxde.org/" -TAGS="LXDE" - -WANTED="lxpanel" -DEPENDS="lxpanel libwnck" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p \ - $fs/usr/lib/lxpanel/plugins \ - $fs/usr/share/lxpanel/images - # Plugins - for p in kbled.so wnckpager.so - do - cp $install/usr/lib/lxpanel/plugins/$p \ - $fs/usr/lib/lxpanel/plugins - done - # Images - imgs=usr/share/lxpanel/images - cp -a $install/$imgs/ns-*.png $fs/$imgs - cp -a $install/$imgs/*lock-*.png $fs/$imgs - cp -a $install/$imgs/xkb-flags $fs/$imgs -} diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/receipt --- a/lxpanel/receipt Fri Aug 25 15:45:11 2017 +0300 +++ b/lxpanel/receipt Sat Aug 26 12:10:59 2017 +0300 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="lxpanel" VERSION="0.6.2" @@ -7,79 +7,85 @@ MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.lxde.org/" +HOST_ARCH="i486 arm" + TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/lxde/$TARBALL" -CONFIG_FILES="/etc/lxpanel/default" -TAGS="LXDE gtk2 panel" -HOST_ARCH="i486 arm" -SUGGESTED="lxde lxsession slitaz-icon" -DEPENDS="alsa-lib gtk+ menu-cache wireless_tools libxml2 slitaz-menus" -BUILD_DEPENDS="gtk+-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \ +BUILD_DEPENDS_arm="gtk+-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \ libxml2-dev lxmenu-data" - -# Handle cross compilation -case "$ARCH" in - i?86) - BUILD_DEPENDS="$BUILD_DEPENDS libwnck-dev" - pluglist="all" ;; - arm*) - pluglist="netstatus,volumealsa,cpu,batt,xkb,thermal,cpufreq,monitors" ;; -esac +BUILD_DEPENDS="intltool gtk+-dev menu-cache-dev alsa-lib-dev \ +wireless_tools-dev libxml2-dev lxmenu-data libwnck2-dev" +SPLIT="lxpanel-extra lxpanel lxpanel-dev" # Rules to configure and make the package. compile_rules() { + case "$ARCH" in + i?86) pluglist="all";; + arm*) pluglist="netstatus,volumealsa,cpu,batt,xkb,thermal,cpufreq,monitors";; + esac + # Match default desktop colors - sed -i s'/gdk_color_parse("green"/gdk_color_parse("#cfcfcf"/' \ + sed -i 's|gdk_color_parse("green"|gdk_color_parse("#cfcfcf"|' \ src/plugins/cpu/cpu.c || return 1 + ./configure \ --sysconfdir=/etc \ --localstatedir=/var \ --with-plugins="$pluglist" \ $CONFIGURE_ARGS && - make && make install + make && make install || exit 1 + + # Move profile to /etc/lxpanel (/usr maybe read-only) and default config + mkdir -p $install/etc/lxpanel + mv $install/usr/share/lxpanel/profile/* $install/etc/lxpanel + ln -sf /etc/lxpanel $install/usr/share/lxpanel/profile + mv -f $install/etc/lxpanel/default $install/etc/lxpanel/original + cp -a $stuff/default $install/etc/lxpanel + rm -rf $install/etc/lxpanel/two_panels + + # XDG autostart desktop file (lxsession will use it automaticaly) + mkdir -p $install/etc/xdg + cp -a $stuff/autostart $install/etc/xdg + + chown -R root:root $install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p \ - $fs/usr/lib \ - $fs/usr/share/lxpanel/images \ - $fs/etc/lxpanel \ - $fs/etc/xdg - - cp -a $install/usr/bin $fs/usr - - # Plugins (kbled -> lxpanel-extra) - cp -a $install/usr/lib/lxpanel $fs/usr/lib - find $fs -name kbled.so -delete - find $fs -name wnckpager.so -delete - - # Images - imgs=usr/share/lxpanel/images - for i in clock cpufreq-icon my-computer; do - cp -a $install/$imgs/$i.png $fs/$imgs - done - - # Move profile to /etc/lxpanel (/usr maybe read-only) and default config - cp -a $install/usr/share/lxpanel/profile/* $fs/etc/lxpanel - ln -sf /etc/lxpanel $fs/usr/share/lxpanel/profile - mv -f $fs/etc/lxpanel/default $fs/etc/lxpanel/original - cp -a $stuff/default $fs/etc/lxpanel - rm -rf $fs/etc/lxpanel/two_panels - - # XDG autostart desktop file (lxsession will use it automaticaly) - cp -a $stuff/autostart $fs/etc/xdg - - cp -a $install/usr/share/lxpanel/ui $fs/usr/share/lxpanel - cp -a $install/usr/share/lxpanel/x* $fs/usr/share/lxpanel + case $PACKAGE in + lxpanel-extra) + copy kbled.so wnckpager.so ns-*.png *lock-*.png xkb-flags/ \ + background.png file-manager.png gnome-*.png mute.png \ + stock_volume.png volume-*.png window-manager.png + CAT="x-window|extra files and plugins" + TAGS="LXDE" + DEPENDS="lxpanel libwnck2 startup-notification xorg-xcb-util" + ;; + lxpanel) + copy @std + remove_already_packed + DEPENDS="alsa-lib atk bzlib cairo fontconfig freetype gdk-pixbuf \ + glib gtk+ libffi libharfbuzz liblzma libpng16 libxml2 menu-cache \ + pango pcre util-linux-blkid util-linux-mount util-linux-uuid \ + wireless_tools xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ + xorg-libXrender xorg-libxcb xorg-pixman zlib slitaz-menus" + CONFIG_FILES="/etc/lxpanel/default/" + TAGS="LXDE gtk2 panel" + SUGGESTED="lxde lxsession slitaz-icon" + ;; + lxpanel-dev) + copy @dev + DEPENDS="lxpanel lxpanel-extra \ + glib-dev menu-cache-dev" + ;; + esac } -post_install() -{ - # clean LXPanel menu caches +# Clean LXPanel menu caches +post_install() { chroot "$1/" rm home/*/.cache/menus/* 2>/dev/null : } diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/batt.chg.level.patch --- a/lxpanel/stuff/batt.chg.level.patch Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- /src/plugins/batt/batt_sys.c.orig -+++ /src/plugins/batt/batt_sys.c -@@ -220,7 +220,7 @@ - if (b->last_capacity < MIN_CAPACITY) - b->percentage = 0; - else -- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; -+ b->percentage = ((float) b->remaining_capacity * 100.0) / (float) b->last_capacity; - - if (b->percentage > 100) - b->percentage = 100; diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/configure_desktop_number.patch --- a/lxpanel/stuff/configure_desktop_number.patch Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -Description: Add configuration for desktop number for the pager plugin. -Author: Julien Lavergne - ---- a/src/plugins/pager.c -+++ b/src/plugins/pager.c -@@ -811,6 +811,80 @@ - g_free(pg); - } - -+/* Callback when the configuration dialog is to be shown. */ -+static void deskno_configure(Plugin * p, GtkWindow * parent) -+{ -+ -+ GdkScreen *screen = gdk_screen_get_default(); -+ const char *wm_name = gdk_x11_screen_get_window_manager_name(screen); -+ GError *error = NULL; -+ const gchar *command_line = NULL; -+ -+ if(g_strcmp0(wm_name, "Openbox") == 0) -+ { -+ if (g_find_program_in_path("obconf")) -+ { -+ command_line = "obconf"; -+ } -+ } -+ else if (g_strcmp0(wm_name, "compiz") == 0) -+ { -+ if (g_find_program_in_path("ccsm")) -+ { -+ command_line = "ccsm"; -+ -+ } -+ else if (g_find_program_in_path("simple-ccsm")) -+ { -+ command_line = "simple-ccsm"; -+ } -+ } -+ else -+ { -+ -+ GtkWidget* msg; -+ -+ msg = gtk_message_dialog_new( NULL, -+ 0, -+ GTK_MESSAGE_ERROR, -+ GTK_BUTTONS_OK, -+ _("Error, only openbox and compiz are supported") ); -+ gtk_dialog_run( GTK_DIALOG(msg) ); -+ gtk_widget_destroy( msg ); -+ -+ } -+ -+ if (command_line) -+ { -+ gdk_spawn_command_line_on_screen(screen, -+ command_line, -+ &error); -+ } -+ -+ else -+ { -+ -+ GtkWidget* msg; -+ -+ msg = gtk_message_dialog_new( NULL, -+ 0, -+ GTK_MESSAGE_ERROR, -+ GTK_BUTTONS_OK, -+ _("Error, you need to install obconf, ccsm of simple-ccsm") ); -+ gtk_dialog_run( GTK_DIALOG(msg) ); -+ gtk_widget_destroy( msg ); -+ -+ } -+ -+ if (error) -+ { -+ g_print("%s\n", error->message); -+ -+ g_free (error); -+ } -+ -+} -+ - /* Callback when panel configuration changes. */ - static void pager_panel_configuration_changed(Plugin * p) - { -@@ -836,7 +910,7 @@ - - constructor : pager_constructor, - destructor : pager_destructor, -- config : NULL, -+ config : deskno_configure, - save : NULL, - panel_configuration_changed : pager_panel_configuration_changed - }; diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/cpu-size-color.patch --- a/lxpanel/stuff/cpu-size-color.patch Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ ---- src/plugins/cpu/cpu.c -+++ src/plugins/cpu/cpu.c.taz -@@ -222,14 +222,14 @@ - - /* Allocate drawing area as a child of top level widget. Enable button press events. */ - c->da = gtk_drawing_area_new(); -- gtk_widget_set_size_request(c->da, 40, PANEL_HEIGHT_DEFAULT); -+ gtk_widget_set_size_request(c->da, 26, PANEL_HEIGHT_DEFAULT); - gtk_widget_add_events(c->da, GDK_BUTTON_PRESS_MASK); - gtk_container_add(GTK_CONTAINER(p->pwid), c->da); - - /* Clone a graphics context and set "green" as its foreground color. - * We will use this to draw the graph. */ - c->graphics_context = gdk_gc_new(p->panel->topgwin->window); -- gdk_color_parse("green", &c->foreground_color); -+ gdk_color_parse("#cfcfcf", &c->foreground_color); - gdk_colormap_alloc_color(gdk_drawable_get_colormap(p->panel->topgwin->window), &c->foreground_color, FALSE, TRUE); - gdk_gc_set_foreground(c->graphics_context, &c->foreground_color); - diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/fix_position.patch --- a/lxpanel/stuff/fix_position.patch Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,156 +0,0 @@ -Index: lxpanel-0.5.8/src/plugins/menu.c -=================================================================== ---- lxpanel-0.5.8.orig/src/plugins/menu.c 2011-10-05 23:55:47.000000000 +0200 -+++ lxpanel-0.5.8/src/plugins/menu.c 2011-10-05 23:55:49.000000000 +0200 -@@ -131,8 +131,8 @@ - int ox, oy, w, h; - Plugin *p; - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_set_allocation(widget, &allocation); -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); - #endif - ENTER; - p = g_object_get_data(G_OBJECT(widget), "plugin"); -@@ -155,20 +155,20 @@ - *x = ox; - if (*x + w > gdk_screen_width()) - #if GTK_CHECK_VERSION(2,18,0) -- *x = ox + allocation.width - w; -+ *x = ox + allocation->width - w; - #else - *x = ox + widget->allocation.width - w; - #endif - *y = oy - h; - if (*y < 0) - #if GTK_CHECK_VERSION(2,18,0) -- *y = oy + allocation.height; -+ *y = oy + allocation->height; - #else - *y = oy + widget->allocation.height; - #endif - } else { - #if GTK_CHECK_VERSION(2,18,0) -- *x = ox + allocation.width; -+ *x = ox + allocation->width; - #else - *x = ox + widget->allocation.width; - #endif -@@ -177,19 +177,22 @@ - *y = oy; - if (*y + h > gdk_screen_height()) - #if GTK_CHECK_VERSION(2,18,0) -- *y = oy + allocation.height - h; -+ *y = oy + allocation->height - h; - #else - *y = oy + widget->allocation.height - h; - #endif - } - DBG("widget: x,y=%d,%d w,h=%d,%d\n", ox, oy, - #if GTK_CHECK_VERSION(2,18,0) -- allocation.width, allocation.height ); -+ allocation->width, allocation->height ); - #else - widget->allocation.width, widget->allocation.height ); - #endif - DBG("w-h %d %d\n", w, h); - *push_in = TRUE; -+#if GTK_CHECK_VERSION(2,18,0) -+ g_free (allocation); -+#endif - RET(); - } - -@@ -634,8 +637,8 @@ - { - ENTER; - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_get_allocation(widget, &allocation); -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); - #endif - - /* Standard right-click handling. */ -@@ -644,14 +647,17 @@ - - if ((event->type == GDK_BUTTON_PRESS) - #if GTK_CHECK_VERSION(2,18,0) -- && (event->x >=0 && event->x < allocation.width) -- && (event->y >=0 && event->y < allocation.height)) { -+ && (event->x >=0 && event->x < allocation->width) -+ && (event->y >=0 && event->y < allocation->height)) { - #else - && (event->x >=0 && event->x < widget->allocation.width) - && (event->y >=0 && event->y < widget->allocation.height)) { - #endif - show_menu( widget, plugin, event->button, event->time ); - } -+#if GTK_CHECK_VERSION(2,18,0) -+ g_free (allocation); -+#endif - RET(TRUE); - } - -Index: lxpanel-0.5.8/src/plugins/pager.c -=================================================================== ---- lxpanel-0.5.8.orig/src/plugins/pager.c 2011-10-05 23:55:47.000000000 +0200 -+++ lxpanel-0.5.8/src/plugins/pager.c 2011-10-05 23:56:29.000000000 +0200 -@@ -271,10 +271,10 @@ - { - /* Allocate pixmap and statistics buffer without border pixels. */ - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_get_allocation(widget, &allocation); -- int new_pixmap_width = allocation.width; -- int new_pixmap_height = allocation.height; -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); -+ int new_pixmap_width = allocation->width; -+ int new_pixmap_height = allocation->height; - #else - int new_pixmap_width = widget->allocation.width; - int new_pixmap_height = widget->allocation.height; -@@ -292,8 +292,8 @@ - - /* Compute the horizontal and vertical scale factors, and mark the desktop for redraw. */ - #if GTK_CHECK_VERSION(2,18,0) -- d->scale_y = (gfloat) allocation.height / (gfloat) gdk_screen_height(); -- d->scale_x = (gfloat) allocation.width / (gfloat) gdk_screen_width(); -+ d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); -+ d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); - #else - d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); - d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); -@@ -305,6 +305,9 @@ - gtk_widget_set_size_request(widget, - (d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2) * d->pg->aspect_ratio, - d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2); -+#if GTK_CHECK_VERSION(2,18,0) -+ g_free (allocation); -+#endif - return FALSE; - } - -@@ -326,8 +329,8 @@ - { - GtkWidget * widget = GTK_WIDGET(d->da); - #if GTK_CHECK_VERSION(2,18,0) -- GtkAllocation allocation; -- gtk_widget_get_allocation(widget, &allocation); -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); - #endif - gdk_draw_rectangle( - d->pixmap, -@@ -336,7 +339,8 @@ - : style->dark_gc[GTK_STATE_NORMAL]), - TRUE, - #if GTK_CHECK_VERSION(2,18,0) -- 0, 0, allocation.width, allocation.height); -+ 0, 0, allocation->width, allocation->height); -+ g_free (allocation); - #else - 0, 0, widget->allocation.width, widget->allocation.height); - #endif diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/patches/batt.chg.level.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lxpanel/stuff/patches/batt.chg.level.patch Sat Aug 26 12:10:59 2017 +0300 @@ -0,0 +1,11 @@ +--- /src/plugins/batt/batt_sys.c.orig ++++ /src/plugins/batt/batt_sys.c +@@ -220,7 +220,7 @@ + if (b->last_capacity < MIN_CAPACITY) + b->percentage = 0; + else +- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; ++ b->percentage = ((float) b->remaining_capacity * 100.0) / (float) b->last_capacity; + + if (b->percentage > 100) + b->percentage = 100; diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/patches/configure_desktop_number.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lxpanel/stuff/patches/configure_desktop_number.patch Sat Aug 26 12:10:59 2017 +0300 @@ -0,0 +1,95 @@ +Description: Add configuration for desktop number for the pager plugin. +Author: Julien Lavergne + +--- a/src/plugins/pager.c ++++ b/src/plugins/pager.c +@@ -811,6 +811,80 @@ + g_free(pg); + } + ++/* Callback when the configuration dialog is to be shown. */ ++static void deskno_configure(Plugin * p, GtkWindow * parent) ++{ ++ ++ GdkScreen *screen = gdk_screen_get_default(); ++ const char *wm_name = gdk_x11_screen_get_window_manager_name(screen); ++ GError *error = NULL; ++ const gchar *command_line = NULL; ++ ++ if(g_strcmp0(wm_name, "Openbox") == 0) ++ { ++ if (g_find_program_in_path("obconf")) ++ { ++ command_line = "obconf"; ++ } ++ } ++ else if (g_strcmp0(wm_name, "compiz") == 0) ++ { ++ if (g_find_program_in_path("ccsm")) ++ { ++ command_line = "ccsm"; ++ ++ } ++ else if (g_find_program_in_path("simple-ccsm")) ++ { ++ command_line = "simple-ccsm"; ++ } ++ } ++ else ++ { ++ ++ GtkWidget* msg; ++ ++ msg = gtk_message_dialog_new( NULL, ++ 0, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_OK, ++ _("Error, only openbox and compiz are supported") ); ++ gtk_dialog_run( GTK_DIALOG(msg) ); ++ gtk_widget_destroy( msg ); ++ ++ } ++ ++ if (command_line) ++ { ++ gdk_spawn_command_line_on_screen(screen, ++ command_line, ++ &error); ++ } ++ ++ else ++ { ++ ++ GtkWidget* msg; ++ ++ msg = gtk_message_dialog_new( NULL, ++ 0, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_OK, ++ _("Error, you need to install obconf, ccsm of simple-ccsm") ); ++ gtk_dialog_run( GTK_DIALOG(msg) ); ++ gtk_widget_destroy( msg ); ++ ++ } ++ ++ if (error) ++ { ++ g_print("%s\n", error->message); ++ ++ g_free (error); ++ } ++ ++} ++ + /* Callback when panel configuration changes. */ + static void pager_panel_configuration_changed(Plugin * p) + { +@@ -836,7 +910,7 @@ + + constructor : pager_constructor, + destructor : pager_destructor, +- config : NULL, ++ config : deskno_configure, + save : NULL, + panel_configuration_changed : pager_panel_configuration_changed + }; diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/patches/cpu-size-color.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lxpanel/stuff/patches/cpu-size-color.patch Sat Aug 26 12:10:59 2017 +0300 @@ -0,0 +1,19 @@ +--- src/plugins/cpu/cpu.c ++++ src/plugins/cpu/cpu.c.taz +@@ -222,14 +222,14 @@ + + /* Allocate drawing area as a child of top level widget. Enable button press events. */ + c->da = gtk_drawing_area_new(); +- gtk_widget_set_size_request(c->da, 40, PANEL_HEIGHT_DEFAULT); ++ gtk_widget_set_size_request(c->da, 26, PANEL_HEIGHT_DEFAULT); + gtk_widget_add_events(c->da, GDK_BUTTON_PRESS_MASK); + gtk_container_add(GTK_CONTAINER(p->pwid), c->da); + + /* Clone a graphics context and set "green" as its foreground color. + * We will use this to draw the graph. */ + c->graphics_context = gdk_gc_new(p->panel->topgwin->window); +- gdk_color_parse("green", &c->foreground_color); ++ gdk_color_parse("#cfcfcf", &c->foreground_color); + gdk_colormap_alloc_color(gdk_drawable_get_colormap(p->panel->topgwin->window), &c->foreground_color, FALSE, TRUE); + gdk_gc_set_foreground(c->graphics_context, &c->foreground_color); + diff -r 0ed344a8daed -r 2a1b70deab76 lxpanel/stuff/patches/fix_position.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lxpanel/stuff/patches/fix_position.patch Sat Aug 26 12:10:59 2017 +0300 @@ -0,0 +1,156 @@ +Index: lxpanel-0.5.8/src/plugins/menu.c +=================================================================== +--- lxpanel-0.5.8.orig/src/plugins/menu.c 2011-10-05 23:55:47.000000000 +0200 ++++ lxpanel-0.5.8/src/plugins/menu.c 2011-10-05 23:55:49.000000000 +0200 +@@ -131,8 +131,8 @@ + int ox, oy, w, h; + Plugin *p; + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(widget, &allocation); ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); + #endif + ENTER; + p = g_object_get_data(G_OBJECT(widget), "plugin"); +@@ -155,20 +155,20 @@ + *x = ox; + if (*x + w > gdk_screen_width()) + #if GTK_CHECK_VERSION(2,18,0) +- *x = ox + allocation.width - w; ++ *x = ox + allocation->width - w; + #else + *x = ox + widget->allocation.width - w; + #endif + *y = oy - h; + if (*y < 0) + #if GTK_CHECK_VERSION(2,18,0) +- *y = oy + allocation.height; ++ *y = oy + allocation->height; + #else + *y = oy + widget->allocation.height; + #endif + } else { + #if GTK_CHECK_VERSION(2,18,0) +- *x = ox + allocation.width; ++ *x = ox + allocation->width; + #else + *x = ox + widget->allocation.width; + #endif +@@ -177,19 +177,22 @@ + *y = oy; + if (*y + h > gdk_screen_height()) + #if GTK_CHECK_VERSION(2,18,0) +- *y = oy + allocation.height - h; ++ *y = oy + allocation->height - h; + #else + *y = oy + widget->allocation.height - h; + #endif + } + DBG("widget: x,y=%d,%d w,h=%d,%d\n", ox, oy, + #if GTK_CHECK_VERSION(2,18,0) +- allocation.width, allocation.height ); ++ allocation->width, allocation->height ); + #else + widget->allocation.width, widget->allocation.height ); + #endif + DBG("w-h %d %d\n", w, h); + *push_in = TRUE; ++#if GTK_CHECK_VERSION(2,18,0) ++ g_free (allocation); ++#endif + RET(); + } + +@@ -634,8 +637,8 @@ + { + ENTER; + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_get_allocation(widget, &allocation); ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); + #endif + + /* Standard right-click handling. */ +@@ -644,14 +647,17 @@ + + if ((event->type == GDK_BUTTON_PRESS) + #if GTK_CHECK_VERSION(2,18,0) +- && (event->x >=0 && event->x < allocation.width) +- && (event->y >=0 && event->y < allocation.height)) { ++ && (event->x >=0 && event->x < allocation->width) ++ && (event->y >=0 && event->y < allocation->height)) { + #else + && (event->x >=0 && event->x < widget->allocation.width) + && (event->y >=0 && event->y < widget->allocation.height)) { + #endif + show_menu( widget, plugin, event->button, event->time ); + } ++#if GTK_CHECK_VERSION(2,18,0) ++ g_free (allocation); ++#endif + RET(TRUE); + } + +Index: lxpanel-0.5.8/src/plugins/pager.c +=================================================================== +--- lxpanel-0.5.8.orig/src/plugins/pager.c 2011-10-05 23:55:47.000000000 +0200 ++++ lxpanel-0.5.8/src/plugins/pager.c 2011-10-05 23:56:29.000000000 +0200 +@@ -271,10 +271,10 @@ + { + /* Allocate pixmap and statistics buffer without border pixels. */ + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_get_allocation(widget, &allocation); +- int new_pixmap_width = allocation.width; +- int new_pixmap_height = allocation.height; ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); ++ int new_pixmap_width = allocation->width; ++ int new_pixmap_height = allocation->height; + #else + int new_pixmap_width = widget->allocation.width; + int new_pixmap_height = widget->allocation.height; +@@ -292,8 +292,8 @@ + + /* Compute the horizontal and vertical scale factors, and mark the desktop for redraw. */ + #if GTK_CHECK_VERSION(2,18,0) +- d->scale_y = (gfloat) allocation.height / (gfloat) gdk_screen_height(); +- d->scale_x = (gfloat) allocation.width / (gfloat) gdk_screen_width(); ++ d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); ++ d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); + #else + d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); + d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); +@@ -305,6 +305,9 @@ + gtk_widget_set_size_request(widget, + (d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2) * d->pg->aspect_ratio, + d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2); ++#if GTK_CHECK_VERSION(2,18,0) ++ g_free (allocation); ++#endif + return FALSE; + } + +@@ -326,8 +329,8 @@ + { + GtkWidget * widget = GTK_WIDGET(d->da); + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_get_allocation(widget, &allocation); ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); + #endif + gdk_draw_rectangle( + d->pixmap, +@@ -336,7 +339,8 @@ + : style->dark_gc[GTK_STATE_NORMAL]), + TRUE, + #if GTK_CHECK_VERSION(2,18,0) +- 0, 0, allocation.width, allocation.height); ++ 0, 0, allocation->width, allocation->height); ++ g_free (allocation); + #else + 0, 0, widget->allocation.width, widget->allocation.height); + #endif diff -r 0ed344a8daed -r 2a1b70deab76 slim-theme-default/receipt --- a/slim-theme-default/receipt Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="slim-theme-default" -VERSION="1.3.5" -CATEGORY="customization" -SHORT_DESC="Default theme bundled with SLiM." -MAINTAINER="pankso@slitaz.org" -LICENSE="GPL2" -WEB_SITE="http://slim.berlios.de/" - -DEPENDS="slim" -WANTED="slim" -RELATED="slim slim-pam" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share/slim - cp -a $install/usr/share/slim/themes $fs/usr/share/slim -} - -post_install() -{ - chroot "$1/" slim-theme -sdefault -} - -pre_remove() -{ - chroot "$1/" slim-theme -fdefault -} diff -r 0ed344a8daed -r 2a1b70deab76 slim/receipt --- a/slim/receipt Fri Aug 25 15:45:11 2017 +0300 +++ b/slim/receipt Sat Aug 26 12:10:59 2017 +0300 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="slim" VERSION="1.3.5" @@ -6,65 +6,85 @@ SHORT_DESC="Desktop-independent graphical login manager for X11" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://slim.berlios.de/" +WEB_SITE="https://sourceforge.net/projects/slim.berlios/" +HOST_ARCH="i486 arm" +COOKOPTS="!pngquant op8" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://download.berlios.de/slim/$TARBALL" -CONFIG_FILES="/etc/slim.conf" -HOST_ARCH="i486 arm" +WGET_URL="$SF_MIRROR/slim.berlios/$TARBALL" -RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too -SUGGESTED="slim-theme-default slitaz-configs" -DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu" -BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev" - -# Handle cross compilation -case "$ARCH" in - i?86) - BUILD_DEPENDS="$BUILD_DEPENDS cmake" - INCL=/usr/include - LIBS=/usr/lib ;; - arm*) - INCL=/cross/$ARCH/sysroot/usr/include - LIBS=/cross/$ARCH/sysroot/usr/lib ;; -esac +BUILD_DEPENDS_arm="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \ +xorg-libXmu-dev" +BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \ +libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev" +SPLIT="slim-theme-default slim" +SIBLINGS="slim-pam" # Rules to configure and make the package. compile_rules() { - patch -p1 < $stuff/$PACKAGE-$VERSION.patch || return 1 + # Handle cross compilation + case "$ARCH" in + i?86) + INCL=/usr/include + LIBS=/usr/lib ;; + arm*) + INCL=/cross/$ARCH/sysroot/usr/include + LIBS=/cross/$ARCH/sysroot/usr/lib ;; + esac + mkdir build; cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DX11_Xmu_LIB="$LIBS/libXmu.so" \ - -DX11_Xft_INCLUDE_PATH=${INCL} \ - -DX11_Xmu_INCLUDE_PATH= ${INCL} \ + -DX11_Xft_INCLUDE_PATH=$INCL \ + -DX11_Xmu_INCLUDE_PATH=$INCL \ .. && make && - make DESTDIR=$DESTDIR install + make DESTDIR=$DESTDIR install || exit 1 + + cp -r $stuff/themes $install/usr/share/slim + + # Config file and rc script. + cp -a $stuff/etc $install + + # slim-theme manager & default strings + install -m755 $stuff/slim-theme $install/usr/bin/slim-theme + install -m644 $stuff/strings $install/usr/share/slim/strings + + chown -R root:root $install } # Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share/slim - cp -a $install/etc $fs - cp -a $install/usr/bin $fs/usr - cp -a $stuff/themes $fs/usr/share/slim - - # Config file and rc script. - cp -a $stuff/etc $fs - chown -R root.root $fs - - # slim-theme manager & default strings - install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme - install -m644 $stuff/strings $fs/usr/share/slim/strings +genpkg_rules() { + case $PACKAGE in + slim-theme-default) + CAT="customization|default theme bundled with SLiM" + copy default/ + DEPENDS="slim slitaz-configs-base" + ;; + slim) + copy @std + remove_already_packed + DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \ + xorg-libXft xorg-libXmu xorg-libXrender zlib" + CONFIG_FILES="/etc/slim.conf" + SUGGESTED="slim-theme-default slitaz-configs" + ;; + esac } -post_install() -{ - local USER - USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd") +post_install_slim() { + local USER=$(awk -F: '/:1000:1000:/ { print $1 }' "$1/etc/passwd") [ -n "$USER" ] && sed -i s/"default_user .*"/"default_user $USER"/ "$1/etc/slim.conf" sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf" } + +post_install_slim_theme_default() { + chroot "$1/" slim-theme -sdefault +} + +pre_remove_slim_theme_default() { + chroot "$1/" slim-theme -fdefault +} diff -r 0ed344a8daed -r 2a1b70deab76 slim/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slim/stuff/patches/series Sat Aug 26 12:10:59 2017 +0300 @@ -0,0 +1,1 @@ +slim-1.3.5.patch diff -r 0ed344a8daed -r 2a1b70deab76 slim/stuff/patches/slim-1.3.5.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slim/stuff/patches/slim-1.3.5.patch Sat Aug 26 12:10:59 2017 +0300 @@ -0,0 +1,169 @@ +--- slim-1.3.5/app.cpp ++++ slim-1.3.5/app.cpp + +Link forgotten header. +@@ -25,6 +25,7 @@ + #include "app.h" + #include "numlock.h" + #include "util.h" ++#include + + #ifdef HAVE_SHADOW + #include + +Option not to enter root's password if special command was given in the +login field (suspend, halt or reboot). +@@ -437,6 +438,11 @@ + case Panel::Console: + logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl; + return true; /* <--- This is simply fake! */ ++ case Panel::Suspend: ++ case Panel::Halt: ++ case Panel::Reboot: ++ if (cfg->getOption("root_password") == "false") ++ return true; + default: + break; + } + + +--- slim-1.3.5/cfg.cpp ++++ slim-1.3.5/cfg.cpp + +Change default settings for SliTaz. +@@ -28,34 +28,35 @@ + : currentSession(-1) + { + /* Configuration options */ +- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); +- options.insert(option("default_xserver","/usr/bin/X")); ++ options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin")); ++ options.insert(option("default_xserver","/usr/bin/Xorg")); + options.insert(option("xserver_arguments","")); + options.insert(option("numlock","")); + options.insert(option("daemon","")); + options.insert(option("xauth_path","/usr/bin/xauth")); +- options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session")); +- options.insert(option("halt_cmd","/sbin/shutdown -h now")); +- options.insert(option("reboot_cmd","/sbin/shutdown -r now")); ++ options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session")); ++ options.insert(option("halt_cmd","/sbin/poweroff")); ++ options.insert(option("reboot_cmd","/sbin/reboot")); ++ options.insert(option("root_password","true")); + options.insert(option("suspend_cmd","")); + options.insert(option("sessionstart_cmd","")); + options.insert(option("sessionstop_cmd","")); +- options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login""")); +- options.insert(option("screenshot_cmd","import -window root /slim.png")); ++ options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -T ""Console login"" -e /bin/sh -l -c ""exec /bin/login""")); ++ options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png")); + options.insert(option("welcome_msg","Welcome to %host")); + options.insert(option("session_msg","Session:")); +- options.insert(option("default_user","")); ++ options.insert(option("default_user","tux")); + options.insert(option("focus_password","no")); + options.insert(option("auto_login","no")); +- options.insert(option("current_theme","default")); +- options.insert(option("lockfile","/var/run/slim.lock")); ++ options.insert(option("current_theme","slitaz,base")); ++ options.insert(option("lockfile","/var/lock/slim.lock")); + options.insert(option("logfile","/var/log/slim.log")); + options.insert(option("authfile","/var/run/slim.auth")); +- options.insert(option("shutdown_msg","The system is halting...")); ++ options.insert(option("shutdown_msg","The system is going down...")); + options.insert(option("reboot_msg","The system is rebooting...")); +- options.insert(option("sessions","wmaker,blackbox,icewm")); ++ options.insert(option("sessions","openbox,e17,jwm")); + options.insert(option("sessiondir","")); +- options.insert(option("hidecursor","false")); ++ options.insert(option("hidecursor","true")); + + /* Theme stuff */ + options.insert(option("input_panel_x","50%")); + + +--- slim-1.3.5/slim.conf.original ++++ slim-1.3.5/slim.conf + +Change default settings for SliTaz too. +@@ -1,13 +1,16 @@ ++# /etc/slim.conf: Slim LogIn Manger configuration file ++# ++ + # Path, X server and arguments (if needed) + # Note: -xauth $authfile is automatically appended +-default_path /bin:/usr/bin:/usr/local/bin +-default_xserver /usr/bin/X ++default_path ./:/bin:/usr/bin:/usr/local/bin ++default_xserver /usr/bin/Xorg + #xserver_arguments -dpi 75 + + # Commands for halt, login, etc. +-halt_cmd /sbin/shutdown -h now +-reboot_cmd /sbin/shutdown -r now +-console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" ++halt_cmd /sbin/poweroff ++reboot_cmd /sbin/reboot ++console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login" + #suspend_cmd /usr/sbin/suspend + + # Full path to the xauth binary +@@ -22,7 +25,7 @@ + + # Hide the mouse cursor (note: does not work with some WMs). + # Valid values: true|false +-# hidecursor false ++hidecursor true + + # This command is executed after a succesful login. + # you can place the %session and %theme variables +@@ -33,7 +36,7 @@ + # to adjust the command according to your preferred shell, + # i.e. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec /bin/sh -l ~/.xinitrc %session + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -51,10 +54,10 @@ + # The current chosen session name is replaced in the login_cmd + # above, so your login command can handle different sessions. + # see the xinitrc.sample file shipped with slim sources +-sessions xfce4,icewm-session,wmaker,blackbox ++sessions openbox,e17,jwm + + # Executed when pressing F11 (requires imagemagick) +-screenshot_cmd import -window root /slim.png ++#screenshot_cmd mtpaint -s /root/slim-shot.png + + # welcome message. Available variables: %host, %domain + welcome_msg Welcome to %host +@@ -63,12 +66,12 @@ + # session_msg Session: + + # shutdown / reboot messages +-shutdown_msg The system is halting... ++shutdown_msg The system is going down... + reboot_msg The system is rebooting... + + # default user, leave blank or remove this line + # for avoid pre-loading the username. +-#default_user simone ++default_user tux + + # Focus the password field on start when default_user is set + # Set to "yes" to enable this feature +@@ -81,10 +84,10 @@ + + # current theme, use comma separated list to specify a set to + # randomly choose from +-current_theme default ++current_theme slitaz,base + + # Lock file +-lockfile /var/run/slim.lock ++lockfile /var/lock/slim.lock + + # Log file + logfile /var/log/slim.log diff -r 0ed344a8daed -r 2a1b70deab76 slim/stuff/slim-1.3.5.patch --- a/slim/stuff/slim-1.3.5.patch Fri Aug 25 15:45:11 2017 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ ---- slim-1.3.5/app.cpp -+++ slim-1.3.5/app.cpp - -Link forgotten header. -@@ -25,6 +25,7 @@ - #include "app.h" - #include "numlock.h" - #include "util.h" -+#include - - #ifdef HAVE_SHADOW - #include - -Option not to enter root's password if special command was given in the -login field (suspend, halt or reboot). -@@ -437,6 +438,11 @@ - case Panel::Console: - logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl; - return true; /* <--- This is simply fake! */ -+ case Panel::Suspend: -+ case Panel::Halt: -+ case Panel::Reboot: -+ if (cfg->getOption("root_password") == "false") -+ return true; - default: - break; - } - - ---- slim-1.3.5/cfg.cpp -+++ slim-1.3.5/cfg.cpp - -Change default settings for SliTaz. -@@ -28,34 +28,35 @@ - : currentSession(-1) - { - /* Configuration options */ -- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); -- options.insert(option("default_xserver","/usr/bin/X")); -+ options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin")); -+ options.insert(option("default_xserver","/usr/bin/Xorg")); - options.insert(option("xserver_arguments","")); - options.insert(option("numlock","")); - options.insert(option("daemon","")); - options.insert(option("xauth_path","/usr/bin/xauth")); -- options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session")); -- options.insert(option("halt_cmd","/sbin/shutdown -h now")); -- options.insert(option("reboot_cmd","/sbin/shutdown -r now")); -+ options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session")); -+ options.insert(option("halt_cmd","/sbin/poweroff")); -+ options.insert(option("reboot_cmd","/sbin/reboot")); -+ options.insert(option("root_password","true")); - options.insert(option("suspend_cmd","")); - options.insert(option("sessionstart_cmd","")); - options.insert(option("sessionstop_cmd","")); -- options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login""")); -- options.insert(option("screenshot_cmd","import -window root /slim.png")); -+ options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -T ""Console login"" -e /bin/sh -l -c ""exec /bin/login""")); -+ options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png")); - options.insert(option("welcome_msg","Welcome to %host")); - options.insert(option("session_msg","Session:")); -- options.insert(option("default_user","")); -+ options.insert(option("default_user","tux")); - options.insert(option("focus_password","no")); - options.insert(option("auto_login","no")); -- options.insert(option("current_theme","default")); -- options.insert(option("lockfile","/var/run/slim.lock")); -+ options.insert(option("current_theme","slitaz,base")); -+ options.insert(option("lockfile","/var/lock/slim.lock")); - options.insert(option("logfile","/var/log/slim.log")); - options.insert(option("authfile","/var/run/slim.auth")); -- options.insert(option("shutdown_msg","The system is halting...")); -+ options.insert(option("shutdown_msg","The system is going down...")); - options.insert(option("reboot_msg","The system is rebooting...")); -- options.insert(option("sessions","wmaker,blackbox,icewm")); -+ options.insert(option("sessions","openbox,e17,jwm")); - options.insert(option("sessiondir","")); -- options.insert(option("hidecursor","false")); -+ options.insert(option("hidecursor","true")); - - /* Theme stuff */ - options.insert(option("input_panel_x","50%")); - - ---- slim-1.3.5/slim.conf.original -+++ slim-1.3.5/slim.conf - -Change default settings for SliTaz too. -@@ -1,13 +1,16 @@ -+# /etc/slim.conf: Slim LogIn Manger configuration file -+# -+ - # Path, X server and arguments (if needed) - # Note: -xauth $authfile is automatically appended --default_path /bin:/usr/bin:/usr/local/bin --default_xserver /usr/bin/X -+default_path ./:/bin:/usr/bin:/usr/local/bin -+default_xserver /usr/bin/Xorg - #xserver_arguments -dpi 75 - - # Commands for halt, login, etc. --halt_cmd /sbin/shutdown -h now --reboot_cmd /sbin/shutdown -r now --console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" -+halt_cmd /sbin/poweroff -+reboot_cmd /sbin/reboot -+console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login" - #suspend_cmd /usr/sbin/suspend - - # Full path to the xauth binary -@@ -22,7 +25,7 @@ - - # Hide the mouse cursor (note: does not work with some WMs). - # Valid values: true|false --# hidecursor false -+hidecursor true - - # This command is executed after a succesful login. - # you can place the %session and %theme variables -@@ -33,7 +36,7 @@ - # to adjust the command according to your preferred shell, - # i.e. for freebsd use: - # login_cmd exec /bin/sh - ~/.xinitrc %session --login_cmd exec /bin/bash -login ~/.xinitrc %session -+login_cmd exec /bin/sh -l ~/.xinitrc %session - - # Commands executed when starting and exiting a session. - # They can be used for registering a X11 session with -@@ -51,10 +54,10 @@ - # The current chosen session name is replaced in the login_cmd - # above, so your login command can handle different sessions. - # see the xinitrc.sample file shipped with slim sources --sessions xfce4,icewm-session,wmaker,blackbox -+sessions openbox,e17,jwm - - # Executed when pressing F11 (requires imagemagick) --screenshot_cmd import -window root /slim.png -+#screenshot_cmd mtpaint -s /root/slim-shot.png - - # welcome message. Available variables: %host, %domain - welcome_msg Welcome to %host -@@ -63,12 +66,12 @@ - # session_msg Session: - - # shutdown / reboot messages --shutdown_msg The system is halting... -+shutdown_msg The system is going down... - reboot_msg The system is rebooting... - - # default user, leave blank or remove this line - # for avoid pre-loading the username. --#default_user simone -+default_user tux - - # Focus the password field on start when default_user is set - # Set to "yes" to enable this feature -@@ -81,10 +84,10 @@ - - # current theme, use comma separated list to specify a set to - # randomly choose from --current_theme default -+current_theme slitaz,base - - # Lock file --lockfile /var/run/slim.lock -+lockfile /var/lock/slim.lock - - # Log file - logfile /var/log/slim.log diff -r 0ed344a8daed -r 2a1b70deab76 tazlito/receipt --- a/tazlito/receipt Fri Aug 25 15:45:11 2017 +0300 +++ b/tazlito/receipt Sat Aug 26 12:10:59 2017 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="tazlito" -VERSION="455" +VERSION="459" CATEGORY="base-system" SHORT_DESC="SliTaz Live Tool" MAINTAINER="pascal.bellard@slitaz.org"