# HG changeset patch # User Aleksej Bobylev # Date 1364669107 0 # Node ID bf872cb6f5c10d85865994abbda6c178e519e29c # Parent e41589fac80df7ae763fa3e956b3c111107b90c7 lxpanel*: up 0.5.12 diff -r e41589fac80d -r bf872cb6f5c1 lxpanel-dev/receipt --- a/lxpanel-dev/receipt Fri Mar 29 09:07:22 2013 +0100 +++ b/lxpanel-dev/receipt Sat Mar 30 18:45:07 2013 +0000 @@ -1,17 +1,18 @@ # SliTaz package receipt. PACKAGE="lxpanel-dev" -VERSION="0.5.10" +VERSION="0.5.12" CATEGORY="x-window" -SHORT_DESC="LXpanel devel files." +SHORT_DESC="Development files for LXpanel" MAINTAINER="pankso@slitaz.org" +WEB_SITE="http://www.lxde.org/" + WANTED="lxpanel" -WEB_SITE="http://www.lxde.org/" # 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 - cp -a $install/usr/include $fs/usr } diff -r e41589fac80d -r bf872cb6f5c1 lxpanel-extra/receipt --- a/lxpanel-extra/receipt Fri Mar 29 09:07:22 2013 +0100 +++ b/lxpanel-extra/receipt Sat Mar 30 18:45:07 2013 +0000 @@ -1,13 +1,14 @@ # SliTaz package receipt. PACKAGE="lxpanel-extra" -VERSION="0.5.10" +VERSION="0.5.12" CATEGORY="x-window" -SHORT_DESC="LXpanel keyboard led indicator plugin." +SHORT_DESC="Extra files for LXpanel" MAINTAINER="pankso@slitaz.org" -DEPENDS="expat gtk+ wireless_tools xorg-libXdamage menu-cache" +WEB_SITE="http://www.lxde.org/" + WANTED="lxpanel" -WEB_SITE="http://www.lxde.org/" +DEPENDS="lxpanel" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() @@ -19,10 +20,8 @@ cp $install/usr/lib/lxpanel/plugins/kbled.so \ $fs/usr/lib/lxpanel/plugins # Images - cp -a $install/usr/share/lxpanel/images/ns-*.png \ - $fs/usr/share/lxpanel/images - cp -a $install/usr/share/lxpanel/images/*lock-*.png \ - $fs/usr/share/lxpanel/images - cp -a $install/usr/share/lxpanel/images/xkb-flags \ - $fs/usr/share/lxpanel/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 e41589fac80d -r bf872cb6f5c1 lxpanel/receipt --- a/lxpanel/receipt Fri Mar 29 09:07:22 2013 +0100 +++ b/lxpanel/receipt Sat Mar 30 18:45:07 2013 +0000 @@ -1,69 +1,64 @@ # SliTaz package receipt. PACKAGE="lxpanel" -VERSION="0.5.10" +VERSION="0.5.12" CATEGORY="x-window" -SHORT_DESC="Standard compliant desktop panel." +SHORT_DESC="Lightweight X11 desktop panel" MAINTAINER="pankso@slitaz.org" -TARBALL="${PACKAGE}_${VERSION}.orig.tar.xz" WEB_SITE="http://www.lxde.org/" -#WGET_URL="$SF_MIRROR/lxde/$TARBALL" -WGET_URL="http://ftp.de.debian.org/debian/pool/main/l/$PACKAGE/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="$SF_MIRROR/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20$VERSION/$TARBALL" CONFIG_FILES="/etc/lxpanel/default" -DEPENDS="glibc-base glib libgio expat zlib menu-cache slitaz-icon \ -gtk+ alsa-lib wireless_tools libwnck lxsession" -BUILD_DEPENDS="gtk+-dev gettext expat-dev intltool menu-cache-dev \ -lxmenu-data alsa-lib-dev wireless_tools-dev libwnck-dev" +# drop: slitaz-icon lxsession +DEPENDS="alsa-lib gtk+ libwnck menu-cache wireless_tools" +BUILD_DEPENDS="gtk+-dev menu-cache-dev libwnck-dev alsa-lib-dev \ +wireless_tools-dev libxml2-dev lxmenu-data" +TAGS="gtk2 panel" # Rules to configure and make the package. compile_rules() { - cd $src - patch -p0 -i $stuff/cpu-size-color.patch || exit 1 - ./configure --with-plugins=all $CONFIGURE_ARGS && - make && make install + ./configure \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-plugins=all \ + $CONFIGURE_ARGS && + make && + make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share $fs/usr/lib $fs/etc/xdg + 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 - cp -a $install/usr/share/lxpanel $fs/usr/share + find $fs -name kbled.so -delete - # Remove a few "heavy" and unuseful images (ns* goes in extra) - for i in file-manager* *volume* mute.png gnome-[a-m]*.png \ - gnome-netstatus-*.png my-* ns-*.png *lock-*.png \ - background.png window-manager.png - do - rm $fs/usr/share/lxpanel/images/$i + # Images + imgs=usr/share/lxpanel/images + for i in clock cpufreq-icon my-computer; do + cp -a $install/$imgs/$i.png $fs/$imgs done - # Remove plugins --> lxpanel-extra - rm $fs/usr/lib/lxpanel/plugins/kbled.so - rm -rf $fs/usr/share/lxpanel/images/xkb-flags - # Move profile to /etc/lxpanel (/usr maybe read-only) and default config - mkdir $fs/etc - mv -f $fs/usr/share/lxpanel/profile $fs/etc/lxpanel + 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 - # Make images symlinks so it feet SliTaz theme - cd $fs/usr/share/lxpanel/images - ln -s /usr/share/icons/SliTaz/status/32/network-idle.png ns-connected.png - ln -s /usr/share/icons/SliTaz/status/32/network-offline.png ns-disconnect.png - ln -s /usr/share/icons/SliTaz/status/32/network-receive.png ns-recvdata.png - ln -s /usr/share/icons/SliTaz/status/32/network-receive.png ns-senddata.png - ln -s /usr/share/icons/SliTaz/status/32/nm-adhoc.png ns-bothrs.png - ln -s /usr/share/icons/SliTaz/status/32/network-error.png ns-problem.png + cp -a $install/usr/share/lxpanel/ui $fs/usr/share/lxpanel + cp -a $install/usr/share/lxpanel/x* $fs/usr/share/lxpanel } diff -r e41589fac80d -r bf872cb6f5c1 lxpanel/stuff/autostart/lxpanel.desktop --- a/lxpanel/stuff/autostart/lxpanel.desktop Fri Mar 29 09:07:22 2013 +0100 +++ b/lxpanel/stuff/autostart/lxpanel.desktop Sat Mar 30 18:45:07 2013 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Type=Application Name=LXPanel Desktop panel -name[fr]=Panneau du bureau LXPanel +Name[fr]=Panneau du bureau LXPanel +Name[ru]=Панель рабочего стола LXPanel Exec=lxpanel -p slitaz -NotShowIn=XFCE;Razor; \ No newline at end of file +NotShowIn=XFCE;Razor;