wok-6.x diff jwm/receipt @ rev 22825

Up rage (0.3.1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Feb 07 12:27:53 2020 +0100 (2020-02-07)
parents e3f377fbc5f0
children ad8b9ff412d2
line diff
     1.1 --- a/jwm/receipt	Thu Jan 24 17:15:36 2019 +0100
     1.2 +++ b/jwm/receipt	Fri Feb 07 12:27:53 2020 +0100
     1.3 @@ -1,22 +1,24 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="jwm"
     1.7 -VERSION="2.2.0"
     1.8 +VERSION="2.3.7"
     1.9  CATEGORY="x-window"
    1.10 -SHORT_DESC="JWM is a light Window Manager for the X window system."
    1.11 +TAGS="window-manager"
    1.12 +SHORT_DESC="A light Window Manager for the X window system."
    1.13  MAINTAINER="pankso@slitaz.org"
    1.14  LICENSE="GPL2"
    1.15 +WEB_SITE="http://joewing.net/projects/jwm/"
    1.16 +
    1.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.18 -WEB_SITE="http://joewing.net/projects/jwm/"
    1.19 -WGET_URL="http://joewing.net/programs/jwm/releases/$TARBALL"
    1.20 -TAGS="window-manager"
    1.21 +WGET_URL="${WEB_SITE}releases/$TARBALL"
    1.22 +
    1.23 +DEPENDS="hsetroot imlib2 libjpeg libpng slitaz-configs-base \
    1.24 +	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \
    1.25 +	xorg-libXinerama xorg-libXmu xorg-libXpm xorg-libXrender \
    1.26 +	xorg-libXt xorg-xclock xorg-xload"
    1.27 +BUILD_DEPENDS="jpeg-dev libpng-dev xorg-libX11-dev xorg-libXft-dev"
    1.28  HOST_ARCH="i486 arm"
    1.29  
    1.30 -DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
    1.31 -xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
    1.32 -libpng slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot"
    1.33 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng-dev"
    1.34 -
    1.35  # Handle cross compilation
    1.36  case "$ARCH" in
    1.37  	arm)
    1.38 @@ -31,16 +33,17 @@
    1.39  {
    1.40  	#[ -f done.resize-backgound.u ] || patch -p1 < $stuff/resize-backgound.u
    1.41  	#touch done.resize-backgound.u
    1.42 -	./configure \
    1.43 -    	--prefix=/usr \
    1.44 -    	--mandir=/usr/share/man \
    1.45 -		--sysconfdir=/etc/xdg/jwm \
    1.46 -		--disable-fribidi \
    1.47 -		--disable-rpath \
    1.48 -		--disable-rsvg \
    1.49 -		--disable-confirm \
    1.50 +	./configure				\
    1.51 +		--prefix=/usr			\
    1.52 +		--mandir=/usr/share/man		\
    1.53 +		--sysconfdir=/etc/xdg/jwm	\
    1.54 +		--disable-fribidi		\
    1.55 +		--disable-rpath			\
    1.56 +		--disable-rsvg			\
    1.57 +		--disable-confirm		\
    1.58  		$CONFIGURE_ARGS $ARCH_ARGS 2>/dev/null &&
    1.59 -	make && make install
    1.60 +	make -j 1 &&
    1.61 +	make install
    1.62  }
    1.63  
    1.64  testsuite()
    1.65 @@ -51,11 +54,15 @@
    1.66  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.67  genpkg_rules()
    1.68  {
    1.69 -	mkdir -p $fs/etc/xdg/jwm $fs/usr/share
    1.70 +	mkdir -p $fs/etc/xdg/jwm
    1.71 +	mkdir -p $fs/usr/share
    1.72 +
    1.73  	cp -a $install/usr/bin $fs/usr/bin
    1.74 +
    1.75  	# Simple and default config file.
    1.76  	cp $stuff/simple.jwmrc $fs/etc/xdg/jwm/simple.jwmrc
    1.77  	cp $stuff/slitaz.jwmrc $fs/etc/xdg/jwm/system.jwmrc
    1.78 +
    1.79  	cp -r $stuff/xsessions $fs/usr/share
    1.80  }
    1.81  
    1.82 @@ -65,8 +72,9 @@
    1.83  		echo "Removing old system wide configs: /etc/jwm"
    1.84  		rm -rf "$1/etc/jwm"
    1.85  	fi
    1.86 +
    1.87 +	# Adding WM to SLIM available sessions.
    1.88  	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
    1.89 -	# Adding WM to SLIM available sessions.
    1.90  	if ! echo "$res" | grep -q $PACKAGE; then
    1.91  		echo -n "Adding $PACKAGE to /etc/slim.conf..."
    1.92  		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"