wok-next rev 19845
Up cookutils, lxpanel, slim, tazlito.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Aug 26 12:10:59 2017 +0300 (2017-08-26) |
| parents | 0ed344a8daed |
| children | 0a5086f5c5dd |
| files | cookutils/receipt lxpanel-dev/receipt lxpanel-extra/receipt lxpanel/receipt lxpanel/stuff/batt.chg.level.patch lxpanel/stuff/configure_desktop_number.patch lxpanel/stuff/cpu-size-color.patch lxpanel/stuff/fix_position.patch lxpanel/stuff/patches/batt.chg.level.patch lxpanel/stuff/patches/configure_desktop_number.patch lxpanel/stuff/patches/cpu-size-color.patch lxpanel/stuff/patches/fix_position.patch slim-theme-default/receipt slim/receipt slim/stuff/patches/series slim/stuff/patches/slim-1.3.5.patch slim/stuff/slim-1.3.5.patch tazlito/receipt |
line diff
1.1 --- a/cookutils/receipt Fri Aug 25 15:45:11 2017 +0300 1.2 +++ b/cookutils/receipt Sat Aug 26 12:10:59 2017 +0300 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="cookutils" 1.7 -VERSION="957" 1.8 +VERSION="960" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="SliTaz packages builder new generation" 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/lxpanel-dev/receipt Fri Aug 25 15:45:11 2017 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,22 +0,0 @@ 2.4 -# SliTaz package receipt. 2.5 - 2.6 -PACKAGE="lxpanel-dev" 2.7 -VERSION="0.6.2" 2.8 -CATEGORY="x-window" 2.9 -SHORT_DESC="LXDE panel (development)" 2.10 -MAINTAINER="pankso@slitaz.org" 2.11 -LICENSE="GPL2" 2.12 -WEB_SITE="http://www.lxde.org/" 2.13 -TAGS="LXDE" 2.14 -HOST_ARCH="i486 arm" 2.15 - 2.16 -WANTED="lxpanel" 2.17 -DEPENDS="pkg-config" 2.18 - 2.19 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.20 -genpkg_rules() 2.21 -{ 2.22 - mkdir -p $fs/usr/lib 2.23 - cp -a $install/usr/include $fs/usr 2.24 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 2.25 -}
3.1 --- a/lxpanel-extra/receipt Fri Aug 25 15:45:11 2017 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,32 +0,0 @@ 3.4 -# SliTaz package receipt. 3.5 - 3.6 -PACKAGE="lxpanel-extra" 3.7 -VERSION="0.6.2" 3.8 -CATEGORY="x-window" 3.9 -SHORT_DESC="LXDE panel (extra files and plugins)" 3.10 -MAINTAINER="pankso@slitaz.org" 3.11 -LICENSE="GPL2" 3.12 -WEB_SITE="http://www.lxde.org/" 3.13 -TAGS="LXDE" 3.14 - 3.15 -WANTED="lxpanel" 3.16 -DEPENDS="lxpanel libwnck" 3.17 - 3.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.19 -genpkg_rules() 3.20 -{ 3.21 - mkdir -p \ 3.22 - $fs/usr/lib/lxpanel/plugins \ 3.23 - $fs/usr/share/lxpanel/images 3.24 - # Plugins 3.25 - for p in kbled.so wnckpager.so 3.26 - do 3.27 - cp $install/usr/lib/lxpanel/plugins/$p \ 3.28 - $fs/usr/lib/lxpanel/plugins 3.29 - done 3.30 - # Images 3.31 - imgs=usr/share/lxpanel/images 3.32 - cp -a $install/$imgs/ns-*.png $fs/$imgs 3.33 - cp -a $install/$imgs/*lock-*.png $fs/$imgs 3.34 - cp -a $install/$imgs/xkb-flags $fs/$imgs 3.35 -}
4.1 --- a/lxpanel/receipt Fri Aug 25 15:45:11 2017 +0300 4.2 +++ b/lxpanel/receipt Sat Aug 26 12:10:59 2017 +0300 4.3 @@ -1,4 +1,4 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="lxpanel" 4.8 VERSION="0.6.2" 4.9 @@ -7,79 +7,85 @@ 4.10 MAINTAINER="pankso@slitaz.org" 4.11 LICENSE="GPL2" 4.12 WEB_SITE="http://www.lxde.org/" 4.13 +HOST_ARCH="i486 arm" 4.14 + 4.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.16 WGET_URL="$SF_MIRROR/lxde/$TARBALL" 4.17 -CONFIG_FILES="/etc/lxpanel/default" 4.18 -TAGS="LXDE gtk2 panel" 4.19 -HOST_ARCH="i486 arm" 4.20 4.21 -SUGGESTED="lxde lxsession slitaz-icon" 4.22 -DEPENDS="alsa-lib gtk+ menu-cache wireless_tools libxml2 slitaz-menus" 4.23 -BUILD_DEPENDS="gtk+-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \ 4.24 +BUILD_DEPENDS_arm="gtk+-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \ 4.25 libxml2-dev lxmenu-data" 4.26 - 4.27 -# Handle cross compilation 4.28 -case "$ARCH" in 4.29 - i?86) 4.30 - BUILD_DEPENDS="$BUILD_DEPENDS libwnck-dev" 4.31 - pluglist="all" ;; 4.32 - arm*) 4.33 - pluglist="netstatus,volumealsa,cpu,batt,xkb,thermal,cpufreq,monitors" ;; 4.34 -esac 4.35 +BUILD_DEPENDS="intltool gtk+-dev menu-cache-dev alsa-lib-dev \ 4.36 +wireless_tools-dev libxml2-dev lxmenu-data libwnck2-dev" 4.37 +SPLIT="lxpanel-extra lxpanel lxpanel-dev" 4.38 4.39 # Rules to configure and make the package. 4.40 compile_rules() 4.41 { 4.42 + case "$ARCH" in 4.43 + i?86) pluglist="all";; 4.44 + arm*) pluglist="netstatus,volumealsa,cpu,batt,xkb,thermal,cpufreq,monitors";; 4.45 + esac 4.46 + 4.47 # Match default desktop colors 4.48 - sed -i s'/gdk_color_parse("green"/gdk_color_parse("#cfcfcf"/' \ 4.49 + sed -i 's|gdk_color_parse("green"|gdk_color_parse("#cfcfcf"|' \ 4.50 src/plugins/cpu/cpu.c || return 1 4.51 + 4.52 ./configure \ 4.53 --sysconfdir=/etc \ 4.54 --localstatedir=/var \ 4.55 --with-plugins="$pluglist" \ 4.56 $CONFIGURE_ARGS && 4.57 - make && make install 4.58 + make && make install || exit 1 4.59 + 4.60 + # Move profile to /etc/lxpanel (/usr maybe read-only) and default config 4.61 + mkdir -p $install/etc/lxpanel 4.62 + mv $install/usr/share/lxpanel/profile/* $install/etc/lxpanel 4.63 + ln -sf /etc/lxpanel $install/usr/share/lxpanel/profile 4.64 + mv -f $install/etc/lxpanel/default $install/etc/lxpanel/original 4.65 + cp -a $stuff/default $install/etc/lxpanel 4.66 + rm -rf $install/etc/lxpanel/two_panels 4.67 + 4.68 + # XDG autostart desktop file (lxsession will use it automaticaly) 4.69 + mkdir -p $install/etc/xdg 4.70 + cp -a $stuff/autostart $install/etc/xdg 4.71 + 4.72 + chown -R root:root $install 4.73 } 4.74 4.75 # Rules to gen a SliTaz package suitable for Tazpkg. 4.76 genpkg_rules() 4.77 { 4.78 - mkdir -p \ 4.79 - $fs/usr/lib \ 4.80 - $fs/usr/share/lxpanel/images \ 4.81 - $fs/etc/lxpanel \ 4.82 - $fs/etc/xdg 4.83 - 4.84 - cp -a $install/usr/bin $fs/usr 4.85 - 4.86 - # Plugins (kbled -> lxpanel-extra) 4.87 - cp -a $install/usr/lib/lxpanel $fs/usr/lib 4.88 - find $fs -name kbled.so -delete 4.89 - find $fs -name wnckpager.so -delete 4.90 - 4.91 - # Images 4.92 - imgs=usr/share/lxpanel/images 4.93 - for i in clock cpufreq-icon my-computer; do 4.94 - cp -a $install/$imgs/$i.png $fs/$imgs 4.95 - done 4.96 - 4.97 - # Move profile to /etc/lxpanel (/usr maybe read-only) and default config 4.98 - cp -a $install/usr/share/lxpanel/profile/* $fs/etc/lxpanel 4.99 - ln -sf /etc/lxpanel $fs/usr/share/lxpanel/profile 4.100 - mv -f $fs/etc/lxpanel/default $fs/etc/lxpanel/original 4.101 - cp -a $stuff/default $fs/etc/lxpanel 4.102 - rm -rf $fs/etc/lxpanel/two_panels 4.103 - 4.104 - # XDG autostart desktop file (lxsession will use it automaticaly) 4.105 - cp -a $stuff/autostart $fs/etc/xdg 4.106 - 4.107 - cp -a $install/usr/share/lxpanel/ui $fs/usr/share/lxpanel 4.108 - cp -a $install/usr/share/lxpanel/x* $fs/usr/share/lxpanel 4.109 + case $PACKAGE in 4.110 + lxpanel-extra) 4.111 + copy kbled.so wnckpager.so ns-*.png *lock-*.png xkb-flags/ \ 4.112 + background.png file-manager.png gnome-*.png mute.png \ 4.113 + stock_volume.png volume-*.png window-manager.png 4.114 + CAT="x-window|extra files and plugins" 4.115 + TAGS="LXDE" 4.116 + DEPENDS="lxpanel libwnck2 startup-notification xorg-xcb-util" 4.117 + ;; 4.118 + lxpanel) 4.119 + copy @std 4.120 + remove_already_packed 4.121 + DEPENDS="alsa-lib atk bzlib cairo fontconfig freetype gdk-pixbuf \ 4.122 + glib gtk+ libffi libharfbuzz liblzma libpng16 libxml2 menu-cache \ 4.123 + pango pcre util-linux-blkid util-linux-mount util-linux-uuid \ 4.124 + wireless_tools xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 4.125 + xorg-libXrender xorg-libxcb xorg-pixman zlib slitaz-menus" 4.126 + CONFIG_FILES="/etc/lxpanel/default/" 4.127 + TAGS="LXDE gtk2 panel" 4.128 + SUGGESTED="lxde lxsession slitaz-icon" 4.129 + ;; 4.130 + lxpanel-dev) 4.131 + copy @dev 4.132 + DEPENDS="lxpanel lxpanel-extra \ 4.133 + glib-dev menu-cache-dev" 4.134 + ;; 4.135 + esac 4.136 } 4.137 4.138 -post_install() 4.139 -{ 4.140 - # clean LXPanel menu caches 4.141 +# Clean LXPanel menu caches 4.142 +post_install() { 4.143 chroot "$1/" rm home/*/.cache/menus/* 2>/dev/null 4.144 : 4.145 }
5.1 --- a/lxpanel/stuff/batt.chg.level.patch Fri Aug 25 15:45:11 2017 +0300 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,11 +0,0 @@ 5.4 ---- /src/plugins/batt/batt_sys.c.orig 5.5 -+++ /src/plugins/batt/batt_sys.c 5.6 -@@ -220,7 +220,7 @@ 5.7 - if (b->last_capacity < MIN_CAPACITY) 5.8 - b->percentage = 0; 5.9 - else 5.10 -- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; 5.11 -+ b->percentage = ((float) b->remaining_capacity * 100.0) / (float) b->last_capacity; 5.12 - 5.13 - if (b->percentage > 100) 5.14 - b->percentage = 100;
6.1 --- a/lxpanel/stuff/configure_desktop_number.patch Fri Aug 25 15:45:11 2017 +0300 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,95 +0,0 @@ 6.4 -Description: Add configuration for desktop number for the pager plugin. 6.5 -Author: Julien Lavergne <gilir@ubuntu.com> 6.6 - 6.7 ---- a/src/plugins/pager.c 6.8 -+++ b/src/plugins/pager.c 6.9 -@@ -811,6 +811,80 @@ 6.10 - g_free(pg); 6.11 - } 6.12 - 6.13 -+/* Callback when the configuration dialog is to be shown. */ 6.14 -+static void deskno_configure(Plugin * p, GtkWindow * parent) 6.15 -+{ 6.16 -+ 6.17 -+ GdkScreen *screen = gdk_screen_get_default(); 6.18 -+ const char *wm_name = gdk_x11_screen_get_window_manager_name(screen); 6.19 -+ GError *error = NULL; 6.20 -+ const gchar *command_line = NULL; 6.21 -+ 6.22 -+ if(g_strcmp0(wm_name, "Openbox") == 0) 6.23 -+ { 6.24 -+ if (g_find_program_in_path("obconf")) 6.25 -+ { 6.26 -+ command_line = "obconf"; 6.27 -+ } 6.28 -+ } 6.29 -+ else if (g_strcmp0(wm_name, "compiz") == 0) 6.30 -+ { 6.31 -+ if (g_find_program_in_path("ccsm")) 6.32 -+ { 6.33 -+ command_line = "ccsm"; 6.34 -+ 6.35 -+ } 6.36 -+ else if (g_find_program_in_path("simple-ccsm")) 6.37 -+ { 6.38 -+ command_line = "simple-ccsm"; 6.39 -+ } 6.40 -+ } 6.41 -+ else 6.42 -+ { 6.43 -+ 6.44 -+ GtkWidget* msg; 6.45 -+ 6.46 -+ msg = gtk_message_dialog_new( NULL, 6.47 -+ 0, 6.48 -+ GTK_MESSAGE_ERROR, 6.49 -+ GTK_BUTTONS_OK, 6.50 -+ _("Error, only openbox and compiz are supported") ); 6.51 -+ gtk_dialog_run( GTK_DIALOG(msg) ); 6.52 -+ gtk_widget_destroy( msg ); 6.53 -+ 6.54 -+ } 6.55 -+ 6.56 -+ if (command_line) 6.57 -+ { 6.58 -+ gdk_spawn_command_line_on_screen(screen, 6.59 -+ command_line, 6.60 -+ &error); 6.61 -+ } 6.62 -+ 6.63 -+ else 6.64 -+ { 6.65 -+ 6.66 -+ GtkWidget* msg; 6.67 -+ 6.68 -+ msg = gtk_message_dialog_new( NULL, 6.69 -+ 0, 6.70 -+ GTK_MESSAGE_ERROR, 6.71 -+ GTK_BUTTONS_OK, 6.72 -+ _("Error, you need to install obconf, ccsm of simple-ccsm") ); 6.73 -+ gtk_dialog_run( GTK_DIALOG(msg) ); 6.74 -+ gtk_widget_destroy( msg ); 6.75 -+ 6.76 -+ } 6.77 -+ 6.78 -+ if (error) 6.79 -+ { 6.80 -+ g_print("%s\n", error->message); 6.81 -+ 6.82 -+ g_free (error); 6.83 -+ } 6.84 -+ 6.85 -+} 6.86 -+ 6.87 - /* Callback when panel configuration changes. */ 6.88 - static void pager_panel_configuration_changed(Plugin * p) 6.89 - { 6.90 -@@ -836,7 +910,7 @@ 6.91 - 6.92 - constructor : pager_constructor, 6.93 - destructor : pager_destructor, 6.94 -- config : NULL, 6.95 -+ config : deskno_configure, 6.96 - save : NULL, 6.97 - panel_configuration_changed : pager_panel_configuration_changed 6.98 - };
7.1 --- a/lxpanel/stuff/cpu-size-color.patch Fri Aug 25 15:45:11 2017 +0300 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,19 +0,0 @@ 7.4 ---- src/plugins/cpu/cpu.c 7.5 -+++ src/plugins/cpu/cpu.c.taz 7.6 -@@ -222,14 +222,14 @@ 7.7 - 7.8 - /* Allocate drawing area as a child of top level widget. Enable button press events. */ 7.9 - c->da = gtk_drawing_area_new(); 7.10 -- gtk_widget_set_size_request(c->da, 40, PANEL_HEIGHT_DEFAULT); 7.11 -+ gtk_widget_set_size_request(c->da, 26, PANEL_HEIGHT_DEFAULT); 7.12 - gtk_widget_add_events(c->da, GDK_BUTTON_PRESS_MASK); 7.13 - gtk_container_add(GTK_CONTAINER(p->pwid), c->da); 7.14 - 7.15 - /* Clone a graphics context and set "green" as its foreground color. 7.16 - * We will use this to draw the graph. */ 7.17 - c->graphics_context = gdk_gc_new(p->panel->topgwin->window); 7.18 -- gdk_color_parse("green", &c->foreground_color); 7.19 -+ gdk_color_parse("#cfcfcf", &c->foreground_color); 7.20 - gdk_colormap_alloc_color(gdk_drawable_get_colormap(p->panel->topgwin->window), &c->foreground_color, FALSE, TRUE); 7.21 - gdk_gc_set_foreground(c->graphics_context, &c->foreground_color); 7.22 -
8.1 --- a/lxpanel/stuff/fix_position.patch Fri Aug 25 15:45:11 2017 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,156 +0,0 @@ 8.4 -Index: lxpanel-0.5.8/src/plugins/menu.c 8.5 -=================================================================== 8.6 ---- lxpanel-0.5.8.orig/src/plugins/menu.c 2011-10-05 23:55:47.000000000 +0200 8.7 -+++ lxpanel-0.5.8/src/plugins/menu.c 2011-10-05 23:55:49.000000000 +0200 8.8 -@@ -131,8 +131,8 @@ 8.9 - int ox, oy, w, h; 8.10 - Plugin *p; 8.11 - #if GTK_CHECK_VERSION(2,18,0) 8.12 -- GtkAllocation allocation; 8.13 -- gtk_widget_set_allocation(widget, &allocation); 8.14 -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 8.15 -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 8.16 - #endif 8.17 - ENTER; 8.18 - p = g_object_get_data(G_OBJECT(widget), "plugin"); 8.19 -@@ -155,20 +155,20 @@ 8.20 - *x = ox; 8.21 - if (*x + w > gdk_screen_width()) 8.22 - #if GTK_CHECK_VERSION(2,18,0) 8.23 -- *x = ox + allocation.width - w; 8.24 -+ *x = ox + allocation->width - w; 8.25 - #else 8.26 - *x = ox + widget->allocation.width - w; 8.27 - #endif 8.28 - *y = oy - h; 8.29 - if (*y < 0) 8.30 - #if GTK_CHECK_VERSION(2,18,0) 8.31 -- *y = oy + allocation.height; 8.32 -+ *y = oy + allocation->height; 8.33 - #else 8.34 - *y = oy + widget->allocation.height; 8.35 - #endif 8.36 - } else { 8.37 - #if GTK_CHECK_VERSION(2,18,0) 8.38 -- *x = ox + allocation.width; 8.39 -+ *x = ox + allocation->width; 8.40 - #else 8.41 - *x = ox + widget->allocation.width; 8.42 - #endif 8.43 -@@ -177,19 +177,22 @@ 8.44 - *y = oy; 8.45 - if (*y + h > gdk_screen_height()) 8.46 - #if GTK_CHECK_VERSION(2,18,0) 8.47 -- *y = oy + allocation.height - h; 8.48 -+ *y = oy + allocation->height - h; 8.49 - #else 8.50 - *y = oy + widget->allocation.height - h; 8.51 - #endif 8.52 - } 8.53 - DBG("widget: x,y=%d,%d w,h=%d,%d\n", ox, oy, 8.54 - #if GTK_CHECK_VERSION(2,18,0) 8.55 -- allocation.width, allocation.height ); 8.56 -+ allocation->width, allocation->height ); 8.57 - #else 8.58 - widget->allocation.width, widget->allocation.height ); 8.59 - #endif 8.60 - DBG("w-h %d %d\n", w, h); 8.61 - *push_in = TRUE; 8.62 -+#if GTK_CHECK_VERSION(2,18,0) 8.63 -+ g_free (allocation); 8.64 -+#endif 8.65 - RET(); 8.66 - } 8.67 - 8.68 -@@ -634,8 +637,8 @@ 8.69 - { 8.70 - ENTER; 8.71 - #if GTK_CHECK_VERSION(2,18,0) 8.72 -- GtkAllocation allocation; 8.73 -- gtk_widget_get_allocation(widget, &allocation); 8.74 -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 8.75 -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 8.76 - #endif 8.77 - 8.78 - /* Standard right-click handling. */ 8.79 -@@ -644,14 +647,17 @@ 8.80 - 8.81 - if ((event->type == GDK_BUTTON_PRESS) 8.82 - #if GTK_CHECK_VERSION(2,18,0) 8.83 -- && (event->x >=0 && event->x < allocation.width) 8.84 -- && (event->y >=0 && event->y < allocation.height)) { 8.85 -+ && (event->x >=0 && event->x < allocation->width) 8.86 -+ && (event->y >=0 && event->y < allocation->height)) { 8.87 - #else 8.88 - && (event->x >=0 && event->x < widget->allocation.width) 8.89 - && (event->y >=0 && event->y < widget->allocation.height)) { 8.90 - #endif 8.91 - show_menu( widget, plugin, event->button, event->time ); 8.92 - } 8.93 -+#if GTK_CHECK_VERSION(2,18,0) 8.94 -+ g_free (allocation); 8.95 -+#endif 8.96 - RET(TRUE); 8.97 - } 8.98 - 8.99 -Index: lxpanel-0.5.8/src/plugins/pager.c 8.100 -=================================================================== 8.101 ---- lxpanel-0.5.8.orig/src/plugins/pager.c 2011-10-05 23:55:47.000000000 +0200 8.102 -+++ lxpanel-0.5.8/src/plugins/pager.c 2011-10-05 23:56:29.000000000 +0200 8.103 -@@ -271,10 +271,10 @@ 8.104 - { 8.105 - /* Allocate pixmap and statistics buffer without border pixels. */ 8.106 - #if GTK_CHECK_VERSION(2,18,0) 8.107 -- GtkAllocation allocation; 8.108 -- gtk_widget_get_allocation(widget, &allocation); 8.109 -- int new_pixmap_width = allocation.width; 8.110 -- int new_pixmap_height = allocation.height; 8.111 -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 8.112 -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 8.113 -+ int new_pixmap_width = allocation->width; 8.114 -+ int new_pixmap_height = allocation->height; 8.115 - #else 8.116 - int new_pixmap_width = widget->allocation.width; 8.117 - int new_pixmap_height = widget->allocation.height; 8.118 -@@ -292,8 +292,8 @@ 8.119 - 8.120 - /* Compute the horizontal and vertical scale factors, and mark the desktop for redraw. */ 8.121 - #if GTK_CHECK_VERSION(2,18,0) 8.122 -- d->scale_y = (gfloat) allocation.height / (gfloat) gdk_screen_height(); 8.123 -- d->scale_x = (gfloat) allocation.width / (gfloat) gdk_screen_width(); 8.124 -+ d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); 8.125 -+ d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); 8.126 - #else 8.127 - d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); 8.128 - d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); 8.129 -@@ -305,6 +305,9 @@ 8.130 - gtk_widget_set_size_request(widget, 8.131 - (d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2) * d->pg->aspect_ratio, 8.132 - d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2); 8.133 -+#if GTK_CHECK_VERSION(2,18,0) 8.134 -+ g_free (allocation); 8.135 -+#endif 8.136 - return FALSE; 8.137 - } 8.138 - 8.139 -@@ -326,8 +329,8 @@ 8.140 - { 8.141 - GtkWidget * widget = GTK_WIDGET(d->da); 8.142 - #if GTK_CHECK_VERSION(2,18,0) 8.143 -- GtkAllocation allocation; 8.144 -- gtk_widget_get_allocation(widget, &allocation); 8.145 -+ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 8.146 -+ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 8.147 - #endif 8.148 - gdk_draw_rectangle( 8.149 - d->pixmap, 8.150 -@@ -336,7 +339,8 @@ 8.151 - : style->dark_gc[GTK_STATE_NORMAL]), 8.152 - TRUE, 8.153 - #if GTK_CHECK_VERSION(2,18,0) 8.154 -- 0, 0, allocation.width, allocation.height); 8.155 -+ 0, 0, allocation->width, allocation->height); 8.156 -+ g_free (allocation); 8.157 - #else 8.158 - 0, 0, widget->allocation.width, widget->allocation.height); 8.159 - #endif
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/lxpanel/stuff/patches/batt.chg.level.patch Sat Aug 26 12:10:59 2017 +0300 9.3 @@ -0,0 +1,11 @@ 9.4 +--- /src/plugins/batt/batt_sys.c.orig 9.5 ++++ /src/plugins/batt/batt_sys.c 9.6 +@@ -220,7 +220,7 @@ 9.7 + if (b->last_capacity < MIN_CAPACITY) 9.8 + b->percentage = 0; 9.9 + else 9.10 +- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; 9.11 ++ b->percentage = ((float) b->remaining_capacity * 100.0) / (float) b->last_capacity; 9.12 + 9.13 + if (b->percentage > 100) 9.14 + b->percentage = 100;
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/lxpanel/stuff/patches/configure_desktop_number.patch Sat Aug 26 12:10:59 2017 +0300 10.3 @@ -0,0 +1,95 @@ 10.4 +Description: Add configuration for desktop number for the pager plugin. 10.5 +Author: Julien Lavergne <gilir@ubuntu.com> 10.6 + 10.7 +--- a/src/plugins/pager.c 10.8 ++++ b/src/plugins/pager.c 10.9 +@@ -811,6 +811,80 @@ 10.10 + g_free(pg); 10.11 + } 10.12 + 10.13 ++/* Callback when the configuration dialog is to be shown. */ 10.14 ++static void deskno_configure(Plugin * p, GtkWindow * parent) 10.15 ++{ 10.16 ++ 10.17 ++ GdkScreen *screen = gdk_screen_get_default(); 10.18 ++ const char *wm_name = gdk_x11_screen_get_window_manager_name(screen); 10.19 ++ GError *error = NULL; 10.20 ++ const gchar *command_line = NULL; 10.21 ++ 10.22 ++ if(g_strcmp0(wm_name, "Openbox") == 0) 10.23 ++ { 10.24 ++ if (g_find_program_in_path("obconf")) 10.25 ++ { 10.26 ++ command_line = "obconf"; 10.27 ++ } 10.28 ++ } 10.29 ++ else if (g_strcmp0(wm_name, "compiz") == 0) 10.30 ++ { 10.31 ++ if (g_find_program_in_path("ccsm")) 10.32 ++ { 10.33 ++ command_line = "ccsm"; 10.34 ++ 10.35 ++ } 10.36 ++ else if (g_find_program_in_path("simple-ccsm")) 10.37 ++ { 10.38 ++ command_line = "simple-ccsm"; 10.39 ++ } 10.40 ++ } 10.41 ++ else 10.42 ++ { 10.43 ++ 10.44 ++ GtkWidget* msg; 10.45 ++ 10.46 ++ msg = gtk_message_dialog_new( NULL, 10.47 ++ 0, 10.48 ++ GTK_MESSAGE_ERROR, 10.49 ++ GTK_BUTTONS_OK, 10.50 ++ _("Error, only openbox and compiz are supported") ); 10.51 ++ gtk_dialog_run( GTK_DIALOG(msg) ); 10.52 ++ gtk_widget_destroy( msg ); 10.53 ++ 10.54 ++ } 10.55 ++ 10.56 ++ if (command_line) 10.57 ++ { 10.58 ++ gdk_spawn_command_line_on_screen(screen, 10.59 ++ command_line, 10.60 ++ &error); 10.61 ++ } 10.62 ++ 10.63 ++ else 10.64 ++ { 10.65 ++ 10.66 ++ GtkWidget* msg; 10.67 ++ 10.68 ++ msg = gtk_message_dialog_new( NULL, 10.69 ++ 0, 10.70 ++ GTK_MESSAGE_ERROR, 10.71 ++ GTK_BUTTONS_OK, 10.72 ++ _("Error, you need to install obconf, ccsm of simple-ccsm") ); 10.73 ++ gtk_dialog_run( GTK_DIALOG(msg) ); 10.74 ++ gtk_widget_destroy( msg ); 10.75 ++ 10.76 ++ } 10.77 ++ 10.78 ++ if (error) 10.79 ++ { 10.80 ++ g_print("%s\n", error->message); 10.81 ++ 10.82 ++ g_free (error); 10.83 ++ } 10.84 ++ 10.85 ++} 10.86 ++ 10.87 + /* Callback when panel configuration changes. */ 10.88 + static void pager_panel_configuration_changed(Plugin * p) 10.89 + { 10.90 +@@ -836,7 +910,7 @@ 10.91 + 10.92 + constructor : pager_constructor, 10.93 + destructor : pager_destructor, 10.94 +- config : NULL, 10.95 ++ config : deskno_configure, 10.96 + save : NULL, 10.97 + panel_configuration_changed : pager_panel_configuration_changed 10.98 + };
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/lxpanel/stuff/patches/cpu-size-color.patch Sat Aug 26 12:10:59 2017 +0300 11.3 @@ -0,0 +1,19 @@ 11.4 +--- src/plugins/cpu/cpu.c 11.5 ++++ src/plugins/cpu/cpu.c.taz 11.6 +@@ -222,14 +222,14 @@ 11.7 + 11.8 + /* Allocate drawing area as a child of top level widget. Enable button press events. */ 11.9 + c->da = gtk_drawing_area_new(); 11.10 +- gtk_widget_set_size_request(c->da, 40, PANEL_HEIGHT_DEFAULT); 11.11 ++ gtk_widget_set_size_request(c->da, 26, PANEL_HEIGHT_DEFAULT); 11.12 + gtk_widget_add_events(c->da, GDK_BUTTON_PRESS_MASK); 11.13 + gtk_container_add(GTK_CONTAINER(p->pwid), c->da); 11.14 + 11.15 + /* Clone a graphics context and set "green" as its foreground color. 11.16 + * We will use this to draw the graph. */ 11.17 + c->graphics_context = gdk_gc_new(p->panel->topgwin->window); 11.18 +- gdk_color_parse("green", &c->foreground_color); 11.19 ++ gdk_color_parse("#cfcfcf", &c->foreground_color); 11.20 + gdk_colormap_alloc_color(gdk_drawable_get_colormap(p->panel->topgwin->window), &c->foreground_color, FALSE, TRUE); 11.21 + gdk_gc_set_foreground(c->graphics_context, &c->foreground_color); 11.22 +
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/lxpanel/stuff/patches/fix_position.patch Sat Aug 26 12:10:59 2017 +0300 12.3 @@ -0,0 +1,156 @@ 12.4 +Index: lxpanel-0.5.8/src/plugins/menu.c 12.5 +=================================================================== 12.6 +--- lxpanel-0.5.8.orig/src/plugins/menu.c 2011-10-05 23:55:47.000000000 +0200 12.7 ++++ lxpanel-0.5.8/src/plugins/menu.c 2011-10-05 23:55:49.000000000 +0200 12.8 +@@ -131,8 +131,8 @@ 12.9 + int ox, oy, w, h; 12.10 + Plugin *p; 12.11 + #if GTK_CHECK_VERSION(2,18,0) 12.12 +- GtkAllocation allocation; 12.13 +- gtk_widget_set_allocation(widget, &allocation); 12.14 ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 12.15 ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 12.16 + #endif 12.17 + ENTER; 12.18 + p = g_object_get_data(G_OBJECT(widget), "plugin"); 12.19 +@@ -155,20 +155,20 @@ 12.20 + *x = ox; 12.21 + if (*x + w > gdk_screen_width()) 12.22 + #if GTK_CHECK_VERSION(2,18,0) 12.23 +- *x = ox + allocation.width - w; 12.24 ++ *x = ox + allocation->width - w; 12.25 + #else 12.26 + *x = ox + widget->allocation.width - w; 12.27 + #endif 12.28 + *y = oy - h; 12.29 + if (*y < 0) 12.30 + #if GTK_CHECK_VERSION(2,18,0) 12.31 +- *y = oy + allocation.height; 12.32 ++ *y = oy + allocation->height; 12.33 + #else 12.34 + *y = oy + widget->allocation.height; 12.35 + #endif 12.36 + } else { 12.37 + #if GTK_CHECK_VERSION(2,18,0) 12.38 +- *x = ox + allocation.width; 12.39 ++ *x = ox + allocation->width; 12.40 + #else 12.41 + *x = ox + widget->allocation.width; 12.42 + #endif 12.43 +@@ -177,19 +177,22 @@ 12.44 + *y = oy; 12.45 + if (*y + h > gdk_screen_height()) 12.46 + #if GTK_CHECK_VERSION(2,18,0) 12.47 +- *y = oy + allocation.height - h; 12.48 ++ *y = oy + allocation->height - h; 12.49 + #else 12.50 + *y = oy + widget->allocation.height - h; 12.51 + #endif 12.52 + } 12.53 + DBG("widget: x,y=%d,%d w,h=%d,%d\n", ox, oy, 12.54 + #if GTK_CHECK_VERSION(2,18,0) 12.55 +- allocation.width, allocation.height ); 12.56 ++ allocation->width, allocation->height ); 12.57 + #else 12.58 + widget->allocation.width, widget->allocation.height ); 12.59 + #endif 12.60 + DBG("w-h %d %d\n", w, h); 12.61 + *push_in = TRUE; 12.62 ++#if GTK_CHECK_VERSION(2,18,0) 12.63 ++ g_free (allocation); 12.64 ++#endif 12.65 + RET(); 12.66 + } 12.67 + 12.68 +@@ -634,8 +637,8 @@ 12.69 + { 12.70 + ENTER; 12.71 + #if GTK_CHECK_VERSION(2,18,0) 12.72 +- GtkAllocation allocation; 12.73 +- gtk_widget_get_allocation(widget, &allocation); 12.74 ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 12.75 ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 12.76 + #endif 12.77 + 12.78 + /* Standard right-click handling. */ 12.79 +@@ -644,14 +647,17 @@ 12.80 + 12.81 + if ((event->type == GDK_BUTTON_PRESS) 12.82 + #if GTK_CHECK_VERSION(2,18,0) 12.83 +- && (event->x >=0 && event->x < allocation.width) 12.84 +- && (event->y >=0 && event->y < allocation.height)) { 12.85 ++ && (event->x >=0 && event->x < allocation->width) 12.86 ++ && (event->y >=0 && event->y < allocation->height)) { 12.87 + #else 12.88 + && (event->x >=0 && event->x < widget->allocation.width) 12.89 + && (event->y >=0 && event->y < widget->allocation.height)) { 12.90 + #endif 12.91 + show_menu( widget, plugin, event->button, event->time ); 12.92 + } 12.93 ++#if GTK_CHECK_VERSION(2,18,0) 12.94 ++ g_free (allocation); 12.95 ++#endif 12.96 + RET(TRUE); 12.97 + } 12.98 + 12.99 +Index: lxpanel-0.5.8/src/plugins/pager.c 12.100 +=================================================================== 12.101 +--- lxpanel-0.5.8.orig/src/plugins/pager.c 2011-10-05 23:55:47.000000000 +0200 12.102 ++++ lxpanel-0.5.8/src/plugins/pager.c 2011-10-05 23:56:29.000000000 +0200 12.103 +@@ -271,10 +271,10 @@ 12.104 + { 12.105 + /* Allocate pixmap and statistics buffer without border pixels. */ 12.106 + #if GTK_CHECK_VERSION(2,18,0) 12.107 +- GtkAllocation allocation; 12.108 +- gtk_widget_get_allocation(widget, &allocation); 12.109 +- int new_pixmap_width = allocation.width; 12.110 +- int new_pixmap_height = allocation.height; 12.111 ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 12.112 ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 12.113 ++ int new_pixmap_width = allocation->width; 12.114 ++ int new_pixmap_height = allocation->height; 12.115 + #else 12.116 + int new_pixmap_width = widget->allocation.width; 12.117 + int new_pixmap_height = widget->allocation.height; 12.118 +@@ -292,8 +292,8 @@ 12.119 + 12.120 + /* Compute the horizontal and vertical scale factors, and mark the desktop for redraw. */ 12.121 + #if GTK_CHECK_VERSION(2,18,0) 12.122 +- d->scale_y = (gfloat) allocation.height / (gfloat) gdk_screen_height(); 12.123 +- d->scale_x = (gfloat) allocation.width / (gfloat) gdk_screen_width(); 12.124 ++ d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); 12.125 ++ d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); 12.126 + #else 12.127 + d->scale_y = (gfloat) allocation->height / (gfloat) gdk_screen_height(); 12.128 + d->scale_x = (gfloat) allocation->width / (gfloat) gdk_screen_width(); 12.129 +@@ -305,6 +305,9 @@ 12.130 + gtk_widget_set_size_request(widget, 12.131 + (d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2) * d->pg->aspect_ratio, 12.132 + d->pg->plugin->panel->icon_size - BORDER_WIDTH * 2); 12.133 ++#if GTK_CHECK_VERSION(2,18,0) 12.134 ++ g_free (allocation); 12.135 ++#endif 12.136 + return FALSE; 12.137 + } 12.138 + 12.139 +@@ -326,8 +329,8 @@ 12.140 + { 12.141 + GtkWidget * widget = GTK_WIDGET(d->da); 12.142 + #if GTK_CHECK_VERSION(2,18,0) 12.143 +- GtkAllocation allocation; 12.144 +- gtk_widget_get_allocation(widget, &allocation); 12.145 ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); 12.146 ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); 12.147 + #endif 12.148 + gdk_draw_rectangle( 12.149 + d->pixmap, 12.150 +@@ -336,7 +339,8 @@ 12.151 + : style->dark_gc[GTK_STATE_NORMAL]), 12.152 + TRUE, 12.153 + #if GTK_CHECK_VERSION(2,18,0) 12.154 +- 0, 0, allocation.width, allocation.height); 12.155 ++ 0, 0, allocation->width, allocation->height); 12.156 ++ g_free (allocation); 12.157 + #else 12.158 + 0, 0, widget->allocation.width, widget->allocation.height); 12.159 + #endif
13.1 --- a/slim-theme-default/receipt Fri Aug 25 15:45:11 2017 +0300 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,30 +0,0 @@ 13.4 -# SliTaz package receipt. 13.5 - 13.6 -PACKAGE="slim-theme-default" 13.7 -VERSION="1.3.5" 13.8 -CATEGORY="customization" 13.9 -SHORT_DESC="Default theme bundled with SLiM." 13.10 -MAINTAINER="pankso@slitaz.org" 13.11 -LICENSE="GPL2" 13.12 -WEB_SITE="http://slim.berlios.de/" 13.13 - 13.14 -DEPENDS="slim" 13.15 -WANTED="slim" 13.16 -RELATED="slim slim-pam" 13.17 - 13.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 13.19 -genpkg_rules() 13.20 -{ 13.21 - mkdir -p $fs/usr/share/slim 13.22 - cp -a $install/usr/share/slim/themes $fs/usr/share/slim 13.23 -} 13.24 - 13.25 -post_install() 13.26 -{ 13.27 - chroot "$1/" slim-theme -sdefault 13.28 -} 13.29 - 13.30 -pre_remove() 13.31 -{ 13.32 - chroot "$1/" slim-theme -fdefault 13.33 -}
14.1 --- a/slim/receipt Fri Aug 25 15:45:11 2017 +0300 14.2 +++ b/slim/receipt Sat Aug 26 12:10:59 2017 +0300 14.3 @@ -1,4 +1,4 @@ 14.4 -# SliTaz package receipt. 14.5 +# SliTaz package receipt v2. 14.6 14.7 PACKAGE="slim" 14.8 VERSION="1.3.5" 14.9 @@ -6,65 +6,85 @@ 14.10 SHORT_DESC="Desktop-independent graphical login manager for X11" 14.11 MAINTAINER="pankso@slitaz.org" 14.12 LICENSE="GPL2" 14.13 -WEB_SITE="http://slim.berlios.de/" 14.14 +WEB_SITE="https://sourceforge.net/projects/slim.berlios/" 14.15 +HOST_ARCH="i486 arm" 14.16 +COOKOPTS="!pngquant op8" 14.17 + 14.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 14.19 -WGET_URL="http://download.berlios.de/slim/$TARBALL" 14.20 -CONFIG_FILES="/etc/slim.conf" 14.21 -HOST_ARCH="i486 arm" 14.22 +WGET_URL="$SF_MIRROR/slim.berlios/$TARBALL" 14.23 14.24 -RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too 14.25 -SUGGESTED="slim-theme-default slitaz-configs" 14.26 -DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu" 14.27 -BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev" 14.28 - 14.29 -# Handle cross compilation 14.30 -case "$ARCH" in 14.31 - i?86) 14.32 - BUILD_DEPENDS="$BUILD_DEPENDS cmake" 14.33 - INCL=/usr/include 14.34 - LIBS=/usr/lib ;; 14.35 - arm*) 14.36 - INCL=/cross/$ARCH/sysroot/usr/include 14.37 - LIBS=/cross/$ARCH/sysroot/usr/lib ;; 14.38 -esac 14.39 +BUILD_DEPENDS_arm="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \ 14.40 +xorg-libXmu-dev" 14.41 +BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \ 14.42 +libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev" 14.43 +SPLIT="slim-theme-default slim" 14.44 +SIBLINGS="slim-pam" 14.45 14.46 # Rules to configure and make the package. 14.47 compile_rules() 14.48 { 14.49 - patch -p1 < $stuff/$PACKAGE-$VERSION.patch || return 1 14.50 + # Handle cross compilation 14.51 + case "$ARCH" in 14.52 + i?86) 14.53 + INCL=/usr/include 14.54 + LIBS=/usr/lib ;; 14.55 + arm*) 14.56 + INCL=/cross/$ARCH/sysroot/usr/include 14.57 + LIBS=/cross/$ARCH/sysroot/usr/lib ;; 14.58 + esac 14.59 + 14.60 mkdir build; cd build 14.61 cmake \ 14.62 -DCMAKE_INSTALL_PREFIX=/usr \ 14.63 -DX11_Xmu_LIB="$LIBS/libXmu.so" \ 14.64 - -DX11_Xft_INCLUDE_PATH=${INCL} \ 14.65 - -DX11_Xmu_INCLUDE_PATH= ${INCL} \ 14.66 + -DX11_Xft_INCLUDE_PATH=$INCL \ 14.67 + -DX11_Xmu_INCLUDE_PATH=$INCL \ 14.68 .. && 14.69 make && 14.70 - make DESTDIR=$DESTDIR install 14.71 + make DESTDIR=$DESTDIR install || exit 1 14.72 + 14.73 + cp -r $stuff/themes $install/usr/share/slim 14.74 + 14.75 + # Config file and rc script. 14.76 + cp -a $stuff/etc $install 14.77 + 14.78 + # slim-theme manager & default strings 14.79 + install -m755 $stuff/slim-theme $install/usr/bin/slim-theme 14.80 + install -m644 $stuff/strings $install/usr/share/slim/strings 14.81 + 14.82 + chown -R root:root $install 14.83 } 14.84 14.85 # Rules to gen a SliTaz package suitable for Tazpkg. 14.86 -genpkg_rules() 14.87 -{ 14.88 - mkdir -p $fs/usr/share/slim 14.89 - cp -a $install/etc $fs 14.90 - cp -a $install/usr/bin $fs/usr 14.91 - cp -a $stuff/themes $fs/usr/share/slim 14.92 - 14.93 - # Config file and rc script. 14.94 - cp -a $stuff/etc $fs 14.95 - chown -R root.root $fs 14.96 - 14.97 - # slim-theme manager & default strings 14.98 - install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme 14.99 - install -m644 $stuff/strings $fs/usr/share/slim/strings 14.100 +genpkg_rules() { 14.101 + case $PACKAGE in 14.102 + slim-theme-default) 14.103 + CAT="customization|default theme bundled with SLiM" 14.104 + copy default/ 14.105 + DEPENDS="slim slitaz-configs-base" 14.106 + ;; 14.107 + slim) 14.108 + copy @std 14.109 + remove_already_packed 14.110 + DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \ 14.111 + xorg-libXft xorg-libXmu xorg-libXrender zlib" 14.112 + CONFIG_FILES="/etc/slim.conf" 14.113 + SUGGESTED="slim-theme-default slitaz-configs" 14.114 + ;; 14.115 + esac 14.116 } 14.117 14.118 -post_install() 14.119 -{ 14.120 - local USER 14.121 - USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd") 14.122 +post_install_slim() { 14.123 + local USER=$(awk -F: '/:1000:1000:/ { print $1 }' "$1/etc/passwd") 14.124 [ -n "$USER" ] && 14.125 sed -i s/"default_user .*"/"default_user $USER"/ "$1/etc/slim.conf" 14.126 sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf" 14.127 } 14.128 + 14.129 +post_install_slim_theme_default() { 14.130 + chroot "$1/" slim-theme -sdefault 14.131 +} 14.132 + 14.133 +pre_remove_slim_theme_default() { 14.134 + chroot "$1/" slim-theme -fdefault 14.135 +}
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/slim/stuff/patches/series Sat Aug 26 12:10:59 2017 +0300 15.3 @@ -0,0 +1,1 @@ 15.4 +slim-1.3.5.patch
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/slim/stuff/patches/slim-1.3.5.patch Sat Aug 26 12:10:59 2017 +0300 16.3 @@ -0,0 +1,169 @@ 16.4 +--- slim-1.3.5/app.cpp 16.5 ++++ slim-1.3.5/app.cpp 16.6 + 16.7 +Link forgotten header. 16.8 +@@ -25,6 +25,7 @@ 16.9 + #include "app.h" 16.10 + #include "numlock.h" 16.11 + #include "util.h" 16.12 ++#include <X11/Xmu/WinUtil.h> 16.13 + 16.14 + #ifdef HAVE_SHADOW 16.15 + #include <shadow.h> 16.16 + 16.17 +Option not to enter root's password if special command was given in the 16.18 +login field (suspend, halt or reboot). 16.19 +@@ -437,6 +438,11 @@ 16.20 + case Panel::Console: 16.21 + logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl; 16.22 + return true; /* <--- This is simply fake! */ 16.23 ++ case Panel::Suspend: 16.24 ++ case Panel::Halt: 16.25 ++ case Panel::Reboot: 16.26 ++ if (cfg->getOption("root_password") == "false") 16.27 ++ return true; 16.28 + default: 16.29 + break; 16.30 + } 16.31 + 16.32 + 16.33 +--- slim-1.3.5/cfg.cpp 16.34 ++++ slim-1.3.5/cfg.cpp 16.35 + 16.36 +Change default settings for SliTaz. 16.37 +@@ -28,34 +28,35 @@ 16.38 + : currentSession(-1) 16.39 + { 16.40 + /* Configuration options */ 16.41 +- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); 16.42 +- options.insert(option("default_xserver","/usr/bin/X")); 16.43 ++ options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin")); 16.44 ++ options.insert(option("default_xserver","/usr/bin/Xorg")); 16.45 + options.insert(option("xserver_arguments","")); 16.46 + options.insert(option("numlock","")); 16.47 + options.insert(option("daemon","")); 16.48 + options.insert(option("xauth_path","/usr/bin/xauth")); 16.49 +- options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session")); 16.50 +- options.insert(option("halt_cmd","/sbin/shutdown -h now")); 16.51 +- options.insert(option("reboot_cmd","/sbin/shutdown -r now")); 16.52 ++ options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session")); 16.53 ++ options.insert(option("halt_cmd","/sbin/poweroff")); 16.54 ++ options.insert(option("reboot_cmd","/sbin/reboot")); 16.55 ++ options.insert(option("root_password","true")); 16.56 + options.insert(option("suspend_cmd","")); 16.57 + options.insert(option("sessionstart_cmd","")); 16.58 + options.insert(option("sessionstop_cmd","")); 16.59 +- 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""")); 16.60 +- options.insert(option("screenshot_cmd","import -window root /slim.png")); 16.61 ++ 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""")); 16.62 ++ options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png")); 16.63 + options.insert(option("welcome_msg","Welcome to %host")); 16.64 + options.insert(option("session_msg","Session:")); 16.65 +- options.insert(option("default_user","")); 16.66 ++ options.insert(option("default_user","tux")); 16.67 + options.insert(option("focus_password","no")); 16.68 + options.insert(option("auto_login","no")); 16.69 +- options.insert(option("current_theme","default")); 16.70 +- options.insert(option("lockfile","/var/run/slim.lock")); 16.71 ++ options.insert(option("current_theme","slitaz,base")); 16.72 ++ options.insert(option("lockfile","/var/lock/slim.lock")); 16.73 + options.insert(option("logfile","/var/log/slim.log")); 16.74 + options.insert(option("authfile","/var/run/slim.auth")); 16.75 +- options.insert(option("shutdown_msg","The system is halting...")); 16.76 ++ options.insert(option("shutdown_msg","The system is going down...")); 16.77 + options.insert(option("reboot_msg","The system is rebooting...")); 16.78 +- options.insert(option("sessions","wmaker,blackbox,icewm")); 16.79 ++ options.insert(option("sessions","openbox,e17,jwm")); 16.80 + options.insert(option("sessiondir","")); 16.81 +- options.insert(option("hidecursor","false")); 16.82 ++ options.insert(option("hidecursor","true")); 16.83 + 16.84 + /* Theme stuff */ 16.85 + options.insert(option("input_panel_x","50%")); 16.86 + 16.87 + 16.88 +--- slim-1.3.5/slim.conf.original 16.89 ++++ slim-1.3.5/slim.conf 16.90 + 16.91 +Change default settings for SliTaz too. 16.92 +@@ -1,13 +1,16 @@ 16.93 ++# /etc/slim.conf: Slim LogIn Manger configuration file 16.94 ++# 16.95 ++ 16.96 + # Path, X server and arguments (if needed) 16.97 + # Note: -xauth $authfile is automatically appended 16.98 +-default_path /bin:/usr/bin:/usr/local/bin 16.99 +-default_xserver /usr/bin/X 16.100 ++default_path ./:/bin:/usr/bin:/usr/local/bin 16.101 ++default_xserver /usr/bin/Xorg 16.102 + #xserver_arguments -dpi 75 16.103 + 16.104 + # Commands for halt, login, etc. 16.105 +-halt_cmd /sbin/shutdown -h now 16.106 +-reboot_cmd /sbin/shutdown -r now 16.107 +-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" 16.108 ++halt_cmd /sbin/poweroff 16.109 ++reboot_cmd /sbin/reboot 16.110 ++console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login" 16.111 + #suspend_cmd /usr/sbin/suspend 16.112 + 16.113 + # Full path to the xauth binary 16.114 +@@ -22,7 +25,7 @@ 16.115 + 16.116 + # Hide the mouse cursor (note: does not work with some WMs). 16.117 + # Valid values: true|false 16.118 +-# hidecursor false 16.119 ++hidecursor true 16.120 + 16.121 + # This command is executed after a succesful login. 16.122 + # you can place the %session and %theme variables 16.123 +@@ -33,7 +36,7 @@ 16.124 + # to adjust the command according to your preferred shell, 16.125 + # i.e. for freebsd use: 16.126 + # login_cmd exec /bin/sh - ~/.xinitrc %session 16.127 +-login_cmd exec /bin/bash -login ~/.xinitrc %session 16.128 ++login_cmd exec /bin/sh -l ~/.xinitrc %session 16.129 + 16.130 + # Commands executed when starting and exiting a session. 16.131 + # They can be used for registering a X11 session with 16.132 +@@ -51,10 +54,10 @@ 16.133 + # The current chosen session name is replaced in the login_cmd 16.134 + # above, so your login command can handle different sessions. 16.135 + # see the xinitrc.sample file shipped with slim sources 16.136 +-sessions xfce4,icewm-session,wmaker,blackbox 16.137 ++sessions openbox,e17,jwm 16.138 + 16.139 + # Executed when pressing F11 (requires imagemagick) 16.140 +-screenshot_cmd import -window root /slim.png 16.141 ++#screenshot_cmd mtpaint -s /root/slim-shot.png 16.142 + 16.143 + # welcome message. Available variables: %host, %domain 16.144 + welcome_msg Welcome to %host 16.145 +@@ -63,12 +66,12 @@ 16.146 + # session_msg Session: 16.147 + 16.148 + # shutdown / reboot messages 16.149 +-shutdown_msg The system is halting... 16.150 ++shutdown_msg The system is going down... 16.151 + reboot_msg The system is rebooting... 16.152 + 16.153 + # default user, leave blank or remove this line 16.154 + # for avoid pre-loading the username. 16.155 +-#default_user simone 16.156 ++default_user tux 16.157 + 16.158 + # Focus the password field on start when default_user is set 16.159 + # Set to "yes" to enable this feature 16.160 +@@ -81,10 +84,10 @@ 16.161 + 16.162 + # current theme, use comma separated list to specify a set to 16.163 + # randomly choose from 16.164 +-current_theme default 16.165 ++current_theme slitaz,base 16.166 + 16.167 + # Lock file 16.168 +-lockfile /var/run/slim.lock 16.169 ++lockfile /var/lock/slim.lock 16.170 + 16.171 + # Log file 16.172 + logfile /var/log/slim.log
17.1 --- a/slim/stuff/slim-1.3.5.patch Fri Aug 25 15:45:11 2017 +0300 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,169 +0,0 @@ 17.4 ---- slim-1.3.5/app.cpp 17.5 -+++ slim-1.3.5/app.cpp 17.6 - 17.7 -Link forgotten header. 17.8 -@@ -25,6 +25,7 @@ 17.9 - #include "app.h" 17.10 - #include "numlock.h" 17.11 - #include "util.h" 17.12 -+#include <X11/Xmu/WinUtil.h> 17.13 - 17.14 - #ifdef HAVE_SHADOW 17.15 - #include <shadow.h> 17.16 - 17.17 -Option not to enter root's password if special command was given in the 17.18 -login field (suspend, halt or reboot). 17.19 -@@ -437,6 +438,11 @@ 17.20 - case Panel::Console: 17.21 - logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl; 17.22 - return true; /* <--- This is simply fake! */ 17.23 -+ case Panel::Suspend: 17.24 -+ case Panel::Halt: 17.25 -+ case Panel::Reboot: 17.26 -+ if (cfg->getOption("root_password") == "false") 17.27 -+ return true; 17.28 - default: 17.29 - break; 17.30 - } 17.31 - 17.32 - 17.33 ---- slim-1.3.5/cfg.cpp 17.34 -+++ slim-1.3.5/cfg.cpp 17.35 - 17.36 -Change default settings for SliTaz. 17.37 -@@ -28,34 +28,35 @@ 17.38 - : currentSession(-1) 17.39 - { 17.40 - /* Configuration options */ 17.41 -- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); 17.42 -- options.insert(option("default_xserver","/usr/bin/X")); 17.43 -+ options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin")); 17.44 -+ options.insert(option("default_xserver","/usr/bin/Xorg")); 17.45 - options.insert(option("xserver_arguments","")); 17.46 - options.insert(option("numlock","")); 17.47 - options.insert(option("daemon","")); 17.48 - options.insert(option("xauth_path","/usr/bin/xauth")); 17.49 -- options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session")); 17.50 -- options.insert(option("halt_cmd","/sbin/shutdown -h now")); 17.51 -- options.insert(option("reboot_cmd","/sbin/shutdown -r now")); 17.52 -+ options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session")); 17.53 -+ options.insert(option("halt_cmd","/sbin/poweroff")); 17.54 -+ options.insert(option("reboot_cmd","/sbin/reboot")); 17.55 -+ options.insert(option("root_password","true")); 17.56 - options.insert(option("suspend_cmd","")); 17.57 - options.insert(option("sessionstart_cmd","")); 17.58 - options.insert(option("sessionstop_cmd","")); 17.59 -- 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""")); 17.60 -- options.insert(option("screenshot_cmd","import -window root /slim.png")); 17.61 -+ 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""")); 17.62 -+ options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png")); 17.63 - options.insert(option("welcome_msg","Welcome to %host")); 17.64 - options.insert(option("session_msg","Session:")); 17.65 -- options.insert(option("default_user","")); 17.66 -+ options.insert(option("default_user","tux")); 17.67 - options.insert(option("focus_password","no")); 17.68 - options.insert(option("auto_login","no")); 17.69 -- options.insert(option("current_theme","default")); 17.70 -- options.insert(option("lockfile","/var/run/slim.lock")); 17.71 -+ options.insert(option("current_theme","slitaz,base")); 17.72 -+ options.insert(option("lockfile","/var/lock/slim.lock")); 17.73 - options.insert(option("logfile","/var/log/slim.log")); 17.74 - options.insert(option("authfile","/var/run/slim.auth")); 17.75 -- options.insert(option("shutdown_msg","The system is halting...")); 17.76 -+ options.insert(option("shutdown_msg","The system is going down...")); 17.77 - options.insert(option("reboot_msg","The system is rebooting...")); 17.78 -- options.insert(option("sessions","wmaker,blackbox,icewm")); 17.79 -+ options.insert(option("sessions","openbox,e17,jwm")); 17.80 - options.insert(option("sessiondir","")); 17.81 -- options.insert(option("hidecursor","false")); 17.82 -+ options.insert(option("hidecursor","true")); 17.83 - 17.84 - /* Theme stuff */ 17.85 - options.insert(option("input_panel_x","50%")); 17.86 - 17.87 - 17.88 ---- slim-1.3.5/slim.conf.original 17.89 -+++ slim-1.3.5/slim.conf 17.90 - 17.91 -Change default settings for SliTaz too. 17.92 -@@ -1,13 +1,16 @@ 17.93 -+# /etc/slim.conf: Slim LogIn Manger configuration file 17.94 -+# 17.95 -+ 17.96 - # Path, X server and arguments (if needed) 17.97 - # Note: -xauth $authfile is automatically appended 17.98 --default_path /bin:/usr/bin:/usr/local/bin 17.99 --default_xserver /usr/bin/X 17.100 -+default_path ./:/bin:/usr/bin:/usr/local/bin 17.101 -+default_xserver /usr/bin/Xorg 17.102 - #xserver_arguments -dpi 75 17.103 - 17.104 - # Commands for halt, login, etc. 17.105 --halt_cmd /sbin/shutdown -h now 17.106 --reboot_cmd /sbin/shutdown -r now 17.107 --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" 17.108 -+halt_cmd /sbin/poweroff 17.109 -+reboot_cmd /sbin/reboot 17.110 -+console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login" 17.111 - #suspend_cmd /usr/sbin/suspend 17.112 - 17.113 - # Full path to the xauth binary 17.114 -@@ -22,7 +25,7 @@ 17.115 - 17.116 - # Hide the mouse cursor (note: does not work with some WMs). 17.117 - # Valid values: true|false 17.118 --# hidecursor false 17.119 -+hidecursor true 17.120 - 17.121 - # This command is executed after a succesful login. 17.122 - # you can place the %session and %theme variables 17.123 -@@ -33,7 +36,7 @@ 17.124 - # to adjust the command according to your preferred shell, 17.125 - # i.e. for freebsd use: 17.126 - # login_cmd exec /bin/sh - ~/.xinitrc %session 17.127 --login_cmd exec /bin/bash -login ~/.xinitrc %session 17.128 -+login_cmd exec /bin/sh -l ~/.xinitrc %session 17.129 - 17.130 - # Commands executed when starting and exiting a session. 17.131 - # They can be used for registering a X11 session with 17.132 -@@ -51,10 +54,10 @@ 17.133 - # The current chosen session name is replaced in the login_cmd 17.134 - # above, so your login command can handle different sessions. 17.135 - # see the xinitrc.sample file shipped with slim sources 17.136 --sessions xfce4,icewm-session,wmaker,blackbox 17.137 -+sessions openbox,e17,jwm 17.138 - 17.139 - # Executed when pressing F11 (requires imagemagick) 17.140 --screenshot_cmd import -window root /slim.png 17.141 -+#screenshot_cmd mtpaint -s /root/slim-shot.png 17.142 - 17.143 - # welcome message. Available variables: %host, %domain 17.144 - welcome_msg Welcome to %host 17.145 -@@ -63,12 +66,12 @@ 17.146 - # session_msg Session: 17.147 - 17.148 - # shutdown / reboot messages 17.149 --shutdown_msg The system is halting... 17.150 -+shutdown_msg The system is going down... 17.151 - reboot_msg The system is rebooting... 17.152 - 17.153 - # default user, leave blank or remove this line 17.154 - # for avoid pre-loading the username. 17.155 --#default_user simone 17.156 -+default_user tux 17.157 - 17.158 - # Focus the password field on start when default_user is set 17.159 - # Set to "yes" to enable this feature 17.160 -@@ -81,10 +84,10 @@ 17.161 - 17.162 - # current theme, use comma separated list to specify a set to 17.163 - # randomly choose from 17.164 --current_theme default 17.165 -+current_theme slitaz,base 17.166 - 17.167 - # Lock file 17.168 --lockfile /var/run/slim.lock 17.169 -+lockfile /var/lock/slim.lock 17.170 - 17.171 - # Log file 17.172 - logfile /var/log/slim.log
18.1 --- a/tazlito/receipt Fri Aug 25 15:45:11 2017 +0300 18.2 +++ b/tazlito/receipt Sat Aug 26 12:10:59 2017 +0300 18.3 @@ -1,7 +1,7 @@ 18.4 # SliTaz package receipt v2. 18.5 18.6 PACKAGE="tazlito" 18.7 -VERSION="455" 18.8 +VERSION="459" 18.9 CATEGORY="base-system" 18.10 SHORT_DESC="SliTaz Live Tool" 18.11 MAINTAINER="pascal.bellard@slitaz.org"