wok-next diff slim/receipt @ rev 20043

gdb: update bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Oct 22 21:23:15 2017 +0200 (2017-10-22)
parents 9e01bc6321ea
children 2ec88e5df2dd
line diff
     1.1 --- a/slim/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/slim/receipt	Sun Oct 22 21:23:15 2017 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="slim"
     1.8  VERSION="1.3.5"
     1.9 @@ -6,65 +6,85 @@
    1.10  SHORT_DESC="Desktop-independent graphical login manager for X11"
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 -WEB_SITE="http://slim.berlios.de/"
    1.14 +WEB_SITE="https://sourceforge.net/projects/slim.berlios/"
    1.15 +HOST_ARCH="i486 arm"
    1.16 +COOKOPTS="!pngquant op8"
    1.17 +
    1.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.19 -WGET_URL="http://download.berlios.de/slim/$TARBALL"
    1.20 -CONFIG_FILES="/etc/slim.conf"
    1.21 -HOST_ARCH="i486 arm"
    1.22 +WGET_URL="$SF_MIRROR/slim.berlios/$TARBALL"
    1.23  
    1.24 -RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too
    1.25 -SUGGESTED="slim-theme-default slitaz-configs"
    1.26 -DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu"
    1.27 -BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev"
    1.28 -
    1.29 -# Handle cross compilation
    1.30 -case "$ARCH" in
    1.31 -	i?86) 
    1.32 -		BUILD_DEPENDS="$BUILD_DEPENDS cmake" 
    1.33 -		INCL=/usr/include
    1.34 -		LIBS=/usr/lib ;;
    1.35 -	arm*)
    1.36 -		INCL=/cross/$ARCH/sysroot/usr/include
    1.37 -		LIBS=/cross/$ARCH/sysroot/usr/lib ;;
    1.38 -esac
    1.39 +BUILD_DEPENDS_arm="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \
    1.40 +xorg-libXmu-dev"
    1.41 +BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
    1.42 +libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev"
    1.43 +SPLIT="slim-theme-default slim"
    1.44 +SIBLINGS="slim-pam"
    1.45  
    1.46  # Rules to configure and make the package.
    1.47  compile_rules()
    1.48  {
    1.49 -	patch -p1 < $stuff/$PACKAGE-$VERSION.patch || return 1
    1.50 +	# Handle cross compilation
    1.51 +	case "$ARCH" in
    1.52 +		i?86)
    1.53 +			INCL=/usr/include
    1.54 +			LIBS=/usr/lib ;;
    1.55 +		arm*)
    1.56 +			INCL=/cross/$ARCH/sysroot/usr/include
    1.57 +			LIBS=/cross/$ARCH/sysroot/usr/lib ;;
    1.58 +	esac
    1.59 +
    1.60  	mkdir build; cd build
    1.61  	cmake \
    1.62  		-DCMAKE_INSTALL_PREFIX=/usr \
    1.63  		-DX11_Xmu_LIB="$LIBS/libXmu.so" \
    1.64 -		-DX11_Xft_INCLUDE_PATH=${INCL} \
    1.65 -		-DX11_Xmu_INCLUDE_PATH= ${INCL} \
    1.66 +		-DX11_Xft_INCLUDE_PATH=$INCL \
    1.67 +		-DX11_Xmu_INCLUDE_PATH=$INCL \
    1.68  		.. &&
    1.69  	make &&
    1.70 -	make DESTDIR=$DESTDIR install
    1.71 +	make DESTDIR=$DESTDIR install || exit 1
    1.72 +
    1.73 +	cp -r $stuff/themes $install/usr/share/slim
    1.74 +
    1.75 +	# Config file and rc script.
    1.76 +	cp -a $stuff/etc $install
    1.77 +
    1.78 +	# slim-theme manager & default strings
    1.79 +	install -m755 $stuff/slim-theme $install/usr/bin/slim-theme
    1.80 +	install -m644 $stuff/strings    $install/usr/share/slim/strings
    1.81 +
    1.82 +	chown -R root:root $install
    1.83  }
    1.84  
    1.85  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.86 -genpkg_rules()
    1.87 -{
    1.88 -	mkdir -p $fs/usr/share/slim
    1.89 -	cp -a $install/etc $fs
    1.90 -	cp -a $install/usr/bin $fs/usr
    1.91 -	cp -a $stuff/themes $fs/usr/share/slim
    1.92 -
    1.93 -	# Config file and rc script.
    1.94 -	cp -a $stuff/etc $fs
    1.95 -	chown -R root.root $fs
    1.96 -
    1.97 -	# slim-theme manager & default strings
    1.98 -	install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme
    1.99 -	install -m644 $stuff/strings $fs/usr/share/slim/strings
   1.100 +genpkg_rules() {
   1.101 +	case $PACKAGE in
   1.102 +		slim-theme-default)
   1.103 +			CAT="customization|default theme bundled with SLiM"
   1.104 +			copy default/
   1.105 +			DEPENDS="slim slitaz-configs-base"
   1.106 +			;;
   1.107 +		slim)
   1.108 +			copy @std
   1.109 +			remove_already_packed
   1.110 +			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
   1.111 +			xorg-libXft xorg-libXmu xorg-libXrender zlib"
   1.112 +			CONFIG_FILES="/etc/slim.conf"
   1.113 +			SUGGESTED="slim-theme-default slitaz-configs"
   1.114 +			;;
   1.115 +	esac
   1.116  }
   1.117  
   1.118 -post_install()
   1.119 -{
   1.120 -	local USER
   1.121 -	USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd")
   1.122 +post_install_slim() {
   1.123 +	local USER=$(awk -F: '/:1000:1000:/ { print $1 }' "$1/etc/passwd")
   1.124  	[ -n "$USER" ] &&
   1.125  	sed -i s/"default_user .*"/"default_user        $USER"/ "$1/etc/slim.conf"
   1.126  	sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf"
   1.127  }
   1.128 +
   1.129 +post_install_slim_theme_default() {
   1.130 +	chroot "$1/" slim-theme -sdefault
   1.131 +}
   1.132 +
   1.133 +pre_remove_slim_theme_default() {
   1.134 +	chroot "$1/" slim-theme -fdefault
   1.135 +}