wok diff jwm/receipt @ rev 25609
Update some current_version
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jul 20 14:03:05 2023 +0000 (16 months ago) |
parents | ad8b9ff412d2 |
children |
line diff
1.1 --- a/jwm/receipt Sat Feb 12 18:42:31 2022 +0000 1.2 +++ b/jwm/receipt Thu Jul 20 14:03:05 2023 +0000 1.3 @@ -1,22 +1,25 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="jwm" 1.7 -VERSION="2.3.7" 1.8 +VERSION="2.4.1" 1.9 CATEGORY="x-window" 1.10 TAGS="window-manager" 1.11 SHORT_DESC="A light Window Manager for the X window system." 1.12 MAINTAINER="pankso@slitaz.org" 1.13 LICENSE="GPL2" 1.14 -WEB_SITE="http://joewing.net/projects/jwm/" 1.15 +WEB_SITE="https://joewing.net/projects/jwm/" 1.16 1.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 1.18 WGET_URL="${WEB_SITE}releases/$TARBALL" 1.19 1.20 -DEPENDS="hsetroot imlib2 libjpeg libpng slitaz-configs-base \ 1.21 - xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \ 1.22 - xorg-libXinerama xorg-libXmu xorg-libXpm xorg-libXrender \ 1.23 +SUGGESTED="jwm-lang" 1.24 +DEPENDS="hsetroot imlib2 libjpeg libpng librsvg libxml2 slitaz-configs-base 1.25 + xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft 1.26 + xorg-libXinerama xorg-libXmu xorg-libXpm xorg-libXrender 1.27 xorg-libXt xorg-xclock xorg-xload" 1.28 -BUILD_DEPENDS="jpeg-dev libpng-dev xorg-libX11-dev xorg-libXft-dev" 1.29 +BUILD_DEPENDS="cairo-dev freetype-dev jpeg-dev libpng-dev librsvg-dev 1.30 + libxml2-dev xorg-libX11-dev xorg-libXft-dev" 1.31 + 1.32 HOST_ARCH="i486 arm" 1.33 1.34 # Handle cross compilation 1.35 @@ -40,16 +43,23 @@ 1.36 { 1.37 #[ -f done.resize-backgound.u ] || patch -p1 < $stuff/resize-backgound.u 1.38 #touch done.resize-backgound.u 1.39 + 1.40 ./configure \ 1.41 --prefix=/usr \ 1.42 --mandir=/usr/share/man \ 1.43 + --datadir=/usr/share \ 1.44 --sysconfdir=/etc/xdg/jwm \ 1.45 - --disable-fribidi \ 1.46 - --disable-rpath \ 1.47 - --disable-rsvg \ 1.48 - --disable-confirm \ 1.49 - $CONFIGURE_ARGS $ARCH_ARGS 2>/dev/null && 1.50 - make -j 1 && 1.51 + --enable-cairo=yes \ 1.52 + --enable-confirm=no \ 1.53 + --enable-nls=yes \ 1.54 + --enable-rpath=no \ 1.55 + --enable-rsvg=yes \ 1.56 + --enable-xft=yes \ 1.57 + $CONFIGURE_ARGS \ 1.58 + $ARCH_ARGS && 1.59 + sed -i 's|mkdir_p = @mkdir_p@|mkdir_p = /bin/mkdir -p|' \ 1.60 + po/Makefile && 1.61 + make && 1.62 make install 1.63 } 1.64 1.65 @@ -64,27 +74,30 @@ 1.66 mkdir -p $fs/etc/xdg/jwm 1.67 mkdir -p $fs/usr/share 1.68 1.69 - cp -a $install/usr/bin $fs/usr/bin 1.70 + cook_copy_folders bin 1.71 1.72 - # Simple and default config file. 1.73 - cp $stuff/simple.jwmrc $fs/etc/xdg/jwm/simple.jwmrc 1.74 - cp $stuff/slitaz.jwmrc $fs/etc/xdg/jwm/system.jwmrc 1.75 + # Simple and default configuration 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 + cp -r $stuff/xsessions $fs/usr/share 1.81 } 1.82 1.83 post_install() 1.84 { 1.85 - if [ -d "$1/etc/jwm" ]; then 1.86 - echo "Removing old system wide configs: /etc/jwm" 1.87 - rm -rf "$1/etc/jwm" 1.88 + if [ -d "$1/etc/jwm" ] 1.89 + then 1.90 + echo "Removing old system wide configuration files: /etc/jwm" 1.91 + rm -rf "$1/etc/jwm" 1.92 fi 1.93 1.94 # Adding WM to SLIM available sessions. 1.95 res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//) 1.96 - if ! echo "$res" | grep -q $PACKAGE; then 1.97 + if ! echo "$res" | grep -q $PACKAGE 1.98 + then 1.99 echo -n "Adding $PACKAGE to /etc/slim.conf..." 1.100 - sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" "$1/etc/slim.conf" 1.101 + sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" \ 1.102 + "$1/etc/slim.conf" 1.103 status 1.104 fi 1.105 true 1.106 @@ -93,7 +106,8 @@ 1.107 post_remove() 1.108 { 1.109 # Remove WM from SLIM available sessions. 1.110 - if grep -q $PACKAGE "$1/etc/slim.conf"; then 1.111 - sed -i s/,$PACKAGE// "$1/etc/slim.conf" 1.112 + if grep -q $PACKAGE "$1/etc/slim.conf" 1.113 + then 1.114 + sed -i s/,$PACKAGE// "$1/etc/slim.conf" 1.115 fi 1.116 }