Update the copyright notice

doc/docbook.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2024 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -28,14 +28,17 @@
 CONFIGSH="${0%/docbook.sh}/../config.sh"
 PREFIX="/usr/local"
 PROGNAME="docbook.sh"
+XSL_HTML="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"
+XSL_MAN="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+XSL_PDF="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
 #executables
 DEBUG="_debug"
 FOP="fop"
 INSTALL="install -m 0644"
 MKDIR="mkdir -m 0755 -p"
 RM="rm -f"
-XMLLINT="xmllint"
+XMLLINT="xmllint --noent --nonet --xinclude --path ${PWD}"
-XSLTPROC="xsltproc --nonet --xinclude"
+XSLTPROC="xsltproc --nonet --xinclude --path ${PWD}"
 
 [ -f "$CONFIGSH" ] && . "$CONFIGSH"
 
@@ -60,18 +63,20 @@ _docbook()
 	ext="${ext##.}"
 	case "$ext" in
 		html)
-			XSL="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"
+			XSL="$XSL_HTML"
 			[ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl"
 			[ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl"
 			if [ -f "${target%.*}.css.xml" ]; then
-				XSLTPROC="$XSLTPROC --param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1"
+				XSLTPROC_PARAMS="--param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1"
 			elif [ -f "${source%.*}.css.xml" ]; then
-				XSLTPROC="$XSLTPROC --param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1"
+				XSLTPROC_PARAMS="--param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1"
+			else
+				XSLTPROC_PARAMS=
 			fi
-			$DEBUG $XSLTPROC -o "$target" "$XSL" "$source"
+			$DEBUG $XSLTPROC $XSLTPROC_PARAMS -o "$target" "$XSL" "$source"
 			;;
 		pdf)
-			XSL="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
+			XSL="$XSL_PDF"
 			[ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl"
 			[ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl"
 			$DEBUG $XSLTPROC -o "${target%.*}.fo" "$XSL" "$source" &&
@@ -79,7 +84,7 @@ _docbook()
 			$RM -- "${target%.*}.fo"
 			;;
 		1|2|3|4|5|6|7|8|9)
-			XSL="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+			XSL="$XSL_MAN"
 			$DEBUG $XSLTPROC -o "$target" "$XSL" "$source"
 			;;
 		*)
@@ -170,7 +175,7 @@ while [ $# -gt 0 ]; do
 			source="${target#$OBJDIR}"
 			source="${source%.*}.xml"
 			xpath="string(/refentry/refmeta/manvolnum)"
-			section=$($XMLLINT --xpath "$xpath" "$source")
+			section=$($DEBUG $XMLLINT --xpath "$xpath" "$source")
 			if [ $? -eq 0 -a -n "$section" ]; then
 				instdir="$MANDIR/html$section"
 			fi

src/progress.c

@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2007-2019 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2007-2025 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Accessories */
 /* All rights reserved.
  *
@@ -43,7 +43,9 @@
 #include <libintl.h>
 #include <gtk/gtk.h>
 #if GTK_CHECK_VERSION(3, 0, 0)
-# include <gtk/gtkx.h>
+# if defined(GDK_WINDOWING_X11)
+#  include <gtk/gtkx.h>
+# endif
 #endif
 #include "../config.h"
 #define _(string) gettext(string)
@@ -193,12 +195,14 @@ static int _progress(Prefs * prefs, char * argv[])
 		g_signal_connect_swapped(p.window, "delete-event", G_CALLBACK(
 					_progress_closex), p.window);
 	}
+#if defined(GDK_WINDOWING_X11)
 	else
 	{
 		p.window = gtk_plug_new(0);
 		g_signal_connect_swapped(p.window, "embedded", G_CALLBACK(
 					_progress_embedded), &p);
 	}
+#endif
 #if GTK_CHECK_VERSION(3, 0, 0)
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -333,6 +337,7 @@ static int _progress(Prefs * prefs, char * argv[])
 	if((prefs->flags & PREFS_x) == 0)
 		/* show the window */
 		gtk_widget_show(p.window);
+#if defined(GDK_WINDOWING_X11)
 	else
 	{
 		/* print the window ID and force a flush */
@@ -340,6 +345,7 @@ static int _progress(Prefs * prefs, char * argv[])
 		printf("%lu\n", id);
 		fclose(stdout);
 	}
+#endif
 	gtk_main();
 	close(p.fd);
 	close(p.fds[1]);

tests/clint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2016-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2016-2021 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -33,6 +33,7 @@ PROJECTCONF="../project.conf"
 #executables
 DATE="date"
 DEBUG="_debug"
+ECHO="/bin/echo"
 FIND="find"
 GREP="grep"
 LINT="lint -g"
@@ -68,41 +69,52 @@ _clint()
 	fi
 	for subdir in $subdirs; do
 		[ -d "../$subdir" ] || continue
-		for filename in $($FIND "../$subdir" -type f | $SORT); do
+		while read filename; do
+			[ -n "$filename" ] || continue
+			r=0
 			case "$filename" in
 				*.c)
 					echo
-					(_clint_lint "$filename";
+					_clint_lint "$filename"	|| r=$?
-						_clint_rtrim "$filename")
+					_clint_rtrim "$filename"|| r=$?
 					;;
 				*.h)
 					echo
 					echo "$filename:"
-					(_clint_rtrim "$filename")
+					_clint_rtrim "$filename"|| r=$?
 					;;
 				*)
 					continue
 					;;
 			esac
-			if [ $? -ne 0 ]; then
+			if [ $r -eq 0 ]; then
+				echo " OK"
+				echo "$PROGNAME: $filename: OK" 1>&2
+			else
 				echo "FAIL"
 				echo "$PROGNAME: $filename: FAIL" 1>&2
 				res=2
-			else
-				echo "OK"
 			fi
-		done
+		done << EOF
+$($FIND "../$subdir" -type f | $SORT)
+EOF
 	done
 	return $res
 }
 
 _clint_lint()
-{
+{(
 	filename="$1"
 
-	echo -n "${filename%/*}/"
+	$ECHO -n "${filename%/*}/"
 	$DEBUG $LINT $CPPFLAGS $CFLAGS "$filename" 2>&1
-}
+	ret=$?
+	if [ $ret -eq 127 ]; then
+		#XXX ignore errors when $LINT is not available
+		ret=0
+	fi
+	return $ret
+)}
 
 _clint_rtrim()
 {
@@ -118,10 +130,6 @@ _debug()
 {
 	echo "$@" 1>&3
 	"$@"
-	res=$?
-	#ignore errors when the command is not available
-	[ $res -eq 127 ]					&& return 0
-	return $res
 }
 
 

tests/fixme.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2017-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2017-2022 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -95,7 +95,7 @@ _fixme_callback()
 			echo "_fixme_callback_asm"
 			return 0
 			;;
-		c|cc|cpp|cxx|h|js|v)
+		c|cc|cpp|cxx|go|h|js|v)
 			echo "_fixme_callback_c"
 			return 0
 			;;
@@ -122,7 +122,7 @@ _fixme_callback()
 			echo "_fixme_callback_python"
 			return 0
 			;;
-		"<html"*|"<?xml"*)
+		"<!DOCTYPE"*|"<!doctype"*|"<HTML"*|"<html"*|"<?xml"*)
 			echo "_fixme_callback_xml"
 			return 0
 			;;
@@ -199,10 +199,6 @@ _debug()
 {
 	echo "$@" 1>&3
 	"$@"
-	res=$?
-	#ignore errors when the command is not available
-	[ $res -eq 127 ]					&& return 0
-	return $res
 }