Navigation

Project: wok

Clone project: hg clone http://hg.slitaz.org/wok

  • Download tarball:
  • bz2
  • gz

Search

wok changeset 14260:bf872cb6f5c1

lxpanel*: up 0.5.12
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Mar 30 18:45:07 2013 +0000 (12 months ago ago)
parents e41589fac80d
children 5ed4d6b2d690
files lxpanel-dev/receipt lxpanel-extra/receipt lxpanel/receipt lxpanel/stuff/autostart/lxpanel.desktop
line diff
     1.1 --- a/lxpanel-dev/receipt	Fri Mar 29 09:07:22 2013 +0100
     1.2 +++ b/lxpanel-dev/receipt	Sat Mar 30 18:45:07 2013 +0000
     1.3 @@ -1,17 +1,18 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lxpanel-dev"
     1.7 -VERSION="0.5.10"
     1.8 +VERSION="0.5.12"
     1.9  CATEGORY="x-window"
    1.10 -SHORT_DESC="LXpanel devel files."
    1.11 +SHORT_DESC="Development files for LXpanel"
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13 +WEB_SITE="http://www.lxde.org/"
    1.14 +
    1.15  WANTED="lxpanel"
    1.16 -WEB_SITE="http://www.lxde.org/"
    1.17  
    1.18  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.19  genpkg_rules()
    1.20  {
    1.21  	mkdir -p $fs/usr/lib
    1.22 +	cp -a $install/usr/include $fs/usr
    1.23  	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.24 -	cp -a $install/usr/include $fs/usr
    1.25  }
     2.1 --- a/lxpanel-extra/receipt	Fri Mar 29 09:07:22 2013 +0100
     2.2 +++ b/lxpanel-extra/receipt	Sat Mar 30 18:45:07 2013 +0000
     2.3 @@ -1,13 +1,14 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="lxpanel-extra"
     2.7 -VERSION="0.5.10"
     2.8 +VERSION="0.5.12"
     2.9  CATEGORY="x-window"
    2.10 -SHORT_DESC="LXpanel keyboard led indicator plugin."
    2.11 +SHORT_DESC="Extra files for LXpanel"
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13 -DEPENDS="expat gtk+ wireless_tools xorg-libXdamage menu-cache"
    2.14 +WEB_SITE="http://www.lxde.org/"
    2.15 +
    2.16  WANTED="lxpanel"
    2.17 -WEB_SITE="http://www.lxde.org/"
    2.18 +DEPENDS="lxpanel"
    2.19  
    2.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.21  genpkg_rules()
    2.22 @@ -19,10 +20,8 @@
    2.23  	cp $install/usr/lib/lxpanel/plugins/kbled.so \
    2.24  		$fs/usr/lib/lxpanel/plugins
    2.25  	# Images
    2.26 -	cp -a $install/usr/share/lxpanel/images/ns-*.png \
    2.27 -		$fs/usr/share/lxpanel/images
    2.28 -	cp -a $install/usr/share/lxpanel/images/*lock-*.png \
    2.29 -		$fs/usr/share/lxpanel/images
    2.30 -	cp -a $install/usr/share/lxpanel/images/xkb-flags \
    2.31 -		$fs/usr/share/lxpanel/images
    2.32 +	imgs=usr/share/lxpanel/images
    2.33 +	cp -a $install/$imgs/ns-*.png $fs/$imgs
    2.34 +	cp -a $install/$imgs/*lock-*.png $fs/$imgs
    2.35 +	cp -a $install/$imgs/xkb-flags $fs/$imgs
    2.36  }
     3.1 --- a/lxpanel/receipt	Fri Mar 29 09:07:22 2013 +0100
     3.2 +++ b/lxpanel/receipt	Sat Mar 30 18:45:07 2013 +0000
     3.3 @@ -1,69 +1,64 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="lxpanel"
     3.7 -VERSION="0.5.10"
     3.8 +VERSION="0.5.12"
     3.9  CATEGORY="x-window"
    3.10 -SHORT_DESC="Standard compliant desktop panel."
    3.11 +SHORT_DESC="Lightweight X11 desktop panel"
    3.12  MAINTAINER="pankso@slitaz.org"
    3.13 -TARBALL="${PACKAGE}_${VERSION}.orig.tar.xz"
    3.14  WEB_SITE="http://www.lxde.org/"
    3.15 -#WGET_URL="$SF_MIRROR/lxde/$TARBALL"
    3.16 -WGET_URL="http://ftp.de.debian.org/debian/pool/main/l/$PACKAGE/$TARBALL"
    3.17 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.18 +WGET_URL="$SF_MIRROR/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20$VERSION/$TARBALL"
    3.19  CONFIG_FILES="/etc/lxpanel/default"
    3.20  
    3.21 -DEPENDS="glibc-base glib libgio expat zlib menu-cache slitaz-icon \
    3.22 -gtk+ alsa-lib wireless_tools libwnck lxsession"
    3.23 -BUILD_DEPENDS="gtk+-dev gettext expat-dev intltool menu-cache-dev \
    3.24 -lxmenu-data alsa-lib-dev wireless_tools-dev libwnck-dev"
    3.25 +# drop: slitaz-icon lxsession
    3.26 +DEPENDS="alsa-lib gtk+ libwnck menu-cache wireless_tools"
    3.27 +BUILD_DEPENDS="gtk+-dev menu-cache-dev libwnck-dev alsa-lib-dev \
    3.28 +wireless_tools-dev libxml2-dev lxmenu-data"
    3.29 +TAGS="gtk2 panel"
    3.30  
    3.31  # Rules to configure and make the package.
    3.32  compile_rules()
    3.33  {
    3.34 -	cd $src
    3.35 -	patch -p0 -i $stuff/cpu-size-color.patch || exit 1
    3.36 -	./configure --with-plugins=all $CONFIGURE_ARGS &&
    3.37 -	make && make install
    3.38 +	./configure \
    3.39 +		--sysconfdir=/etc \
    3.40 +		--localstatedir=/var \
    3.41 +		--with-plugins=all \
    3.42 +		$CONFIGURE_ARGS &&
    3.43 +	make &&
    3.44 +	make install
    3.45  }
    3.46  
    3.47  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.48  genpkg_rules()
    3.49  {
    3.50 -	mkdir -p $fs/usr/share $fs/usr/lib $fs/etc/xdg
    3.51 +	mkdir -p \
    3.52 +		$fs/usr/lib \
    3.53 +		$fs/usr/share/lxpanel/images \
    3.54 +		$fs/etc/lxpanel \
    3.55 +		$fs/etc/xdg
    3.56  
    3.57  	cp -a $install/usr/bin $fs/usr
    3.58 +
    3.59 +	# Plugins (kbled -> lxpanel-extra)
    3.60  	cp -a $install/usr/lib/lxpanel $fs/usr/lib
    3.61 -	cp -a $install/usr/share/lxpanel $fs/usr/share
    3.62 +	find $fs -name kbled.so -delete
    3.63  
    3.64 -	# Remove a few "heavy" and unuseful images (ns* goes in extra)
    3.65 -	for i in file-manager* *volume* mute.png gnome-[a-m]*.png \
    3.66 -		gnome-netstatus-*.png my-* ns-*.png *lock-*.png \
    3.67 -		background.png window-manager.png
    3.68 -	do
    3.69 -		rm $fs/usr/share/lxpanel/images/$i
    3.70 +	# Images
    3.71 +	imgs=usr/share/lxpanel/images
    3.72 +	for i in clock cpufreq-icon my-computer; do
    3.73 +		cp -a $install/$imgs/$i.png $fs/$imgs
    3.74  	done
    3.75  
    3.76 -	# Remove plugins --> lxpanel-extra
    3.77 -	rm $fs/usr/lib/lxpanel/plugins/kbled.so
    3.78 -	rm -rf $fs/usr/share/lxpanel/images/xkb-flags
    3.79 -
    3.80  	# Move profile to /etc/lxpanel (/usr maybe read-only) and default config
    3.81 -	mkdir $fs/etc
    3.82 -	mv -f $fs/usr/share/lxpanel/profile $fs/etc/lxpanel
    3.83 +	cp -a $install/usr/share/lxpanel/profile/* $fs/etc/lxpanel
    3.84  	ln -sf /etc/lxpanel $fs/usr/share/lxpanel/profile
    3.85  	mv -f $fs/etc/lxpanel/default $fs/etc/lxpanel/original
    3.86  	cp -a $stuff/default $fs/etc/lxpanel
    3.87 -
    3.88  	rm -rf $fs/etc/lxpanel/two_panels
    3.89  
    3.90  	# XDG autostart desktop file (lxsession will use it automaticaly)
    3.91  	cp -a $stuff/autostart $fs/etc/xdg
    3.92  
    3.93 -	# Make images symlinks so it feet SliTaz theme
    3.94 -	cd $fs/usr/share/lxpanel/images
    3.95 -	ln -s /usr/share/icons/SliTaz/status/32/network-idle.png ns-connected.png
    3.96 -	ln -s /usr/share/icons/SliTaz/status/32/network-offline.png ns-disconnect.png
    3.97 -	ln -s /usr/share/icons/SliTaz/status/32/network-receive.png ns-recvdata.png
    3.98 -	ln -s /usr/share/icons/SliTaz/status/32/network-receive.png ns-senddata.png
    3.99 -	ln -s /usr/share/icons/SliTaz/status/32/nm-adhoc.png ns-bothrs.png
   3.100 -	ln -s /usr/share/icons/SliTaz/status/32/network-error.png ns-problem.png
   3.101 +	cp -a $install/usr/share/lxpanel/ui $fs/usr/share/lxpanel
   3.102 +	cp -a $install/usr/share/lxpanel/x* $fs/usr/share/lxpanel
   3.103  }
     4.1 --- a/lxpanel/stuff/autostart/lxpanel.desktop	Fri Mar 29 09:07:22 2013 +0100
     4.2 +++ b/lxpanel/stuff/autostart/lxpanel.desktop	Sat Mar 30 18:45:07 2013 +0000
     4.3 @@ -1,6 +1,7 @@
     4.4  [Desktop Entry]
     4.5  Type=Application
     4.6  Name=LXPanel Desktop panel
     4.7 -name[fr]=Panneau du bureau LXPanel
     4.8 +Name[fr]=Panneau du bureau LXPanel
     4.9 +Name[ru]=Панель рабочего стола LXPanel
    4.10  Exec=lxpanel -p slitaz
    4.11 -NotShowIn=XFCE;Razor;
    4.12 \ No newline at end of file
    4.13 +NotShowIn=XFCE;Razor;