# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1647152026 -3600
# Node ID fba451138c89be2b87a9612a57ed382149c19971
# Parent  0f28e2050421db1e44afd0e1983c48496dc48328
updated jwm (2.3.7 -> 2.4.1)

diff -r 0f28e2050421 -r fba451138c89 jwm-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jwm-lang/receipt	Sun Mar 13 07:13:46 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="jwm-lang"
+VERSION="2.4.1"
+CATEGORY="localization"
+SHORT_DESC="A light Window Manager for the X window system - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://joewing.net/projects/jwm/"
+
+WANTED="jwm"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r 0f28e2050421 -r fba451138c89 jwm/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jwm/description.txt	Sun Mar 13 07:13:46 2022 +0100
@@ -0,0 +1,6 @@
+JWM is a light-weight window manager for the X11 Window System.
+JWM is written in C and uses only Xlib at a minimum.
+Because of its small footprint, JWM makes a good window manager
+for older computers and less powerful systems, such as the
+Raspberry Pi, though it is perfectly capable of running on modern
+systems.
diff -r 0f28e2050421 -r fba451138c89 jwm/receipt
--- a/jwm/receipt	Sat Mar 12 15:46:33 2022 +0100
+++ b/jwm/receipt	Sun Mar 13 07:13:46 2022 +0100
@@ -1,22 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="jwm"
-VERSION="2.3.7"
+VERSION="2.4.1"
 CATEGORY="x-window"
 TAGS="window-manager"
 SHORT_DESC="A light Window Manager for the X window system."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://joewing.net/projects/jwm/"
+WEB_SITE="https://joewing.net/projects/jwm/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
-DEPENDS="hsetroot imlib2 libjpeg libpng slitaz-configs-base \
-	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \
-	xorg-libXinerama xorg-libXmu xorg-libXpm xorg-libXrender \
+SUGGESTED="jwm-lang"
+DEPENDS="hsetroot imlib2 libjpeg libpng librsvg libxml2 slitaz-configs-base
+	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft
+	xorg-libXinerama xorg-libXmu xorg-libXpm xorg-libXrender
 	xorg-libXt xorg-xclock xorg-xload"
-BUILD_DEPENDS="jpeg-dev libpng-dev xorg-libX11-dev xorg-libXft-dev"
+BUILD_DEPENDS="cairo-dev freetype-dev jpeg-dev libpng-dev librsvg-dev 
+	libxml2-dev xorg-libX11-dev xorg-libXft-dev"
+
 HOST_ARCH="i486 arm"
 
 # Handle cross compilation
@@ -40,16 +43,23 @@
 {
 	#[ -f done.resize-backgound.u ] || patch -p1 < $stuff/resize-backgound.u
 	#touch done.resize-backgound.u
+
 	./configure				\
 		--prefix=/usr			\
 		--mandir=/usr/share/man		\
+		--datadir=/usr/share		\
 		--sysconfdir=/etc/xdg/jwm	\
-		--disable-fribidi		\
-		--disable-rpath			\
-		--disable-rsvg			\
-		--disable-confirm		\
-		$CONFIGURE_ARGS $ARCH_ARGS 2>/dev/null &&
-	make -j 1 &&
+		--enable-cairo=yes		\
+		--enable-confirm=no		\
+		--enable-nls=yes		\
+		--enable-rpath=no		\
+		--enable-rsvg=yes		\
+		--enable-xft=yes		\
+		$CONFIGURE_ARGS			\
+		$ARCH_ARGS &&
+	sed -i 's|mkdir_p = @mkdir_p@|mkdir_p = /bin/mkdir -p|' \
+		po/Makefile &&
+	make &&
 	make install
 }
 
@@ -64,27 +74,30 @@
 	mkdir -p $fs/etc/xdg/jwm
 	mkdir -p $fs/usr/share
 
-	cp -a $install/usr/bin $fs/usr/bin
+	cook_copy_folders	bin
 
-	# Simple and default config file.
-	cp $stuff/simple.jwmrc $fs/etc/xdg/jwm/simple.jwmrc
-	cp $stuff/slitaz.jwmrc $fs/etc/xdg/jwm/system.jwmrc
+	# Simple and default configuration file.
+	cp $stuff/simple.jwmrc	$fs/etc/xdg/jwm/simple.jwmrc
+	cp $stuff/slitaz.jwmrc	$fs/etc/xdg/jwm/system.jwmrc
 
-	cp -r $stuff/xsessions $fs/usr/share
+	cp -r $stuff/xsessions	$fs/usr/share
 }
 
 post_install()
 {
-	if [ -d "$1/etc/jwm" ]; then
-		echo "Removing old system wide configs: /etc/jwm"
-		rm -rf "$1/etc/jwm"
+	if [ -d "$1/etc/jwm" ]
+	  then
+		echo "Removing old system wide configuration files: /etc/jwm"
+		rm -rf	"$1/etc/jwm"
 	fi
 
 	# Adding WM to SLIM available sessions.
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
-	if ! echo "$res" | grep -q $PACKAGE; then
+	if ! echo "$res" | grep -q $PACKAGE
+	  then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
+		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" \
+			"$1/etc/slim.conf"
 		status
 	fi
 	true
@@ -93,7 +106,8 @@
 post_remove()
 {
 	# Remove WM from SLIM available sessions.
-	if grep -q $PACKAGE "$1/etc/slim.conf"; then
-		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
+	if grep -q $PACKAGE "$1/etc/slim.conf"
+	  then
+		sed -i s/,$PACKAGE//	"$1/etc/slim.conf"
 	fi
 }
diff -r 0f28e2050421 -r fba451138c89 jwm/stuff/xsessions/jwm.desktop
--- a/jwm/stuff/xsessions/jwm.desktop	Sat Mar 12 15:46:33 2022 +0100
+++ b/jwm/stuff/xsessions/jwm.desktop	Sun Mar 13 07:13:46 2022 +0100
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Type=XSession
 Name=JWM Desktop
+Name[de]=Fensterverwaltung JWM
 Name[fr]=Bureau JWM
 Exec=jwm