Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xload for openSUSE:Factory checked in at 2026-07-21 23:11:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xload (Old) and /work/SRC/openSUSE:Factory/.xload.new.24530 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xload" Tue Jul 21 23:11:23 2026 rev:11 rq:1366934 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xload/xload.changes 2024-03-25 21:18:26.511988777 +0100 +++ /work/SRC/openSUSE:Factory/.xload.new.24530/xload.changes 2026-07-21 23:11:34.648712144 +0200 @@ -1,0 +2,12 @@ +Tue Jul 21 11:23:57 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.1: + * meson: include headers when checking for other functions + * meson: include libintl.h when checking for gettext() + * Strip trailing whitespace from source files + * gitlab CI: drop the ci-fairy check-mr job + * man page: fix warnings from mandoc -T lint + * Improve man page formatting +- Switch to meson build system + +------------------------------------------------------------------- Old: ---- xload-1.2.0.tar.xz New: ---- xload-1.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xload.spec ++++++ --- /var/tmp/diff_new_pack.bc9JaH/_old 2026-07-21 23:11:35.152729379 +0200 +++ /var/tmp/diff_new_pack.bc9JaH/_new 2026-07-21 23:11:35.156729515 +0200 @@ -1,7 +1,7 @@ # # spec file for package xload # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xload -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: X utility to display system load average License: MIT @@ -26,12 +26,12 @@ Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz Source1: xload.desktop Source2: xload.png +BuildRequires: meson >= 1.1.0 BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) # This was part of the xorg-x11 package up to version 7.6 @@ -46,11 +46,11 @@ cp %{SOURCE1} . %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file -i -u xload System Monitor install -m0644 -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/xload.png ++++++ xload-1.2.0.tar.xz -> xload-1.2.1.tar.xz ++++++ ++++ 10779 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/ChangeLog new/xload-1.2.1/ChangeLog --- old/xload-1.2.0/ChangeLog 2024-03-24 18:14:18.000000000 +0100 +++ new/xload-1.2.1/ChangeLog 2026-07-20 00:06:38.000000000 +0200 @@ -1,3 +1,103 @@ +commit 54c418c46a2f1353be47b6a7d1cdb8e06c45fe8a +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 19 15:00:19 2026 -0700 + + xload 1.2.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 62dddf6f1018db2ce9e5295e65f08c3a2523ec37 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 2 17:39:48 2026 -0700 + + meson: include headers when checking for other functions + + Try to avoid the same problem fixed by the previous commit. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/15> + +commit c6a9dc74fb136b4a1ce2d322fb6d9c1f02d2a4a5 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 30 17:03:02 2026 -0700 + + meson: include libintl.h when checking for gettext() + + Trying to workaround https://github.com/mesonbuild/meson/issues/3740 + which causes meson to fail to detect it needs to link against libintl + for gettext() on NetBSD. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/15> + +commit 4ac6abc9300504e89f02aa22f30905b79c2c4df3 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 24 13:50:42 2026 -0700 + + meson: Add option to build with meson + + Also updates the gitlab CI config to test both build types + and compare the generated output/installed files. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/14> + +commit c7f22b55c6966f8eef4e0a1ec5a03fb49e73d00e +Author: Alan Coopersmith <[email protected]> +Date: Sun May 24 11:25:10 2026 -0700 + + Strip trailing whitespace from source files + + Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'` + + `git diff -w` & `git diff -b` show no diffs from this change + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/14> + +commit ea20032cdd9344ca4dc240a44107d30892b52339 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 11 11:20:41 2026 -0800 + + gitlab CI: drop the ci-fairy check-mr job + + The only thing this checked was the checkbox for allowing maintainers to + edit the MR. Changed permissions checks now fail this job but luckily + the setting it checked has been the default for years anyway so we can + drop it. + + https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/81 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/14> + +commit 52c6fd2a0393d8cc0176dbafbd75fad178b66bb6 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 09:12:30 2025 -0700 + + man page: fix warnings from `mandoc -T lint` + + mandoc: xload.1:2:13: WARNING: cannot parse date, using it verbatim: TH xload 1.2.0 + mandoc: xload.1:24:2: WARNING: skipping paragraph macro: PP empty + mandoc: xload.1:55:2: WARNING: skipping paragraph macro: PP empty + mandoc: xload.1:17:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xload.1:94:2: WARNING: skipping paragraph macro: PP empty + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/13> + +commit c0497dad0bc0ca9a7c4c9b4aa3dea6c5584641c5 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 13:00:55 2025 -0700 + + Improve man page formatting + + More closely follow common style as described on + https://man7.org/linux/man-pages/man7/man-pages.7.html + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xload/-/merge_requests/12> + commit 624100511d6ac22f254bcf7f0cde12febc2e74a2 Author: Alan Coopersmith <[email protected]> Date: Sun Mar 24 09:59:41 2024 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/Makefile.am new/xload-1.2.1/Makefile.am --- old/xload-1.2.0/Makefile.am 2024-03-24 18:14:07.000000000 +0100 +++ new/xload-1.2.1/Makefile.am 2026-07-20 00:06:26.000000000 +0200 @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -43,6 +43,7 @@ app-defaults/XLoad EXTRA_DIST = xload.bit README.md +EXTRA_DIST += meson.build meson.options po/LINGUAS po/POTFILES po/meson.build MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/compile new/xload-1.2.1/compile --- old/xload-1.2.0/compile 2024-03-24 18:14:13.000000000 +0100 +++ new/xload-1.2.1/compile 2026-07-20 00:06:32.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -143,7 +156,7 @@ # configure might choose to run compile as 'compile cc -o foo foo.c'. eat=1 case $2 in - *.o | *.[oO][bB][jJ]) + *.o | *.lo | *.[oO][bB][jJ]) func_file_conv "$2" set x "$@" -Fo"$file" shift @@ -248,14 +261,17 @@ right script to run: please start by reading the file 'INSTALL'. Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>. EOF exit $? ;; -v | --v*) - echo "compile $scriptversion" + echo "compile (GNU Automake) $scriptversion" exit $? ;; cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; @@ -340,9 +356,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/config.h.in new/xload-1.2.1/config.h.in --- old/xload-1.2.0/config.h.in 2024-03-24 18:14:12.000000000 +0100 +++ new/xload-1.2.1/config.h.in 2026-07-20 00:06:31.000000000 +0200 @@ -93,6 +93,10 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable extensions on Cosmopolitan Libc. */ +#ifndef _COSMO_SOURCE +# undef _COSMO_SOURCE +#endif /* Enable general extensions on macOS. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/configure.ac new/xload-1.2.1/configure.ac --- old/xload-1.2.0/configure.ac 2024-03-24 18:14:07.000000000 +0100 +++ new/xload-1.2.1/configure.ac 2026-07-20 00:06:26.000000000 +0200 @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xload], [1.2.0], +AC_INIT([xload], [1.2.1], [https://gitlab.freedesktop.org/xorg/app/xload/-/issues], [xload]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/man/xload.man new/xload-1.2.1/man/xload.man --- old/xload-1.2.0/man/xload.man 2024-03-24 18:14:07.000000000 +0100 +++ new/xload-1.2.1/man/xload.man 2026-07-20 00:06:26.000000000 +0200 @@ -1,34 +1,34 @@ .\" -.TH XLOAD 1 __xorgversion__ +.TH XLOAD 1 2023-02-11 __xorgversion__ .SH NAME xload \- system load average display for X .SH SYNOPSIS .nf -\fBxload\fP [-\fItoolkitoption\fP ...] [-scale \fIinteger\fP] [-update \fIseconds\fP] - [-hl \fIcolor\fP] [-highlight \fIcolor\fP] [-remote \fIhost\fP] - [-jumpscroll \fIpixels\fP] [-label \fIstring\fP] [-nolabel] [-lights] - [-help|-version] +\fBxload\fP [\fI\-toolkitoption\fP ...] [\fB\-scale\fP \fIinteger\fP] [\fB\-update\fP \fIseconds\fP] + [\fB\-hl\fP \fIcolor\fP | \fB\-highlight\fP \fIcolor\fP] [\fB\-remote\fP \fIhost\fP] + [\fB\-jumpscroll\fP \fIpixels\fP] [\fB\-label\fP \fIstring\fP] [\fB\-nolabel\fP] [\fB\-lights\fP] + [\fB\-help\fP|\fB\-version\fP] .fi .SH DESCRIPTION The -.I xload +.B xload program displays a periodically updating histogram of the system load average. .SH OPTIONS -.PP -.I Xload +.B Xload accepts all of the standard X Toolkit command line options (see .BR X (__miscmansuffix__)). -The order of the options is unimportant. xload also accepts the -following additional options: -.PP +The order of the options is unimportant. +.B xload +also accepts the following additional options: .TP 8 \fB\-hl\fP \fIcolor\fP or \fB\-highlight\fP \fIcolor\fP This option specifies the color of the scale lines. .TP 8 .B \-jumpscroll \fIpixels\fP The number of pixels to shift the graph to the left when the graph -reaches the right edge of the window. The default value is 1/2 the width -of the current window. Smooth scrolling can be achieved by setting it to 1. +reaches the right edge of the window. +The default value is 1/2 the width of the current window. +Smooth scrolling can be achieved by setting it to 1. .TP 8 .B \-label \fIstring\fP The string to put into the label above the load average. @@ -39,42 +39,46 @@ .TP 8 .B \-lights When specified, this option causes -.I xload -to display the current load average by using the keyboard leds; for -a load average of \fIn\fP, xload lights the first \fIn\fP keyboard leds. +.B xload +to display the current load average by using the keyboard leds; +for a load average of \fIn\fP, xload lights the first \fIn\fP keyboard leds. This option turns off the usual screen display. .TP 8 .B \-scale \fIinteger\fP This option specifies the minimum number of tick marks in the histogram, -where one division represents one load average point. If the load goes -above this number, \fIxload\fP will create more divisions, but it will never -use fewer than this number. The default is 1. -.PP +where one division represents one load average point. +If the load goes above this number, \fBxload\fP will create more divisions, +but it will never use fewer than this number. +The default is 1. .TP 8 .B \-update \fIseconds\fP -This option specifies the interval in seconds at which \fIxload\fP -updates its display. The minimum amount of time allowed between updates -is 1 second. The default is 10. +This option specifies the interval in seconds at which \fBxload\fP +updates its display. +The minimum amount of time allowed between updates is 1 second. +The default is 10. .TP 8 .B \-remote \fIhost\fP -This option tells \fIxload\fP to display the load of \fIhost\fP instead of \fIlocalhost\fP. \fIXload\fP gets the information from the \fIrwhod\fP database and consequently requires \fIrwhod\fP to be executing both on \fIlocalhost\fP and \fIhost\fP. +This option tells \fBxload\fP to display the load of \fIhost\fP instead of +\fIlocalhost\fP. +\fBXload\fP gets the information from the \fBrwhod\fP database and consequently +requires \fBrwhod\fP to be executing both on \fIlocalhost\fP and \fIhost\fP. .TP 8 .B \-help -This option specifies that \fIxload\fP should print a usage message and exit. +This option specifies that \fBxload\fP should print a usage message and exit. .TP 8 .B \-version -This option specifies that \fIxload\fP should print version info and exit. +This option specifies that \fBxload\fP should print version info and exit. .SH RESOURCES In addition to the resources available to each of the widgets used by -\fIxload\fP there is one resource defined by the application itself. +\fBxload\fP there is one resource defined by the application itself. .TP 8 .B showLabel (\fPclass \fIBoolean\fB) If False then no label will be displayed. .SH WIDGETS In order to specify resources, it is useful to know the hierarchy of -the widgets which compose \fIxload\fR. In the notation below, -indentation indicates hierarchical structure. The widget class name -is given first, followed by the widget instance name. +the widgets which compose \fBxload\fR. +In the notation below, indentation indicates hierarchical structure. +The widget class name is given first, followed by the widget instance name. .sp .nf XLoad xload @@ -84,7 +88,6 @@ .fi .sp .SH ENVIRONMENT -.PP .TP 8 .B DISPLAY to get the default host and display number. @@ -103,12 +106,13 @@ Athena StripChart Widget. .SH BUGS On older platforms, this program may require the ability to open and read -the special system file \fI/dev/kmem\fP. Sites that do not allow general -access to this file may need to make \fIxload\fP belong to the same group -as \fI/dev/kmem\fP and turn on the \fIset group id\fP permission flag. +the special system file \fB/dev/kmem\fP. Sites that do not allow general +access to this file may need to make \fBxload\fP belong to the same group +as \fB/dev/kmem\fP and turn on the \fIset group id\fP permission flag. .PP -Reading the load average is inherently non-portable. Therefore, the routine -used to read it (get_load.c) must be ported to each new operating system. +Reading the load average is inherently non-portable. +Therefore, the routine used to read it (get_load.c) +must be ported to each new operating system. .SH AUTHORS K. Shane Hartman (MIT-LCS) and Stuart A. Malone (MIT-LCS); .br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/meson.build new/xload-1.2.1/meson.build --- old/xload-1.2.0/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xload-1.2.1/meson.build 2026-07-20 00:06:26.000000000 +0200 @@ -0,0 +1,169 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2026, Oracle and/or its affiliates. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +project( + 'xload', + 'c', + version: '1.2.1', + license: 'X11 AND MIT', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +conf = configuration_data() +package_string = ' '.join(meson.project_name(), meson.project_version()) +conf.set_quoted('PACKAGE_STRING', package_string) + +# Replaces AC_USE_SYSTEM_EXTENSIONS +if host_machine.system() == 'sunos' + system_extensions = '-D__EXTENSIONS__' +elif host_machine.system() == 'netbsd' + system_extensions = '-D_OPENBSD_SOURCE' +else + system_extensions = '-D_GNU_SOURCE' +endif +add_project_arguments(system_extensions, language: ['c']) + +cc = meson.get_compiler('c') + +# Replacement for XORG_DEFAULT_OPTIONS +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Checks for library functions. +conf.set('HAVE_ASPRINTF', + cc.has_function('asprintf', args: system_extensions, + prefix: '#include <stdio.h>') ? '1' : false) + +# Internationalization & localization support +libintl_prefix = '#include <libintl.h>' +use_gettext = cc.has_function('gettext', prefix: libintl_prefix) +if use_gettext == false + dep_libintl = cc.find_library('intl', required: false) + use_gettext = cc.has_function('gettext', dependencies: dep_libintl, + prefix: libintl_prefix) + if use_gettext == true + deps += dep_libintl + endif +endif +conf.set('USE_GETTEXT', use_gettext ? 1 : false, + description: 'Define to 1 if you want to use the gettext() function.') +summary('Use gettext', use_gettext) +subdir('po') + +# where to install localized messages +localedir = get_option('prefix') / get_option('localedir') +conf.set_quoted('LOCALEDIR', localedir) + + +### How to check load average on various OS'es: + +# getloadavg: 4.3BSD-Reno & later, glibc 2.2 & later, Solaris 7 & later +# BSD & GNU libc use <stdlib.h>, Solaris requires <sys/loadavg.h> +getloadavg_prefix = [ '#include <stdlib.h>' ] +if cc.check_header('sys/loadavg.h') + getloadavg_prefix += '#include <sys/loadavg.h>' +endif +conf.set('HAVE_GETLOADAVG', + cc.has_function('getloadavg', args: system_extensions, + prefix: getloadavg_prefix) ? '1' : false) + +# Replacement for AC_CHECK_HEADERS +foreach h: ['sys/loadavg.h', 'paths.h', 'protocols/rwhod.h'] + have_h_name = 'HAVE_' + h.to_upper().underscorify() + have_h = cc.check_header( + h, + required: false, + args: system_extensions, + prefix: '#include <sys/types.h>', + ) + conf.set( + have_h_name, + have_h ? '1' : false, + description: f'Define to 1 if you have the <@h@> header file.', + ) +endforeach + +# Checks for pkg-config packages +dep_libxaw = dependency('xaw7', required: true) +dep_libxmu = dependency('xmu', required: true) +dep_libxt = dependency('xt', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17') +deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11, dep_xproto] + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +add_project_arguments('-D_CONST_X_STRING', language: ['c']) + +xload_sources = [ + config_h, + 'get_load.c', + 'get_rload.c', + 'xload.c', + 'xload.h', +] + +executable( + 'xload', + xload_sources, + dependencies: deps, + install: true +) + +# Find directory for installing app-defaults files +appdefaultdir = get_option('appdefaultdir') +if appdefaultdir == '' + appdefaultdir = dep_libxt.get_variable('appdefaultdir') +endif +summary('appdefaultdir', appdefaultdir) + +# App default files (*.ad) +install_data( + 'app-defaults/XLoad', + install_dir: appdefaultdir, +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xload.man', + input: 'man/xload.man', + output: 'xload.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__drivermansuffix__/4/g', + '-e', 's/__miscmansuffix__/7/g', + '-e', f's%__apploaddir__%@appdefaultdir@%g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/meson.options new/xload-1.2.1/meson.options --- old/xload-1.2.0/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/xload-1.2.1/meson.options 2026-07-20 00:06:26.000000000 +0200 @@ -0,0 +1,5 @@ +option( + 'appdefaultdir', + type: 'string', + description: 'directory for app-defaults files (default is autodetected)', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/missing new/xload-1.2.1/missing --- old/xload-1.2.0/missing 2024-03-24 18:14:13.000000000 +0100 +++ new/xload-1.2.1/missing 2026-07-20 00:06:32.000000000 +0200 @@ -1,9 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells + +# Copyright (C) 1996-2025 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -54,18 +56,20 @@ -v, --version output version information and exit Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man +aclocal autoconf autogen autoheader autom4te automake autoreconf +bison flex help2man lex makeinfo perl yacc Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. -Send bug reports to <[email protected]>." +Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>." exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" + echo "missing (GNU Automake) $scriptversion" exit $? ;; @@ -108,7 +112,7 @@ program_details () { case $1 in - aclocal|automake) + aclocal|automake|autoreconf) echo "The '$1' program is part of the GNU Automake package:" echo "<$gnu_software_URL/automake>" echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" @@ -123,6 +127,9 @@ echo "<$gnu_software_URL/m4/>" echo "<$perl_URL>" ;; + *) + : + ;; esac } @@ -137,48 +144,55 @@ printf '%s\n' "'$1' is $msg." configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + autoheader_deps="'acconfig.h'" + automake_deps="'Makefile.am'" + aclocal_deps="'acinclude.m4'" case $normalized_program in + aclocal*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$configure_deps." + ;; autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' + echo "You should only need it if you modified $configure_deps." + ;; + autogen*) + echo "You should only need it if you modified a '.def' or '.tpl' file." + echo "You may want to install the GNU AutoGen package:" + echo "<$gnu_software_URL/autogen/>" ;; autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" + echo "You should only need it if you modified $autoheader_deps or" echo "$configure_deps." - program_details 'autoheader' ;; automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" + echo "You should only need it if you modified $automake_deps or" echo "$configure_deps." - program_details 'aclocal' ;; - autom4te*) + autom4te*) echo "You might have modified some maintainer files that require" echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' + ;; + autoreconf*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$automake_deps or $autoheader_deps or $automake_deps or" + echo "$configure_deps." ;; bison*|yacc*) echo "You should only need it if you modified a '.y' file." echo "You may want to install the GNU Bison package:" echo "<$gnu_software_URL/bison/>" ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; help2man*) echo "You should only need it if you modified a dependency" \ "of a man page." echo "You may want to install the GNU Help2man package:" echo "<$gnu_software_URL/help2man/>" ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; makeinfo*) echo "You should only need it if you modified a '.texi' file, or" echo "any other file indirectly affecting the aspect of the manual." @@ -189,6 +203,12 @@ echo "want to install GNU make:" echo "<$gnu_software_URL/make/>" ;; + perl*) + echo "You should only need it to run GNU Autoconf, GNU Automake, " + echo " assorted other tools, or if you modified a Perl source file." + echo "You may want to install the Perl 5 language interpreter:" + echo "<$perl_URL>" + ;; *) echo "You might have modified some files without having the proper" echo "tools for further handling them. Check the 'README' file, it" @@ -197,6 +217,7 @@ echo "case some other package contains this missing '$1' program." ;; esac + program_details "$normalized_program" } give_advice "$1" | sed -e '1s/^/WARNING: /' \ @@ -207,9 +228,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/po/POTFILES new/xload-1.2.1/po/POTFILES --- old/xload-1.2.0/po/POTFILES 1970-01-01 01:00:00.000000000 +0100 +++ new/xload-1.2.1/po/POTFILES 2026-07-20 00:06:26.000000000 +0200 @@ -0,0 +1,4 @@ +get_load.c +get_rload.c +xload.c +xload.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-1.2.0/po/meson.build new/xload-1.2.1/po/meson.build --- old/xload-1.2.0/po/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xload-1.2.1/po/meson.build 2026-07-20 00:06:26.000000000 +0200 @@ -0,0 +1,4 @@ +if use_gettext == true + i18n = import('i18n') + i18n.gettext(meson.project_name()) +endif
