Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xbiff for openSUSE:Factory checked in at 2026-04-19 18:15:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xbiff (Old) and /work/SRC/openSUSE:Factory/.xbiff.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xbiff" Sun Apr 19 18:15:44 2026 rev:9 rq:1348012 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xbiff/xbiff.changes 2024-01-29 22:26:39.980335205 +0100 +++ /work/SRC/openSUSE:Factory/.xbiff.new.11940/xbiff.changes 2026-04-19 18:15:46.067097804 +0200 @@ -1,0 +2,8 @@ +Sun Apr 19 10:02:41 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.6 + * This release adds support for building with meson as well as + autoconf. +- switch to meson + +------------------------------------------------------------------- Old: ---- xbiff-1.0.5.tar.xz New: ---- xbiff-1.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbiff.spec ++++++ --- /var/tmp/diff_new_pack.X5asyz/_old 2026-04-19 18:15:46.627120624 +0200 +++ /var/tmp/diff_new_pack.X5asyz/_new 2026-04-19 18:15:46.631120787 +0200 @@ -1,7 +1,7 @@ # # spec file for package xbiff # -# 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,13 +17,14 @@ Name: xbiff -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: Utility to monitor a mailbox License: MIT Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) @@ -43,11 +44,11 @@ %setup -q %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %files %license COPYING ++++++ xbiff-1.0.5.tar.xz -> xbiff-1.0.6.tar.xz ++++++ ++++ 10821 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/xbiff-1.0.5/ChangeLog new/xbiff-1.0.6/ChangeLog --- old/xbiff-1.0.5/ChangeLog 2024-01-20 21:29:15.000000000 +0100 +++ new/xbiff-1.0.6/ChangeLog 2026-04-19 00:37:10.000000000 +0200 @@ -1,3 +1,118 @@ +commit 5b7fd66abc81d3ced74eebd2c5f57c1a5ff935f6 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 18 15:31:22 2026 -0700 + + xbiff 1.0.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6ce75b41f3fcf4acfa25aceaf66e21b95df781b6 +Author: Alan Coopersmith <[email protected]> +Date: Tue Mar 24 18:02:22 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/xbiff/-/merge_requests/12> + +commit e6a5e20e5cf431d299121492724914ec442e2a06 +Author: Alan Coopersmith <[email protected]> +Date: Tue Mar 24 17:13:21 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/xbiff/-/merge_requests/12> + +commit 99dd5279ee0826b7688d1d9ada2315a79f6510ac +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/xbiff/-/merge_requests/12> + +commit c14c3e53519aa586132f313cf6f83c9895664207 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 18 16:46:51 2025 -0700 + + Remove old RCS/CVS tags + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xbiff/-/merge_requests/11> + +commit e1725aaf063dfcf56313ed306fd0231694247714 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 18 16:37:35 2025 -0700 + + man page: fix warnings from `mandoc -T lint` + + mandoc: xbiff.1:30:13: WARNING: cannot parse date, using it verbatim: TH xbiff 1.0.5 + mandoc: xbiff.1:125:2: WARNING: skipping paragraph macro: PP empty + mandoc: xbiff.1:221:2: WARNING: skipping paragraph macro: PP empty + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xbiff/-/merge_requests/11> + +commit 16fc9810399b5b2c6367e090694de8e206b8a816 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 30 09:49:55 2025 -0700 + + Improve man page formatting + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xbiff/-/merge_requests/10> + +commit 4793ea1b1069ef5761dc86e0af33a63cfb44fc4d +Author: Alan Coopersmith <[email protected]> +Date: Sun Dec 8 13:49:12 2024 -0800 + + Add unused attribute to unused callback arguments + + Clears up 20 warnings from clang of the form: + Mailbox.c:240:32: warning: unused parameter 'request' [-Wunused-parameter] + static void Initialize (Widget request, Widget new, + ^ + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xbiff/-/merge_requests/9> + +commit 7b6a1a092b26a9c79857aba2bd40f38e1617eff7 +Author: Alan Coopersmith <[email protected]> +Date: Sun Dec 8 13:41:39 2024 -0800 + + Add noreturn attribute to CloseDown prototype + + Clears clang warning of: + Mailbox.c:550:1: warning: function 'CloseDown' could be declared with + attribute 'noreturn' [-Wmissing-noreturn] + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xbiff/-/merge_requests/9> + +commit d19f0464e900b30f9a6a3482498711c45afaed14 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 17 14:19:21 2024 -0800 + + unifdef SYSV + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 4ce1a96d300a9d63a2306331000878d6f8c34a3e Author: Alan Coopersmith <[email protected]> Date: Sat Jan 20 12:25:47 2024 -0800 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/xbiff-1.0.5/Mailbox.c new/xbiff-1.0.6/Mailbox.c --- old/xbiff-1.0.5/Mailbox.c 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/Mailbox.c 2026-04-19 00:36:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: Mailbox.c,v 1.64 94/04/17 20:43:26 rws Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,6 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xbiff/Mailbox.c,v 1.4 2001/08/01 00:45:02 tsi Exp $ */ /* * Author: Jim Fulton, MIT X Consortium @@ -48,6 +46,7 @@ #include <X11/StringDefs.h> /* for useful atom names */ #include <X11/cursorfont.h> /* for cursor constants */ #include <X11/Xosdefs.h> /* for X_NOT_POSIX def */ +#include <X11/Xfuncproto.h> /* for _X_{NORETURN,UNUSED} defs */ #include <stdlib.h> #ifdef WIN32 #include <X11/Xw32defs.h> @@ -71,12 +70,6 @@ typedef int waitType; # define INTWAITTYPE #else /* ! X_NOT_POSIX */ -#ifdef SYSV -# define waitCode(w) (((w) >> 8) & 0x7f) -# define waitSig(w) ((w) & 0xff) -typedef int waitType; -# define INTWAITTYPE -#else #ifdef WIN32 #include <process.h> # define INTWAITTYPE @@ -89,7 +82,6 @@ # define waitSig(w) ((w).w_T.w_Termsig) typedef union wait waitType; #endif /* WIN32 else */ -#endif /* SYSV else */ #endif /* ! X_NOT_POSIX else */ #include <X11/bitmaps/mailfull> /* for flag up (mail present) bits */ @@ -102,19 +94,19 @@ /* * The default user interface is to have the mailbox turn itself off whenever - * the user presses a button in it. Expert users might want to make this + * the user presses a button in it. Expert users might want to make this * happen on EnterWindow. It might be nice to provide support for some sort of * exit callback so that you can do things like press q to quit. */ -static char defaultTranslations[] = +static char defaultTranslations[] = "<ButtonPress>: unset()"; static void Set (Widget gw, XEvent *event, String *params, Cardinal *nparams); static void Check(Widget gw, XEvent *event, String *params, Cardinal *nparams); static void Unset(Widget gw, XEvent *event, String *params, Cardinal *nparams); -static XtActionsRec actionsList[] = { +static XtActionsRec actionsList[] = { { "check", Check }, { "unset", Unset }, { "set", Set }, @@ -130,7 +122,7 @@ static Pixmap nopix = None; static XtResource resources[] = { - { XtNwidth, XtCWidth, XtRDimension, sizeof (Dimension), + { XtNwidth, XtCWidth, XtRDimension, sizeof (Dimension), goffset (width), XtRDimension, (XtPointer)&defDim }, { XtNheight, XtCHeight, XtRDimension, sizeof (Dimension), goffset (height), XtRDimension, (XtPointer)&defDim }, @@ -164,7 +156,7 @@ #undef goffset static void GetMailFile(MailboxWidget w); -static void CloseDown (MailboxWidget w, int status); +_X_NORETURN static void CloseDown (MailboxWidget w, int status); static void check_mailbox(MailboxWidget w, Boolean force_redraw, Boolean reset); static void redraw_mailbox (MailboxWidget w); @@ -243,8 +235,8 @@ /* ARGSUSED */ -static void Initialize (Widget request, Widget new, - ArgList args, Cardinal *num_args) +static void Initialize (_X_UNUSED Widget request, Widget new, + _X_UNUSED ArgList args, _X_UNUSED Cardinal *num_args) { MailboxWidget w = (MailboxWidget) new; int shape_event_base, shape_error_base; @@ -277,7 +269,8 @@ */ /* ARGSUSED */ -static void Set (Widget gw, XEvent *event, String *params, Cardinal *nparams) +static void Set (Widget gw, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *nparams) { MailboxWidget w = (MailboxWidget) gw; @@ -292,7 +285,8 @@ */ /* ARGSUSED */ -static void Unset (Widget gw, XEvent *event, String *params, Cardinal *nparams) +static void Unset (Widget gw, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *nparams) { MailboxWidget w = (MailboxWidget) gw; @@ -305,7 +299,8 @@ */ /* ARGSUSED */ -static void Check (Widget gw, XEvent *event, String *params, Cardinal *nparams) +static void Check (Widget gw, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *nparams) { MailboxWidget w = (MailboxWidget) gw; @@ -314,7 +309,7 @@ /* ARGSUSED */ -static void clock_tic (XtPointer client_data, XtIntervalId *id) +static void clock_tic (XtPointer client_data, _X_UNUSED XtIntervalId *id) { MailboxWidget w = (MailboxWidget) client_data; @@ -351,7 +346,7 @@ fore = w->mailbox.foreground_pixel; back = w->core.background_pixel; } - return XmuCreatePixmapFromBitmap (dpy, w->core.window, bitmap, + return XmuCreatePixmapFromBitmap (dpy, w->core.window, bitmap, width, height, depth, fore, back); } @@ -373,7 +368,7 @@ * build up the pixmaps that we'll put into the image */ if (w->mailbox.full.bitmap == None) { - w->mailbox.full.bitmap = + w->mailbox.full.bitmap = XCreateBitmapFromData (dpy, w->core.window, (char *) mailfull_bits, mailfull_width, mailfull_height); } @@ -391,11 +386,11 @@ depth, w->mailbox.flipit, &w->mailbox.full.width, &w->mailbox.full.height); - + if (w->mailbox.empty.mask == None && w->mailbox.full.mask == None) w->mailbox.shapeit = False; - w->mailbox.interval_id = + w->mailbox.interval_id = XtAppAddTimeOut (XtWidgetToApplicationContext((Widget) w), w->mailbox.update * 1000, clock_tic, (XtPointer) w); @@ -427,7 +422,8 @@ } -static void Redisplay (Widget gw, XEvent *event, Region region) +static void Redisplay (Widget gw, + _X_UNUSED XEvent *event, _X_UNUSED Region region) { MailboxWidget w = (MailboxWidget) gw; @@ -477,7 +473,7 @@ * Now check for changes. If reset is set then we want to pretent that * there is no mail. If the mailbox is empty then we want to turn off * the flag. Otherwise if the mailbox has changed size then we want to - * put the flag up, unless the mailbox has been read since the last + * put the flag up, unless the mailbox has been read since the last * write. * * The cases are: @@ -506,10 +502,10 @@ } } else if (mailboxsize != w->mailbox.last_size) { /* different size */ if (!w->mailbox.once_only || !w->mailbox.flag_up) - beep(w); + beep(w); if (!w->mailbox.flag_up) force_redraw = w->mailbox.flag_up = TRUE; - } + } w->mailbox.last_size = mailboxsize; if (force_redraw) redraw_mailbox (w); @@ -564,15 +560,16 @@ /* ARGSUSED */ -static Boolean SetValues (Widget gcurrent, Widget grequest, Widget gnew, - ArgList args, Cardinal *num_args) +static Boolean SetValues (Widget gcurrent, _X_UNUSED Widget grequest, + Widget gnew, + _X_UNUSED ArgList args, _X_UNUSED Cardinal *num_args) { MailboxWidget current = (MailboxWidget) gcurrent; MailboxWidget new = (MailboxWidget) gnew; Boolean redisplay = FALSE; if (current->mailbox.update != new->mailbox.update) { - if (current->mailbox.interval_id) + if (current->mailbox.interval_id) XtRemoveTimeOut (current->mailbox.interval_id); new->mailbox.interval_id = XtAppAddTimeOut (XtWidgetToApplicationContext(gnew), 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/xbiff-1.0.5/Mailbox.h new/xbiff-1.0.6/Mailbox.h --- old/xbiff-1.0.5/Mailbox.h 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/Mailbox.h 2026-04-19 00:36:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: Mailbox.h,v 1.21 94/04/17 20:43:27 rws Exp $ */ /* Copyright (c) 1988 X Consortium 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/xbiff-1.0.5/MailboxP.h new/xbiff-1.0.6/MailboxP.h --- old/xbiff-1.0.5/MailboxP.h 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/MailboxP.h 2026-04-19 00:36:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: MailboxP.h,v 1.22 94/04/17 20:43:27 rws Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,12 +27,13 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xbiff/MailboxP.h,v 1.1 2000/02/13 03:56:12 dawes Exp $ */ #ifndef _XawMailboxP_h #define _XawMailboxP_h -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "Mailbox.h" #include <X11/Xaw/SimpleP.h> @@ -44,8 +44,6 @@ #ifndef MAILBOX_DIRECTORY # ifdef _PATH_MAILDIR # define MAILBOX_DIRECTORY _PATH_MAILDIR -# elif defined(SYSV) -# define MAILBOX_DIRECTORY "/usr/mail" # elif defined(SVR4) # define MAILBOX_DIRECTORY "/var/mail" # elif defined(__linux__) 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/xbiff-1.0.5/Makefile.am new/xbiff-1.0.6/Makefile.am --- old/xbiff-1.0.5/Makefile.am 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/Makefile.am 2026-04-19 00:36:59.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 @@ -31,7 +31,14 @@ MailboxP.h \ xbiff.c -EXTRA_DIST = bitmaps/mail-down bitmaps/mail-up bitmaps/mail-down-mask bitmaps/mail-up-mask README.md +EXTRA_DIST = \ + bitmaps/mail-down \ + bitmaps/mail-up \ + bitmaps/mail-down-mask \ + bitmaps/mail-up-mask \ + README.md \ + meson.build \ + meson.options MAINTAINERCLEANFILES = 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/xbiff-1.0.5/compile new/xbiff-1.0.6/compile --- old/xbiff-1.0.5/compile 2024-01-20 21:29:10.000000000 +0100 +++ new/xbiff-1.0.6/compile 2026-04-19 00:37:04.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/xbiff-1.0.5/configure.ac new/xbiff-1.0.6/configure.ac --- old/xbiff-1.0.5/configure.ac 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/configure.ac 2026-04-19 00:36:59.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,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xbiff], [1.0.5], - [https://gitlab.freedesktop.org/xorg/app/xbiff/issues], [xbiff]) +AC_INIT([xbiff], [1.0.6], + [https://gitlab.freedesktop.org/xorg/app/xbiff/-/issues], [xbiff]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.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/xbiff-1.0.5/man/xbiff.man new/xbiff-1.0.6/man/xbiff.man --- old/xbiff-1.0.5/man/xbiff.man 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/man/xbiff.man 2026-04-19 00:36:59.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $XConsortium: xbiff.man,v 1.22 94/04/17 20:43:28 gildea Exp $ +.\" .\" Copyright (c) 1988 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,9 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.3 2001/01/27 18:21:08 dawes Exp $ -.\" -.TH XBIFF 1 __xorgversion__ +.TH XBIFF 1 2023-01-28 __xorgversion__ .SH NAME xbiff \- mailbox flag for X .SH SYNOPSIS @@ -35,14 +33,15 @@ [ \-\fItoolkitoption\fP ... ] [ \fI\-option\fP ... ] .SH DESCRIPTION The -.I xbiff -program displays a little image of a mailbox. When there is no mail, -the flag on the mailbox is down. When mail arrives, the flag goes up -and the mailbox beeps. By default, pressing any mouse button in the -image forces \fIxbiff\fP to remember the current size of the mail file +.B xbiff +program displays a little image of a mailbox. +When there is no mail, the flag on the mailbox is down. +When mail arrives, the flag goes up and the mailbox beeps. +By default, pressing any mouse button in the image +forces \fBxbiff\fP to remember the current size of the mail file as being the ``empty'' size and to lower the flag. .SH OPTIONS -.I Xbiff +.B Xbiff accepts all of the standard X Toolkit command line options along with the additional options listed below: .TP 8 @@ -51,38 +50,41 @@ printed on the standard error. .TP 8 .B \-update \fIseconds\fP -This option specifies the frequency in seconds at which \fIxbiff\fP -should update its display. If the mailbox is obscured and then exposed, -it will be updated immediately. The default is 30 seconds. +This option specifies the frequency in seconds at which \fBxbiff\fP +should update its display. +If the mailbox is obscured and then exposed, it will be updated immediately. +The default is 30 seconds. .TP 8 .B \-file \fIfilename\fP -This option specifies the name of the file which should be monitored. By -default it watches your inbox in the default location for your -system (some examples are +This option specifies the name of the file which should be monitored. +By default it watches your inbox in the default location for your system +(some examples are .RI /var/mail/ username , .RI /usr/spool/mail/ username , .RI /var/spool/mail/ username (where .I username -is your login name). If the MAIL environment variable is set, +is your login name). +If the \fBMAIL\fP environment variable is set, the file specified by it will be monitored. .TP 8 .B \-volume \fIpercentage\fP -This option specifies how loud the bell should be rung when new mail -comes in. The percentage is relative to the current volume in \fIxset\fP. -So 0 is normal volume, negative percentages are towards minimum (-100 -is silent), and positive percentages are towards maximum volume (100 -is loudest). +This option specifies how loud the bell should be rung when new mail comes in. +The percentage is relative to the current volume set in +.BR xset (__appmansuffix__). +So 0 is normal volume, +negative percentages are towards minimum (\-100 is silent), +and positive percentages are towards maximum volume (100 is loudest). .TP 8 .B \-shape This option indicates that the mailbox window should be shaped if masks for the empty or full images are given. .TP 8 .B \-version -This option indicates that \fIxbiff\fP should print its version and exit. +This option indicates that \fBxbiff\fP should print its version and exit. .PP The following standard X Toolkit command line arguments are commonly used with -.I xbiff: +.B xbiff: .TP 8 .B \-display \fIdisplay\fP This option specifies the X server to contact. @@ -112,33 +114,36 @@ This option specifies a resource string to be used. This is especially useful for setting resources that do not have separate command line options. .SH X DEFAULTS -The application class name is XBiff. +The application class name is \fBXBiff\fP. This program uses the -.I Mailbox +.B Mailbox widget. It understands all of the core resource names and classes as well as: -.PP .TP 8 .B checkCommand (\fPclass\fB CheckCommand) Specifies a shell command to be executed to check for new mail rather than -examining the size of \fBfile\fP. The specified string value is used as the -argument to a \fIsystem\fP(__libmansuffix__) call and may therefore contain i/o redirection. -An exit status of 0 indicates that new mail is waiting, 1 indicates that there -has been no change in size, and 2 indicates that the mail has been cleared. +examining the size of \fBfile\fP. +The specified string value is used as the argument to a +.BR system (__libmansuffix__) +call and may therefore contain i/o redirection. +An exit status of 0 indicates that new mail is waiting, +1 indicates that there has been no change in size, +and 2 indicates that the mail has been cleared. By default, no shell command is provided. .TP 8 .B file (\fPclass\fB File) -Specifies the name of the file to monitor. The default is as described -above for the +Specifies the name of the file to monitor. +The default is as described above for the .B \-file command line option. .TP 8 .B onceOnly (\fPclass\fB Boolean) -Specifies that the bell is only rung the first time new mail is found -and is not rung again until at least one interval has passed with -no mail waiting. The window will continue to indicate the presence -of new mail until it has been retrieved. The default is false. +Specifies that the bell is only rung the first time new mail is found and +is not rung again until at least one interval has passed with no mail waiting. +The window will continue to indicate the presence of new mail +until it has been retrieved. +The default is false. .TP 8 .B width (\fPclass\fB Width) Specifies the width of the mailbox. @@ -151,8 +156,11 @@ The default is 30. .TP 8 .B volume (\fPclass\fB Volume) -Specifies how loud the bell should be rung. The default is 33 percent. -Note that this is a percentage of the current \fIxset\fP volume. +Specifies how loud the bell should be rung. +The default is 33 percent. +Note that this is a percentage of the current +.BR xset (__appmansuffix__) +volume. To reduce the volume, specify a negative percentage. .TP 8 .B foreground (\fPclass\fB Foreground) @@ -163,7 +171,8 @@ .TP 8 .B flip (\fPclass\fB Flip) Specifies whether or not the image that is shown when mail has arrived -should be inverted. The default is ``true.'' +should be inverted. +The default is ``true.'' .TP 8 .B fullPixmap (\fPclass\fB Pixmap) Specifies a bitmap to be shown when new mail has arrived. @@ -175,7 +184,8 @@ .TP 8 .B shapeWindow (\fPclass\fB ShapeWindow) Specifies whether or not the mailbox window should be shaped to the -given fullPixmapMask and emptyPixmapMask. The default is false. +given \fBfullPixmapMask\fP and \fBemptyPixmapMask\fP. +The default is false. .TP 8 .B fullPixmapMask (\fPclass\fB PixmapMask) Specifies a mask for the bitmap to be shown when new mail has arrived. @@ -185,7 +195,7 @@ Specifies a mask for the bitmap to be shown when no new mail is present. The default is none. .SH ACTIONS -The \fIMailbox\fP widget provides the following actions for use in event +The \fBMailbox\fP widget provides the following actions for use in event translations: .TP 8 .B check() @@ -205,7 +215,6 @@ .fi .sp .SH ENVIRONMENT -.PP .TP 8 .B DISPLAY to get the default host and display number. @@ -214,9 +223,9 @@ to get the name of a resource file that overrides the global resources stored in the RESOURCE_MANAGER property. .SH "SEE ALSO" -X(__miscmansuffix__), -xrdb(__appmansuffix__), -stat(2) +.BR X (__miscmansuffix__), +.BR xrdb (__appmansuffix__), +.BR stat (2) .SH BUGS The mailbox bitmaps are ugly. .SH AUTHOR 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/xbiff-1.0.5/meson.build new/xbiff-1.0.6/meson.build --- old/xbiff-1.0.5/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xbiff-1.0.6/meson.build 2026-04-19 00:36:59.000000000 +0200 @@ -0,0 +1,113 @@ +# 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( + 'xbiff', + 'c', + version: '1.0.6', + license: 'X11', + 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) + +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 pkg-config packages +dep_libxaw = dependency('xaw7', required: true) +dep_libxmu = dependency('xmu', required: true) +dep_libxt = dependency('xt', required: true, version: '>= 1.1') +dep_xbitmaps = dependency('xbitmaps', required: true) +dep_libxext = dependency('xext', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.25') + +deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_xbitmaps, dep_libxext, + dep_libx11, dep_xproto] + +# Checks for headers +have_paths_h = cc.check_header('paths.h') +conf.set('HAVE_PATHS_H', have_paths_h ? '1' : false) + +# Allow builder to set path to look for mailboxes +mailbox_directory = get_option('mailbox-directory') +if mailbox_directory == '' + mailbox_directory = cc.get_define('MAILBOX_DIRECTORY', + args: have_paths_h ? '-DHAVE_PATHS_H' : '', + include_directories: include_directories('.'), + prefix: '#include "MailboxP.h"') +else + conf.set_quoted('MAILBOX_DIRECTORY', mailbox_directory, + description: 'Directory containing user mailboxes') +endif +summary('mailbox-directory', mailbox_directory) + +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']) +add_project_arguments('-D_DEFAULT_SOURCE', language: ['c']) + +xbiff_sources = [ + config_h, + 'Mailbox.c', + 'Mailbox.h', + 'MailboxP.h', + 'xbiff.c', +] + +executable( + 'xbiff', + xbiff_sources, + dependencies: deps, + install: true +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xbiff.man', + input: 'man/xbiff.man', + output: 'xbiff.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__libmansuffix__/3/g', + '-e', 's/__miscmansuffix__/7/g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', + install_tag: 'man', +) 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/xbiff-1.0.5/meson.options new/xbiff-1.0.6/meson.options --- old/xbiff-1.0.5/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/xbiff-1.0.6/meson.options 2026-04-19 00:36:59.000000000 +0200 @@ -0,0 +1,5 @@ +option( + 'mailbox-directory', + type: 'string', + description: 'directory to check for system mailboxes', +) 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/xbiff-1.0.5/missing new/xbiff-1.0.6/missing --- old/xbiff-1.0.5/missing 2024-01-20 21:29:10.000000000 +0100 +++ new/xbiff-1.0.6/missing 2026-04-19 00:37:04.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/xbiff-1.0.5/xbiff.c new/xbiff-1.0.6/xbiff.c --- old/xbiff-1.0.5/xbiff.c 2024-01-20 21:29:06.000000000 +0100 +++ new/xbiff-1.0.6/xbiff.c 2026-04-19 00:36:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: xbiff.c,v 1.19 94/04/17 20:43:28 rws Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,6 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xbiff/xbiff.c,v 1.3tsi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,6 +35,7 @@ #include <stdio.h> #include <stdlib.h> #include <X11/Xatom.h> +#include <X11/Xfuncproto.h> #include <X11/Intrinsic.h> #include <X11/StringDefs.h> #include "Mailbox.h" @@ -53,7 +52,8 @@ static Atom wm_delete_window; -static void quit (Widget w, XEvent *event, String *params, Cardinal *num_params) +static void quit (Widget w, XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) { if (event->type == ClientMessage && ((Atom) event->xclient.data.l[0]) != wm_delete_window) {
