wok-current rev 13364

Up: slim (1.3.3) Slim have a new miatainer :-) 1.3.4 is out but dont build
author Christophe Lincoln <pankso@slitaz.org>
date Thu Sep 13 21:59:17 2012 +0200 (2012-09-13)
parents f906096149bd
children ddd14a38cca0
files slim-pam/receipt slim-theme-default/receipt slim/receipt slim/stuff/etc/slim.conf slim/stuff/slim.service
line diff
     1.1 --- a/slim-pam/receipt	Thu Sep 13 10:26:15 2012 +0200
     1.2 +++ b/slim-pam/receipt	Thu Sep 13 21:59:17 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="slim-pam"
     1.7 -VERSION="1.3.2"
     1.8 +VERSION="1.3.3"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Desktop-independent graphical login manager for X11."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -12,20 +12,19 @@
    1.13  WGET_URL="http://download.berlios.de/slim/$TARBALL"
    1.14  CONFIG_FILES="/etc/slim.conf"
    1.15  PROVIDE="slim:pam"
    1.16 -BUGS="Sometime needs more than 10 seconds to start (since HAL/DCOP addition)."
    1.17  
    1.18 -DEPENDS="glibc-base gcc-lib-base expat fontconfig freetype util-linux-uuid zlib \
    1.19 -jpeg libpng xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
    1.20 -xorg-libXext xorg-libXft xorg-libXmu xorg-libXrender xorg-libXt \
    1.21 -pam"
    1.22 -BUILD_DEPENDS="pam-dev xorg-dev jpeg-dev libpng-dev"
    1.23 +DEPENDS="glibc-base gcc-lib-base expat fontconfig freetype util-linux-uuid \
    1.24 +zlib jpeg libpng xorg-libXft xorg-libXmu pam"
    1.25 +BUILD_DEPENDS="pam-dev xorg-libXft-dev xorg-libXmu-dev jpeg-dev libpng-dev cmake"
    1.26  
    1.27  # Rules to configure and make the package.
    1.28  compile_rules()
    1.29  {
    1.30  	cd $src
    1.31 -	make USE_PAM=1 &&
    1.32 -	make install
    1.33 +	cmake \
    1.34 +		-DCMAKE_INSTALL_PREFIX=/usr \
    1.35 +		-DUSE_PAM=yes . &&
    1.36 +	make && make DESTDIR=$DESTDIR install
    1.37  }
    1.38  
    1.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.40 @@ -33,8 +32,8 @@
    1.41  {
    1.42  	mkdir -p $fs/usr/share/slim
    1.43  	cp -a ../$SOURCE/stuff/themes $fs/usr/share/slim
    1.44 -	cp -a $_pkg/usr/bin $fs/usr
    1.45 -	
    1.46 +	cp -a $install/usr/bin $fs/usr
    1.47 +
    1.48  	# Config file and rc script.
    1.49  	cp -a ../$SOURCE/stuff/etc $fs
    1.50  	chown -R root.root $fs
     2.1 --- a/slim-theme-default/receipt	Thu Sep 13 10:26:15 2012 +0200
     2.2 +++ b/slim-theme-default/receipt	Thu Sep 13 21:59:17 2012 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="slim-theme-default"
     2.7 -VERSION="1.3.2"
     2.8 +VERSION="1.3.3"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="Slim login manager themes pack."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 @@ -13,5 +13,5 @@
    2.13  genpkg_rules()
    2.14  {
    2.15  	mkdir -p $fs/usr/share/slim
    2.16 -	cp -a $_pkg/usr/share/slim/themes $fs/usr/share/slim
    2.17 +	cp -a $install/usr/share/slim/themes $fs/usr/share/slim
    2.18  }
     3.1 --- a/slim/receipt	Thu Sep 13 10:26:15 2012 +0200
     3.2 +++ b/slim/receipt	Thu Sep 13 21:59:17 2012 +0200
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="slim"
     3.7 -VERSION="1.3.2"
     3.8 +VERSION="1.3.3" # 1.3.4
     3.9  CATEGORY="x-window"
    3.10  SHORT_DESC="Desktop-independent graphical login manager for X11."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12 @@ -12,16 +12,16 @@
    3.13  CONFIG_FILES="/etc/slim.conf"
    3.14  
    3.15  DEPENDS="glibc-base gcc-lib-base expat fontconfig freetype util-linux-uuid \
    3.16 -zlib jpeg libpng xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
    3.17 -xorg-libXext xorg-libXft xorg-libXmu xorg-libXrender xorg-libXt"
    3.18 -BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev"
    3.19 +zlib jpeg libpng xorg-libXft xorg-libXmu"
    3.20 +BUILD_DEPENDS="xorg-libXft-dev xorg-libXmu-dev jpeg-dev libpng-dev cmake"
    3.21  
    3.22  # Rules to configure and make the package.
    3.23  compile_rules()
    3.24  {
    3.25  	cd $src
    3.26 -	patch -p1 < $stuff/NoPwdForCmd.patch || return 1
    3.27 -	make && make DESTDIR=$WOK/$PACKAGE/install install
    3.28 +	#patch -p1 < $stuff/NoPwdForCmd.patch || return 1
    3.29 +	cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
    3.30 +	make && make DESTDIR=$DESTDIR install
    3.31  }
    3.32  
    3.33  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.34 @@ -29,7 +29,7 @@
    3.35  {
    3.36  	mkdir -p $fs/usr/share/slim
    3.37  	cp -a $stuff/themes $fs/usr/share/slim
    3.38 -	cp -a $_pkg/usr/bin $fs/usr
    3.39 +	cp -a $install/usr/bin $fs/usr
    3.40  
    3.41  	# Config file and rc script.
    3.42  	cp -a $stuff/etc $fs
     4.1 --- a/slim/stuff/etc/slim.conf	Thu Sep 13 10:26:15 2012 +0200
     4.2 +++ b/slim/stuff/etc/slim.conf	Thu Sep 13 21:59:17 2012 +0200
     4.3 @@ -63,6 +63,7 @@
     4.4  # default user, leave blank or remove this line
     4.5  # for avoid pre-loading the username.
     4.6  default_user        tux
     4.7 +#focus_password      true
     4.8  
     4.9  # current theme, use comma separated list to specify a set to
    4.10  # randomly choose from
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/slim/stuff/slim.service	Thu Sep 13 21:59:17 2012 +0200
     5.3 @@ -0,0 +1,11 @@
     5.4 +# Systemd service file for Slim on SliTaz
     5.5 +
     5.6 +[Unit]
     5.7 +Description=Slim Login Manager
     5.8 +After=systemd-user-sessions.service
     5.9 +
    5.10 +[Service]
    5.11 +ExecStart=/usr/bin/slim
    5.12 +
    5.13 +[Install]
    5.14 +Alias=display-manager.service