wok diff slim/receipt @ rev 25310

updated slim, slim-pam and slim-theme-default (1.3.5 -> 1.3.6)
author Hans-G?nter Theisgen
date Wed Jul 20 17:04:10 2022 +0100 (2022-07-20)
parents ac8ca9758df1
children ca6fa52862c9
line diff
     1.1 --- a/slim/receipt	Sat Jan 15 15:21:40 2022 +0000
     1.2 +++ b/slim/receipt	Wed Jul 20 17:04:10 2022 +0100
     1.3 @@ -1,32 +1,41 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="slim"
     1.7 -VERSION="1.3.5"
     1.8 +VERSION="1.3.6"
     1.9  CATEGORY="x-window"
    1.10 -SHORT_DESC="Desktop-independent graphical login manager for X11"
    1.11 +SHORT_DESC="Desktop-independent graphical login manager for X11."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -WEB_SITE="https://sourceforge.net/projects/slim.berlios/"
    1.15 +WEB_SITE="http://slim.berlios.de/"
    1.16 +REPOLOGY="slim-login-manager"
    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 -COOKOPTS="!pngquant op8"
    1.23 +WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL"
    1.24  
    1.25 -RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too
    1.26 +RELATED="slim-pam slim-theme-default"
    1.27  SUGGESTED="slim-theme-default slitaz-configs"
    1.28  DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu"
    1.29  BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev"
    1.30  
    1.31 +CONFIG_FILES="/etc/slim.conf"
    1.32 +
    1.33 +COOKOPTS="!pngquant op8"
    1.34 +
    1.35 +HOST_ARCH="i486 arm"
    1.36 +
    1.37 +# @maintainer:	Please update also slim-pam and slim-theme-default
    1.38 +
    1.39  # Handle cross compilation
    1.40  case "$ARCH" in
    1.41 -	i?86) 
    1.42 +	(i?86) 
    1.43  		BUILD_DEPENDS="$BUILD_DEPENDS cmake" 
    1.44  		INCL=/usr/include
    1.45 -		LIBS=/usr/lib ;;
    1.46 -	arm*)
    1.47 +		LIBS=/usr/lib
    1.48 +		;;
    1.49 +	(arm*)
    1.50  		INCL=/cross/$ARCH/sysroot/usr/include
    1.51 -		LIBS=/cross/$ARCH/sysroot/usr/lib ;;
    1.52 +		LIBS=/cross/$ARCH/sysroot/usr/lib
    1.53 +		;;
    1.54  esac
    1.55  
    1.56  current_version()
    1.57 @@ -38,33 +47,41 @@
    1.58  # Rules to configure and make the package.
    1.59  compile_rules()
    1.60  {
    1.61 -	patch -p1 < $stuff/$PACKAGE-$VERSION.patch || return 1
    1.62 -	mkdir build; cd build
    1.63 -	cmake \
    1.64 -		-DCMAKE_INSTALL_PREFIX=/usr \
    1.65 -		-DX11_Xmu_LIB="$LIBS/libXmu.so" \
    1.66 -		-DX11_Xft_INCLUDE_PATH=${INCL} \
    1.67 -		-DX11_Xmu_INCLUDE_PATH= ${INCL} \
    1.68 -		.. &&
    1.69 +	patch --input=$stuff/patches/app.cpp-$VERSION || return 1
    1.70 +	patch --input=$stuff/patches/cfg.cpp-$VERSION || return 1
    1.71 +	patch --input=$stuff/patches/slim.conf-$VERSION || return 1
    1.72 +
    1.73 +	# do NOT build slimlock
    1.74 +	sed -i	-e '/install(TARGETS slimlock/d'	CMakeLists.txt
    1.75 +
    1.76 +	mkdir	_build &&
    1.77 +	cd	_build &&
    1.78 +	cmake	..					\
    1.79 +		-D CMAKE_INSTALL_PREFIX=/usr		\
    1.80 +		-D X11_Xmu_LIB="$LIBS/libXmu.so"	\
    1.81 +		-D X11_Xft_INCLUDE_PATH=${INCL}		\
    1.82 +		-D X11_Xmu_INCLUDE_PATH=${INCL} &&
    1.83  	make &&
    1.84 -	make DESTDIR=$DESTDIR install
    1.85 +	make install DESTDIR=$DESTDIR
    1.86  }
    1.87  
    1.88  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.89  genpkg_rules()
    1.90  {
    1.91  	mkdir -p $fs/usr/share/slim
    1.92 -	cp -a $install/etc $fs
    1.93 -	cp -a $install/usr/bin $fs/usr
    1.94 -	cp -a $stuff/themes $fs/usr/share/slim
    1.95  
    1.96 -	# Config file and rc script.
    1.97 -	cp -a $stuff/etc $fs
    1.98 -	chown -R root.root $fs
    1.99 +	cp -a $install/etc	$fs
   1.100 +	cp -a $install/usr/bin	$fs/usr
   1.101 +	cp -a $install/usr/lib	$fs/usr
   1.102 +	cp -a $stuff/themes	$fs/usr/share/slim
   1.103  
   1.104 -	# slim-theme manager & default strings
   1.105 -	install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme
   1.106 -	install -m644 $stuff/strings $fs/usr/share/slim/strings
   1.107 +	# Configuration file and rc script.
   1.108 +	cp -a $stuff/etc	$fs
   1.109 +	chown -R root.root	$fs
   1.110 +
   1.111 +	# slim-theme manager and default strings
   1.112 +	install -m755 $stuff/slim-theme	$fs/usr/bin/slim-theme
   1.113 +	install -m644 $stuff/strings	$fs/usr/share/slim/strings
   1.114  }
   1.115  
   1.116  post_install()
   1.117 @@ -76,4 +93,7 @@
   1.118  	sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf"
   1.119  }
   1.120  
   1.121 -testsuite() { ldd $install/usr/bin/slim; }
   1.122 +testsuite()
   1.123 +{
   1.124 +	ldd $install/usr/bin/slim
   1.125 +}