# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1555598766 -10800
# Node ID 09886e684df3e8147e2ed9e7f03999de31b53851
# Parent  71d3d70a3775c22381ef500b7e8ef2c5a674b280
5) lxpanel: up (0.10.0)

diff -r 71d3d70a3775 -r 09886e684df3 lxpanel-dev/receipt
--- a/lxpanel-dev/receipt	Thu Apr 18 17:44:29 2019 +0300
+++ b/lxpanel-dev/receipt	Thu Apr 18 17:46:06 2019 +0300
@@ -1,10 +1,10 @@
 # SliTaz package receipt.
 
 PACKAGE="lxpanel-dev"
-VERSION="0.6.2"
+VERSION="0.10.0"
 CATEGORY="x-window"
 SHORT_DESC="LXDE panel (development)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lxde.org/"
 TAGS="LXDE"
@@ -17,6 +17,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/include       $fs/usr
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
 }
diff -r 71d3d70a3775 -r 09886e684df3 lxpanel-extra/receipt
--- a/lxpanel-extra/receipt	Thu Apr 18 17:44:29 2019 +0300
+++ b/lxpanel-extra/receipt	Thu Apr 18 17:46:06 2019 +0300
@@ -1,16 +1,16 @@
 # SliTaz package receipt.
 
 PACKAGE="lxpanel-extra"
-VERSION="0.6.2"
+VERSION="0.10.0"
 CATEGORY="x-window"
 SHORT_DESC="LXDE panel (extra files and plugins)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lxde.org/"
 TAGS="LXDE"
 
 WANTED="lxpanel"
-DEPENDS="lxpanel libwnck"
+DEPENDS="lxpanel" #libwnck
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -19,14 +19,14 @@
 		$fs/usr/lib/lxpanel/plugins \
 		$fs/usr/share/lxpanel/images
 	# Plugins
-	for p in kbled.so wnckpager.so
+	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/ns-*.png    $fs/$imgs
 	cp -a $install/$imgs/*lock-*.png $fs/$imgs
-	cp -a $install/$imgs/xkb-flags $fs/$imgs
+	cp -a $install/$imgs/xkb-flags   $fs/$imgs
 }
diff -r 71d3d70a3775 -r 09886e684df3 lxpanel/receipt
--- a/lxpanel/receipt	Thu Apr 18 17:44:29 2019 +0300
+++ b/lxpanel/receipt	Thu Apr 18 17:46:06 2019 +0300
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="lxpanel"
-VERSION="0.6.2"
+VERSION="0.10.0"
 CATEGORY="x-window"
 SHORT_DESC="LXDE panel"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lxde.org/"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 CONFIG_FILES="/etc/lxpanel/default"
 TAGS="LXDE gtk2 panel"
@@ -15,8 +15,8 @@
 
 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 \
-libxml2-dev lxmenu-data"
+BUILD_DEPENDS="intltool libfm-dev libkeybinder-dev curl-dev \
+gtk+-dev menu-cache-dev alsa-lib-dev wireless_tools-dev libxml2-dev lxmenu-data"
 
 # Handle cross compilation
 case "$ARCH" in
@@ -32,7 +32,7 @@
 {
 	# Match default desktop colors
 	sed -i s'/gdk_color_parse("green"/gdk_color_parse("#cfcfcf"/' \
-		src/plugins/cpu/cpu.c || return 1
+		$src/plugins/cpu/cpu.c || return 1
 	./configure \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
@@ -45,7 +45,7 @@
 genpkg_rules()
 {
 	mkdir -p \
-		$fs/usr/lib \
+		$fs/usr/lib/lxpanel \
 		$fs/usr/share/lxpanel/images \
 		$fs/etc/lxpanel \
 		$fs/etc/xdg
@@ -53,7 +53,8 @@
 	cp -a $install/usr/bin $fs/usr
 
 	# Plugins (kbled -> lxpanel-extra)
-	cp -a $install/usr/lib/lxpanel $fs/usr/lib
+	cp -a $install/usr/lib/lxpanel/*.so*   $fs/usr/lib/lxpanel/
+	cp -a $install/usr/lib/lxpanel/plugins $fs/usr/lib/lxpanel/
 	find $fs -name kbled.so -delete
 	find $fs -name wnckpager.so -delete
 
@@ -64,11 +65,10 @@
 	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
+	cp -a $install/etc $fs/
+	mv -f $fs/etc/xdg/lxpanel/default $fs/etc/xdg/lxpanel/original
+	cp -a $stuff/default $fs/etc/xdg/lxpanel
+	rm -rf $fs/etc/xdg/lxpanel/two_panels
 
 	# XDG autostart desktop file (lxsession will use it automaticaly)
 	cp -a $stuff/autostart $fs/etc/xdg