Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bitmap for openSUSE:Factory checked in at 2026-01-26 11:06:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bitmap (Old) and /work/SRC/openSUSE:Factory/.bitmap.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bitmap" Mon Jan 26 11:06:02 2026 rev:12 rq:1329081 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bitmap/bitmap.changes 2024-02-05 22:01:09.394917219 +0100 +++ /work/SRC/openSUSE:Factory/.bitmap.new.1928/bitmap.changes 2026-01-26 11:06:08.075559208 +0100 @@ -1,0 +2,24 @@ +Sun Jan 25 17:31:30 UTC 2026 - Stefan Dirsch <[email protected]> + +- update to version 1.1.2 + * Improve man page formatting + * man pages: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + * LoseSelection: second argument should be pointer, not raw value + * Handle -Wcast-function-type warnings for functions used as XtActionProcs + * StripFilename: avoid calling strrchr on NULL filename + * Clear 10 of 15 -Wsign-compare warnings from gcc 15.1 + * Partial Revert of "fix: warning: assignment discards ‘const’ qualifier..." + * Partial Revert of "Fix warning: initialization discards ‘const’ qualifier..." + * Strip trailing whitespace from source files + * gitlab CI: drop the ci-fairy check-mr job + * make return obvious + * Fix: warning: initialization discards ‘const’ qualifier from pointer target type + * fix: warning: assignment discards ‘const’ qualifier from pointer target type + * FIX an other const warning + * FIX: warning: cast from function call of type ‘double’ to non-matching type ‘short int’ + * FIX: warning: cast from function call of type ‘double’ to non-matching type ‘short int’ + * FIX: warning: assignment discards ‘const’ qualifier from pointer target type + * Fix: Shadow warning + * FIX: const warning + +------------------------------------------------------------------- Old: ---- bitmap-1.1.1.tar.xz New: ---- bitmap-1.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bitmap.spec ++++++ --- /var/tmp/diff_new_pack.DCEMju/_old 2026-01-26 11:06:09.827631359 +0100 +++ /var/tmp/diff_new_pack.DCEMju/_new 2026-01-26 11:06:09.839631853 +0100 @@ -1,7 +1,7 @@ # # spec file for package bitmap # -# 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: bitmap -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: X bitmap editor and converter utilities License: X11 ++++++ bitmap-1.1.1.tar.xz -> bitmap-1.1.2.tar.xz ++++++ ++++ 5291 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/bitmap-1.1.1/BitEdit.c new/bitmap-1.1.2/BitEdit.c --- old/bitmap-1.1.1/BitEdit.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/BitEdit.c 2026-01-25 00:21:37.000000000 +0100 @@ -73,28 +73,32 @@ \n\ The default WIDTHxHEIGHT is 16x16.\n"; +#define __C(A,B,C,D) {(char *)A,(char *)B,C,(XPointer)D} + static XrmOptionDescRec options[] = { - { "-axes", "*bitmap.axes", XrmoptionNoArg, "True"}, - { "+axes", "*bitmap.axes", XrmoptionNoArg, "False"}, - { "-basename", "*bitmap.basename", XrmoptionSepArg, NULL}, - { "-dashed", "*bitmap.dashed", XrmoptionNoArg, "True"}, - { "+dashed", "*bitmap.dashed", XrmoptionNoArg, "False"}, - { "-dashes", "*bitmap.dashes", XrmoptionSepArg, NULL}, - { "-fr", "*bitmap.frame", XrmoptionSepArg, NULL}, - { "-gt", "*bitmap.gridTolerance",XrmoptionSepArg, NULL}, - { "-grid", "*bitmap.grid", XrmoptionNoArg, "True"}, - { "+grid", "*bitmap.grid", XrmoptionNoArg, "False"}, - { "-hl", "*bitmap.highlight", XrmoptionSepArg, NULL}, - { "-proportional","*bitmap.proportional", XrmoptionNoArg, "True"}, - { "+proportional","*bitmap.proportional", XrmoptionNoArg, "False"}, - { "-size", "*bitmap.size", XrmoptionSepArg, NULL}, - { "-sh", "*bitmap.squareHeight", XrmoptionSepArg, NULL}, - { "-sw", "*bitmap.squareWidth", XrmoptionSepArg, NULL}, - { "-stipple", "*bitmap.stipple", XrmoptionSepArg, NULL}, - { "-stippled", "*bitmap.stippled", XrmoptionNoArg, "True"}, - { "+stippled", "*bitmap.stippled", XrmoptionNoArg, "False"}, + __C( "-axes", "*bitmap.axes", XrmoptionNoArg, "True"), + __C( "+axes", "*bitmap.axes", XrmoptionNoArg, "False"), + __C( "-basename", "*bitmap.basename", XrmoptionSepArg, NULL), + __C( "-dashed", "*bitmap.dashed", XrmoptionNoArg, "True"), + __C( "+dashed", "*bitmap.dashed", XrmoptionNoArg, "False"), + __C( "-dashes", "*bitmap.dashes", XrmoptionSepArg, NULL), + __C( "-fr", "*bitmap.frame", XrmoptionSepArg, NULL), + __C( "-gt", "*bitmap.gridTolerance",XrmoptionSepArg, NULL), + __C( "-grid", "*bitmap.grid", XrmoptionNoArg, "True"), + __C( "+grid", "*bitmap.grid", XrmoptionNoArg, "False"), + __C( "-hl", "*bitmap.highlight", XrmoptionSepArg, NULL), + __C( "-proportional","*bitmap.proportional", XrmoptionNoArg, "True"), + __C( "+proportional","*bitmap.proportional", XrmoptionNoArg, "False"), + __C( "-size", "*bitmap.size", XrmoptionSepArg, NULL), + __C( "-sh", "*bitmap.squareHeight", XrmoptionSepArg, NULL), + __C( "-sw", "*bitmap.squareWidth", XrmoptionSepArg, NULL), + __C( "-stipple", "*bitmap.stipple", XrmoptionSepArg, NULL), + __C( "-stippled", "*bitmap.stippled", XrmoptionNoArg, "True"), + __C( "+stippled", "*bitmap.stippled", XrmoptionNoArg, "False"), }; +#undef __C + typedef struct { int id; String name; @@ -229,7 +233,8 @@ static Pixmap check_mark; static Dialog input_dialog, error_dialog, qsave_dialog; static Time btime; -static char *filename = NULL, *base_name = NULL, *format; +static char *filename = NULL, *base_name = NULL; +static char *format; static char message[80]; @@ -338,64 +343,57 @@ static void FixEntry(Widget w, int *id) { - int n; - Arg wargs[2]; Time dummy = 0; - n = 0; - switch (*id) { case Image: - XtSetArg(wargs[n], XtNleftBitmap, - image_visible ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + image_visible ? check_mark : None,NULL); + return; case Grid: - XtSetArg(wargs[n], XtNleftBitmap, - BWQueryGrid(bitmap_widget) ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + BWQueryGrid(bitmap_widget) ? check_mark : None,NULL); + return; case Dashed: - XtSetArg(wargs[n], XtNleftBitmap, - BWQueryDashed(bitmap_widget) ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + BWQueryDashed(bitmap_widget) ? check_mark : None,NULL); + return; case Axes: - XtSetArg(wargs[n], XtNleftBitmap, - BWQueryAxes(bitmap_widget) ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + BWQueryAxes(bitmap_widget) ? check_mark : None,NULL); + return; case Stippled: - XtSetArg(wargs[n], XtNleftBitmap, - BWQueryStippled(bitmap_widget) ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + BWQueryStippled(bitmap_widget) ? check_mark : None,NULL); + return; case Proportional: - XtSetArg(wargs[n], XtNleftBitmap, - BWQueryProportional(bitmap_widget) ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + BWQueryProportional(bitmap_widget) ? check_mark : None,NULL); + return; case Zoom: - XtSetArg(wargs[n], XtNleftBitmap, - BWQueryZooming(bitmap_widget) ? check_mark : None); n++; - break; + XtVaSetValues(w, XtNleftBitmap, + BWQueryZooming(bitmap_widget) ? check_mark : None,NULL); + return; case Copy: case Cut: - XtSetArg(wargs[n], XtNsensitive, BWQueryMarked(bitmap_widget)); n++; - break; + XtVaSetValues(w, XtNsensitive, BWQueryMarked(bitmap_widget),NULL ); + return; case Paste: - XtSetArg(wargs[n], XtNsensitive, - BWQuerySelection(bitmap_widget, dummy)); n++; - break; + XtVaSetValues(w, XtNsensitive, BWQuerySelection(bitmap_widget, dummy),NULL ); + return; default: return; } - - XtSetValues(w, wargs, n); } /* ARGSUSED */ @@ -404,11 +402,9 @@ String *params, Cardinal *num_params) { - int i; - btime = event->xbutton.time; - for (i = 0; i < XtNumber(edit_menu); i++) + for (Cardinal i = 0; i < XtNumber(edit_menu); i++) FixEntry(edit_menu[i].widget, &edit_menu[i].id); } @@ -886,7 +882,7 @@ void DoResize(void) { Dimension width, height; - format = ""; + format = (char *)""; RetryResize: if (PopupDialog(input_dialog, "Resize to WIDTHxHEIGHT:", format, &format, XtGrabExclusive) == Okay) { @@ -909,7 +905,7 @@ { Dimension width, height; - format = ""; + format = (char *)""; RetryRescale: if (PopupDialog(input_dialog, "Rescale to WIDTHxHEIGHT:", format, &format, XtGrabExclusive) == Okay) { @@ -975,12 +971,12 @@ int main(int argc, char *argv[]) { - int i, n; + Cardinal i, n; Arg wargs[2]; Widget w; Widget radio_group = NULL; XtPointer radio_data = NULL; - const char *filename = NULL; + const char *myfilename = NULL; /* Handle args that don't require opening a display */ for (int a = 1; a < argc; a++) { @@ -1004,7 +1000,7 @@ if (argc > 1) { if ((argv[argc - 1][0] != '-') && (argv[argc - 1][0] != '+')) { - filename = argv[--argc]; + myfilename = argv[--argc]; } if (argc > 1) { fputs("Unknown argument(s):", stderr); @@ -1100,14 +1096,14 @@ if (buttons[i].id == Point) { radio_group = buttons[i].widget; - radio_data = buttons[i].name; + radio_data = (char *)buttons[i].name; } } bitmap_widget = XtCreateManagedWidget("bitmap", bitmapWidgetClass, pane_widget, NULL, 0); XtRealizeWidget(top_widget); - if (filename != NULL) - BWReadFile(bitmap_widget, filename, NULL); + if (myfilename != NULL) + BWReadFile(bitmap_widget, myfilename, NULL); wm_delete_window = XInternAtom(XtDisplay(top_widget), "WM_DELETE_WINDOW", False); 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/bitmap-1.1.1/Bitmap.c new/bitmap-1.1.2/Bitmap.c --- old/bitmap-1.1.1/Bitmap.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/Bitmap.c 2026-01-25 00:21:37.000000000 +0100 @@ -72,11 +72,11 @@ static XtResource resources[] = { {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel), - Offset(foreground_pixel), XtRString, XtDefaultForeground}, + Offset(foreground_pixel), XtRString, (char *)XtDefaultForeground}, {XtNhighlight, XtCHighlight, XtRPixel, sizeof(Pixel), - Offset(highlight_pixel), XtRString, XtDefaultForeground}, + Offset(highlight_pixel), XtRString, (char *)XtDefaultForeground}, {XtNframe, XtCFrame, XtRPixel, sizeof(Pixel), - Offset(frame_pixel), XtRString, XtDefaultForeground}, + Offset(frame_pixel), XtRString, (char *)XtDefaultForeground}, {XtNgridTolerance, XtCGridTolerance, XtRDimension, sizeof(Dimension), Offset(grid_tolerance), XtRImmediate, (XtPointer) DefaultGridTolerance}, {XtNsize, XtCSize, XtRString, sizeof(String), @@ -122,32 +122,31 @@ }; #undef Offset - static XtActionsRec actions[] = { -{"mark", (XtActionProc)BWTMark}, -{"mark-all", (XtActionProc)BWTMarkAll}, -{"unmark", (XtActionProc)BWTUnmark}, -{"paste", (XtActionProc)BWTPaste}, -{"bw-debug", (XtActionProc)BWDebug}, -{"abort", (XtActionProc)BWAbort}, -{"store-to-buffer", (XtActionProc)BWStoreToBuffer}, -{"change-notify", (XtActionProc)BWChangeNotify}, -{"set-changed", (XtActionProc)BWSetChanged}, -{"up", (XtActionProc)BWUp}, -{"down", (XtActionProc)BWDown}, -{"left", (XtActionProc)BWLeft}, -{"right", (XtActionProc)BWRight}, -{"fold", (XtActionProc)BWFold}, -{"flip-horiz", (XtActionProc)BWFlipHoriz}, -{"flip-vert", (XtActionProc)BWFlipVert}, -{"rotate-right", (XtActionProc)BWRotateRight}, -{"rotate-left", (XtActionProc)BWRotateLeft}, -{"set", (XtActionProc)BWSet}, -{"clear", (XtActionProc)BWClear}, -{"invert", (XtActionProc)BWInvert}, -{"undo", (XtActionProc)BWUndo}, -{"redraw", (XtActionProc)BWRedraw}, +{"mark", BWTMark}, +{"mark-all", BWTMarkAll}, +{"unmark", BWTUnmark}, +{"paste", BWTPaste}, +{"bw-debug", BWDebug}, +{"abort", BWAbort}, +{"store-to-buffer", BWStoreToBufferAction}, +{"change-notify", BWChangeNotifyAction}, +{"set-changed", BWSetChangedAction}, +{"up", BWUpAction}, +{"down", BWDownAction}, +{"left", BWLeftAction}, +{"right", BWRightAction}, +{"fold", BWFoldAction}, +{"flip-horiz", BWFlipHorizAction}, +{"flip-vert", BWFlipVertAction}, +{"rotate-right", BWRotateRightAction}, +{"rotate-left", BWRotateLeftAction}, +{"set", BWSetAction}, +{"clear", BWClearAction}, +{"invert", BWInvertAction}, +{"undo", BWUndoAction}, +{"redraw", BWRedraw}, }; static char translations1[] = @@ -503,6 +502,13 @@ #endif void +BWChangeNotifyAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWChangeNotify(w); +} + +void BWChangeNotify(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -520,6 +526,13 @@ } void +BWSetChangedAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWSetChanged(w); +} + +void BWSetChanged(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -655,12 +668,12 @@ static char * StripFilename(_Xconst _XtString filename) { - const char *begin = strrchr(filename, '/'); - const char *end; - char *result; - int length; - if (filename) { + const char *begin = strrchr(filename, '/'); + const char *end; + char *result; + int length; + begin = (begin ? begin + 1 : filename); end = strchr(begin, '.'); /* change to strrchr to allow longer names */ length = (end ? (end - begin) : strlen (begin)); 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/bitmap-1.1.1/Bitmap.h new/bitmap-1.1.2/Bitmap.h --- old/bitmap-1.1.1/Bitmap.h 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/Bitmap.h 2026-01-25 00:21:37.000000000 +0100 @@ -274,11 +274,29 @@ extern void BWTUnmark ( Widget w, XEvent *event, String *params, Cardinal *num_params ); extern void BWTPaste ( Widget w, XEvent *event, String *params, Cardinal *num_params ); extern void BWDebug ( Widget w, XEvent *event, String *params, Cardinal *num_params ); -extern void BWAbort ( Widget w ); +extern void BWAbort ( Widget w, XEvent *event, String *params, Cardinal *num_params ); extern Boolean BWRemoveRequest ( Widget w ); -extern void BWRedraw ( Widget w ); +extern void BWRedraw ( Widget w, XEvent *event, String *params, Cardinal *num_params ); extern Pixmap BWGetPixmap( Widget w ); + +extern void BWUpAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWDownAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWLeftAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWRightAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWRotateRightAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWRotateLeftAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWStoreToBufferAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWUndoAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWSetChangedAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWFoldAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWClearAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWSetAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWInvertAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWFlipHorizAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWFlipVertAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); +extern void BWChangeNotifyAction ( Widget w, XEvent *event, String *params, Cardinal *num_params ); + #endif /* _Bitmap_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/bitmap-1.1.1/BitmapP.h new/bitmap-1.1.2/BitmapP.h --- old/bitmap-1.1.1/BitmapP.h 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/BitmapP.h 2026-01-25 00:21:37.000000000 +0100 @@ -65,7 +65,7 @@ /**********/ struct _BWRequestRec { - char *name; + _Xconst char *name; int status_size; EngageProc engage; XtPointer engage_client_data; 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/bitmap-1.1.1/ChangeLog new/bitmap-1.1.2/ChangeLog --- old/bitmap-1.1.1/ChangeLog 2024-02-03 19:23:56.000000000 +0100 +++ new/bitmap-1.1.2/ChangeLog 2026-01-25 00:21:48.000000000 +0100 @@ -1,3 +1,230 @@ +commit 9fe123f47fb88d6fdadb765f1783666be28031ff +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 24 15:17:45 2026 -0800 + + bitmap 1.1.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7bd85d314ebc927b4e71d41848420376b33718cf +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/bitmap/-/merge_requests/14> + +commit e98dd780fb2ae4611237637474cd739c8e00f7f0 +Author: Alan Coopersmith <[email protected]> +Date: Mon Sep 8 17:49:42 2025 -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/bitmap/-/merge_requests/13> + +commit 33db0dfa08af20586ed5a1a7eeb57e2d6cfd53b0 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 27 17:40:25 2025 -0700 + + Partial Revert of "Fix warning: initialization discards ‘const’ qualifier..." + + This reverts most of commit 30c82fedf832d2ae69a953b750acc7d8d19ccd13. + These changes are not necessary when building with libXt 1.2.0 and later + due to the -D_CONST_X_STRING in Makefile.am + + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/12> + +commit 75f8ab6b1f6a5e6a0a9894f5cf316805bf0b4e55 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 27 17:32:00 2025 -0700 + + Partial Revert of "fix: warning: assignment discards ‘const’ qualifier..." + + This reverts much of commit 16d3040e49ab3d2ce4ec91f0bd6d60d6315fe3e4. + These changes are not necessary when building with libXt 1.2.0 and later + due to the -D_CONST_X_STRING in Makefile.am + + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/12> + +commit 59386837b8484f557bc4c67b576d65593ec6ad7b +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 26 13:15:36 2025 -0700 + + Clear 10 of 15 -Wsign-compare warnings from gcc 15.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/11> + +commit f46943f5495e3c345e0ba6573e4d68ce230609f6 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 26 13:00:18 2025 -0700 + + StripFilename: avoid calling strrchr on NULL filename + + Found by gcc 15.1: + Bitmap.c: In function ‘StripFilename’: + Bitmap.c:674:25: warning: use of NULL ‘filename’ where non-null expected + [CWE-476] [-Wanalyzer-null-argument] + 674 | const char *begin = strrchr(filename, '/'); + | ^~~~~~~~~~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/11> + +commit 7284fd3c7a69d81fb72f496af3c44f505d8e1763 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 26 12:10:18 2025 -0700 + + Handle -Wcast-function-type warnings for functions used as XtActionProcs + + Fixes 19 warnings from gcc 15.1 of the form: + + Bitmap.c:125:32: warning: cast between incompatible function types + from ‘void (*)(struct _WidgetRec *)’ + to ‘void (*)(struct _WidgetRec *, XEvent *, const char **, Cardinal *)’ + {aka ‘void (*)(struct _WidgetRec *, union _XEvent *, const char **, + unsigned int *)’} [-Wcast-function-type] + 125 | #define __C(A,B) {(char *)(A),(XtActionProc)(B)} + | ^ + Bitmap.c:133:3: note: in expansion of macro ‘__C’ + 133 | __C("abort", BWAbort), + | ^~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/11> + +commit e6823baf329bf67e280ca5d2a37ba7be8886bed5 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 26 10:51:28 2025 -0700 + + LoseSelection: second argument should be pointer, not raw value + + Found by gcc 15.1: + + CutPaste.c: In function ‘BWGrabSelection’: + CutPaste.c:143:47: warning: cast between incompatible function types + from ‘void (*)(struct _WidgetRec *, Atom)’ + {aka ‘void (*)(struct _WidgetRec *, long unsigned int)’} + to ‘void (*)(struct _WidgetRec *, Atom *)’ + {aka ‘void (*)(struct _WidgetRec *, long unsigned int *)’} + [-Wcast-function-type] + 143 | (XtLoseSelectionProc)LoseSelection, + | ^ + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/11> + +commit 9d15d9bda6c1107341c1a8a9aca66372c4b69569 +Author: Walter Harms <[email protected]> +Date: Wed Jul 9 21:46:34 2025 +0200 + + FIX const warning + + Fix last const warning by cast, not good by no more warnings at least. + +commit 7900a7e09339d122b977046a0e456db81f16c81b +Author: Walter Harms <[email protected]> +Date: Sun Jul 6 13:30:22 2025 +0200 + + Fix Shadow warning + + after cleanup const warnings a shadow warning was left. + 'filename' was used twice. filename in main() is now myfilename. + +commit 3124c475512492e19d114516795fd1d2a1394f91 +Author: Walter Harms <[email protected]> +Date: Sun Jun 29 23:07:48 2025 +0200 + + FIX warning: assignment discards ‘const’ qualifier from pointer target type + + rewrite FixEntry() to use XtVaSetValues() in place of XtSetArg() + that makes array and counter useless + +commit b0777ccf75ede5270534054887c299efa5adaa39 +Author: Walter Harms <[email protected]> +Date: Sun Jun 29 21:17:03 2025 +0200 + + FIX: warning: cast from function call of type ‘double’ to non-matching type ‘short int’ + + add a helper rad and let the compiler do its job + +commit 9a19c5812760c49bc7c51220233d251e4a178996 +Author: Walter Harms <[email protected]> +Date: Sun Jun 29 21:08:33 2025 +0200 + + FIX: warning: cast from function call of type ‘double’ to non-matching type ‘short int’ + + calculate floor(radius) once and do not cast same idee as a few lines + below. + +commit 53112755779d802fb44efe909e81962ad00cc51c +Author: Walter Harms <[email protected]> +Date: Sun Jun 29 21:04:06 2025 +0200 + + FIX an other const warning + +commit 16d3040e49ab3d2ce4ec91f0bd6d60d6315fe3e4 +Author: Walter Harms <[email protected]> +Date: Sat Jun 28 22:30:26 2025 +0200 + + fix: warning: assignment discards ‘const’ qualifier from pointer target type + + fix a pile of const warnings with casting. actualy this should be fixed + in Xt itself. + +commit 30c82fedf832d2ae69a953b750acc7d8d19ccd13 +Author: Walter Harms <[email protected]> +Date: Fri Jun 27 23:00:29 2025 +0200 + + Fix warning: initialization discards ‘const’ qualifier from pointer target type + + change structure definition to fit reality + +commit 3f7f3a229e2c24dd900fc57c9a58afdaa75476d4 +Author: Walter Harms <[email protected]> +Date: Fri Jun 27 22:44:07 2025 +0200 + + make return obvious + + no memory return immediately + saves one indention + +commit c4c40734b879db0a7f4e63f80cbd4baa7619c14a +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 26 10:13:28 2025 -0700 + + man pages: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: man1/bitmap.1:29:85: STYLE: input text line longer than 80 bytes: bitmap, bmtoa, atobm... + mandoc: man1/bitmap.1:612:2: WARNING: skipping paragraph macro: br after sp + mandoc: man1/bitmap.1:618:2: STYLE: fill mode already enabled, skipping: fi + an.tmac:man1/bitmap.1:616: style: 4 leading space(s) on input line + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/10> + +commit 01314294795f5c1145caa778db28eba552d5abbc +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 29 14:50:21 2025 -0700 + + Improve man page formatting + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/bitmap/-/merge_requests/9> + commit 8330c04c89b5983a4c8a32a78a812343dba8ac05 Author: Alan Coopersmith <[email protected]> Date: Sat Feb 3 09:55:48 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/bitmap-1.1.1/CutPaste.c new/bitmap-1.1.2/CutPaste.c --- old/bitmap-1.1.1/CutPaste.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/CutPaste.c 2026-01-25 00:21:37.000000000 +0100 @@ -106,9 +106,8 @@ } } -/* ARGSUSED */ static void -LoseSelection(Widget w, Atom selection) +LoseSelection(Widget w, _X_UNUSED Atom *selection) { BitmapWidget BW = (BitmapWidget) w; @@ -140,7 +139,7 @@ BW->bitmap.selection.own = XtOwnSelection(w, XA_PRIMARY, btime, ConvertSelection, - (XtLoseSelectionProc)LoseSelection, + LoseSelection, SelectionDone); if (DEBUG && BW->bitmap.selection.own) fprintf(stderr, "Own the selection\n"); 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/bitmap-1.1.1/Dialog.c new/bitmap-1.1.2/Dialog.c --- old/bitmap-1.1.1/Dialog.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/Dialog.c 2026-01-25 00:21:37.000000000 +0100 @@ -71,9 +71,8 @@ SetSelected(Widget w, XtPointer clientData, XtPointer callData) /* ARGSUSED */ { String name = (String)clientData; - int i; - for (i = 0; i < XtNumber(dialog_buttons); i++) + for (Cardinal i = 0; i < XtNumber(dialog_buttons); i++) if (!strcmp(dialog_buttons[i].name, name)) selected |= dialog_buttons[i].flag; } @@ -87,9 +86,8 @@ { char button_name[80]; XtPointer dummy = NULL; - int i; - for (i = 0; i < *argc; i++) { + for (Cardinal i = 0; i < *argc; i++) { XmuCopyISOLatin1Lowered (button_name, argv[i]); SetSelected(w, button_name, dummy); } @@ -100,13 +98,14 @@ Dialog CreateDialog(Widget top_widget, String name, unsigned long options) { - int i; Dialog popup; popup = (Dialog) XtMalloc(sizeof(_Dialog)); - if (popup) { - if (firstTime) { + if (! popup) + return NULL; + + if (firstTime) { XtAddActions(actions_table, XtNumber(actions_table)); firstTime = False; } @@ -118,16 +117,13 @@ dialogWidgetClass, popup->shell_widget, NULL, 0); - for (i = 0; i < XtNumber(dialog_buttons); i++) + for (Cardinal i = 0; i < XtNumber(dialog_buttons); i++) if (options & dialog_buttons[i].flag) XawDialogAddButton(popup->dialog_widget, dialog_buttons[i].name, - SetSelected, dialog_buttons[i].name); + SetSelected, (XtPointer)dialog_buttons[i].name); popup->options = options; return popup; - } - else - return NULL; } void 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/bitmap-1.1.1/Graphics.c new/bitmap-1.1.2/Graphics.c --- old/bitmap-1.1.1/Graphics.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/Graphics.c 2026-01-25 00:21:37.000000000 +0100 @@ -427,10 +427,11 @@ BWDrawPoint(w, origin_x, origin_y, value); } else { - BWDrawPoint(w, origin_x - (Position) floor(radius), origin_y, value); - BWDrawPoint(w, origin_x + (Position) floor(radius), origin_y, value); - BWDrawPoint(w, origin_x, origin_y - (Position) floor(radius), value); - BWDrawPoint(w, origin_x, origin_y + (Position) floor(radius), value); + delta =floor(radius); + BWDrawPoint(w, origin_x - delta, origin_y, value); + BWDrawPoint(w, origin_x + delta, origin_y, value); + BWDrawPoint(w, origin_x, origin_y - delta, value); + BWDrawPoint(w, origin_x, origin_y + delta, value); } half = radius / sqrt(2.0); for(i = 1; (int)i <= (int)half; i++) { @@ -453,17 +454,20 @@ Position origin_x, Position origin_y, Position point_x, Position point_y, int value) { - register Position i, j, delta; + register Position i, j, delta, rad; Dimension dx, dy; double radius; dx = abs(point_x - origin_x); dy = abs(point_y - origin_y); radius = sqrt((double) ((int)dx * (int)dx + (int)dy * (int)dy)); - for(j = origin_x - (Position) floor(radius); - j <= origin_x + (Position) floor(radius); j++) - BWDrawPoint(w, j, origin_y, value); - for(i = 1; i <= (Position) floor(radius); i++) { + rad=floor(radius); + for(j = origin_x - rad ; + j <= origin_x + rad; + j++) + BWDrawPoint(w, j, origin_y, value); + + for(i = 1; i <= rad; i++) { delta = sqrt(radius * radius - i * i); for(j = origin_x - delta; j <= origin_x + delta; j++) { BWDrawPoint(w, j, origin_y - i, value); @@ -601,6 +605,13 @@ min(BW->bitmap.hot.y, BW->bitmap.mark.to_y)))) void +BWUpAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWUp(w); +} + +void BWUp(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -647,6 +658,13 @@ } void +BWDownAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWDown(w); +} + +void BWDown(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -691,6 +709,13 @@ } void +BWLeftAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWLeft(w); +} + +void BWLeft(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -736,6 +761,13 @@ } void +BWRightAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWRight(w); +} + +void BWRight(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -782,6 +814,13 @@ /* void TransferImageData(); */ void +BWFoldAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWFold(w); +} + +void BWFold(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -827,6 +866,13 @@ void +BWClearAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWClear(w); +} + +void BWClear(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -846,6 +892,13 @@ } void +BWSetAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWSet(w); +} + +void BWSet(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -865,7 +918,8 @@ } void -BWRedraw(Widget w) +BWRedraw(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) { BitmapWidget BW = (BitmapWidget) w; @@ -875,6 +929,13 @@ } void +BWInvertAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWInvert(w); +} + +void BWInvert(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -893,6 +954,13 @@ } void +BWFlipHorizAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWFlipHoriz(w); +} + +void BWFlipHoriz(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -934,6 +1002,13 @@ } void +BWFlipVertAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWFlipVert(w); +} + +void BWFlipVert(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -976,6 +1051,13 @@ void +BWRotateRightAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWRotateRight(w); +} + +void BWRotateRight(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -1058,6 +1140,13 @@ } void +BWRotateLeftAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWRotateLeft(w); +} + +void BWRotateLeft(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -1378,6 +1467,13 @@ } void +BWStoreToBufferAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWStoreToBuffer(w); +} + +void BWStoreToBuffer(Widget w) { BitmapWidget BW = (BitmapWidget) w; @@ -1461,6 +1557,13 @@ } void +BWUndoAction(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) +{ + BWUndo(w); +} + +void BWUndo(Widget w) { BitmapWidget BW = (BitmapWidget) w; 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/bitmap-1.1.1/ReqMach.c new/bitmap-1.1.2/ReqMach.c --- old/bitmap-1.1.1/ReqMach.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/ReqMach.c 2026-01-25 00:21:38.000000000 +0100 @@ -55,9 +55,7 @@ static BWRequestRec * FindRequest(BWRequest name) { - int i; - - for (i = 0; i < bitmapClassRec.bitmap_class.num_requests; i++) + for (Cardinal i = 0; i < bitmapClassRec.bitmap_class.num_requests; i++) if (!strcmp(name, bitmapClassRec.bitmap_class.requests[i].name)) return &bitmapClassRec.bitmap_class.requests[i]; @@ -155,7 +153,7 @@ } } /* - * Terimantes the current request and continues with next request if con = TRUE + * Terminates the current request and continues with next request if cont = TRUE * Returns TRUE if there is any number of requests left on the stack. */ Boolean @@ -190,10 +188,11 @@ } /* - * Simple interface to BWTerminateRequest that takes only a widget. + * XtActionProc interface to BWTerminateRequest. */ void -BWAbort(Widget w) +BWAbort(Widget w, _X_UNUSED XEvent *event, + _X_UNUSED String *params, _X_UNUSED Cardinal *num_params) { BWTerminateRequest(w, True); } 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/bitmap-1.1.1/bmtoa.c new/bitmap-1.1.2/bmtoa.c --- old/bitmap-1.1.1/bmtoa.c 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/bmtoa.c 2026-01-25 00:21:38.000000000 +0100 @@ -194,14 +194,13 @@ const char *chars) { unsigned const char *dp = data; - int row, column; static unsigned const char masktable[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; int padded = ((width & 7) != 0); - for (row = 0; row < height; row++) { - for (column = 0; column < width; column++) { - int i = (column & 7); + for (unsigned int row = 0; row < height; row++) { + for (unsigned int column = 0; column < width; column++) { + unsigned int i = (column & 7); if (*dp & masktable[i]) { putchar (chars[1]); 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/bitmap-1.1.1/compile new/bitmap-1.1.2/compile --- old/bitmap-1.1.1/compile 2024-02-03 19:23:50.000000000 +0100 +++ new/bitmap-1.1.2/compile 2026-01-25 00:21:42.000000000 +0100 @@ -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/bitmap-1.1.1/configure.ac new/bitmap-1.1.2/configure.ac --- old/bitmap-1.1.1/configure.ac 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/configure.ac 2026-01-25 00:21:38.000000000 +0100 @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([bitmap], [1.1.1], - [https://gitlab.freedesktop.org/xorg/app/bitmap/issues], [bitmap]) +AC_INIT([bitmap], [1.1.2], + [https://gitlab.freedesktop.org/xorg/app/bitmap/-/issues], [bitmap]) 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/bitmap-1.1.1/man/bitmap.man new/bitmap-1.1.2/man/bitmap.man --- old/bitmap-1.1.1/man/bitmap.man 2024-02-03 19:23:45.000000000 +0100 +++ new/bitmap-1.1.2/man/bitmap.man 2026-01-25 00:21:38.000000000 +0100 @@ -1,3 +1,4 @@ +'\" t .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -25,7 +26,8 @@ .\" .TH BITMAP 1 __xorgversion__ .SH NAME -bitmap, bmtoa, atobm \- bitmap editor and converter utilities for the X Window System +bitmap, bmtoa, atobm +\- bitmap editor and converter utilities for the X Window System .SH SYNOPSIS .B bitmap [ @@ -60,17 +62,18 @@ .I filename ] .SH DESCRIPTION -The \fIbitmap\fP program is a rudimentary tool for creating or editing +The \fBbitmap\fP program is a rudimentary tool for creating or editing rectangular images made up of 1's and 0's. Bitmaps are used in X for defining clipping regions, cursor shapes, icon shapes, and tile and stipple patterns. .PP -The \fIbmtoa\fP and \fIatobm\fP filters convert \fIbitmap\fP files (FILE +The \fBbmtoa\fP and \fBatobm\fP filters convert \fIbitmap\fP files (FILE FORMAT) to and from ASCII strings. They are most commonly used to quickly print out bitmaps and to generate versions for including in text. .SH COMMAND LINE OPTIONS -\fIBitmap\fP supports the standard X Toolkit command line arguments -(see \fIX\fP(__miscmansuffix__)). The following additional arguments are supported as well. +\fBBitmap\fP supports the standard X Toolkit command line arguments +(see \fBX\fP(__miscmansuffix__)). +The following additional arguments are supported as well. .TP 4 .B \-size\fI WIDTHxHEIGHT\fP Specifies size of the grid in squares. @@ -98,10 +101,11 @@ Turns on or off stippling of highlighted squares. .TP 4 .B \-proportional, +proportional -Turns proportional mode on or off. If proportional mode is on, -square width is equal to square height. If proportional mode is -off,\fI bitmap\fP will use the smaller square dimension, if they -were initially different. +Turns proportional mode on or off. +If proportional mode is on, square width is equal to square height. +If proportional mode is off, +\fBbitmap\fP will use the smaller square dimension, +if they were initially different. .TP 4 .B \-dashes\fI filename\fP Specifies the bitmap to be used as a stipple for dashing. @@ -117,14 +121,14 @@ .TP 4 .B filename Specifies the bitmap to be initially loaded into the program. -If the file does not exist,\fI bitmap\fP will assume it is a new file. +If the file does not exist, \fBbitmap\fP will assume it is a new file. .TP 4 .B basename Specifies the basename to be used in the C code output file. -If it is different than the basename in the working file,\fI bitmap\fP +If it is different than the basename in the working file, \fBbitmap\fP will change it when saving the file. .PP -\fIBmtoa\fP accepts the following option: +\fBBmtoa\fP accepts the following option: .TP 4 .B \-chars \fIcc\fP This option specifies the pair of characters to use in the string version @@ -132,7 +136,7 @@ is used for 1 bits. The default is to use dashes (\-) for 0's and sharp signs (#) for 1's. .PP -\fIAtobm\fP accepts the following options: +\fBAtobm\fP accepts the following options: .TP 4 .B \-chars \fIcc\fP This option specifies the pair of characters to use when converting string @@ -161,7 +165,7 @@ .B \-version Prints version info and exits. .SH USAGE -\fIBitmap\fP displays grid in which each square represents a single +\fBBitmap\fP displays grid in which each square represents a single bit in the picture being edited. Actual size of the bitmap image, as it would appear normally and inverted, can be obtained by pressing\fB Meta-I\fP key. You are free to move the image popup out of the way to @@ -327,12 +331,12 @@ This command will change the grid squares underneath the mouse pointer if a mouse button is being pressed down. If you drag the mouse button continuously, it will make sure that the line is continuous. If your system -is slow or\fI bitmap\fP receives very few mouse motion events, it might +is slow or \fBbitmap\fP receives very few mouse motion events, it might behave quite strangely. .TP 4 .B Line This command will change the grid squares in a line between two squares. -Once you press a mouse button in the grid window,\fI bitmap\fP will +Once you press a mouse button in the grid window, \fBbitmap\fP will highlight the line from the square where the mouse button was initially pressed to the square where the mouse pointer is located. By releasing the mouse button you will cause the change to take effect, and the highlighted @@ -340,7 +344,7 @@ .TP 4 .B Rectangle This command will change the grid squares in a rectangle between two squares. -Once you press a mouse button in the grid window,\fI bitmap\fP will +Once you press a mouse button in the grid window, \fBbitmap\fP will highlight the rectangle from the square where the mouse button was initially pressed to the square where the mouse pointer is located. By releasing the mouse button you will cause the change to take effect, and the highlighted @@ -352,7 +356,7 @@ .TP 4 .B Circle This command will change the grid squares in a circle between two squares. -Once you press a mouse button in the grid window,\fI bitmap\fP will +Once you press a mouse button in the grid window, \fBbitmap\fP will highlight the circle from the square where the mouse button was initially pressed to the square where the mouse pointer is located. By releasing the mouse button you will cause the change to take effect, and the highlighted @@ -515,7 +519,7 @@ highlighted image area, the bitmap will fall back to the internal cut and paste buffer and paste whatever was there stored at the moment. .SH WIDGETS -Below is the widget structure of the \fIbitmap\fP +Below is the widget structure of the \fBbitmap\fP application. Indentation indicates hierarchical structure. The widget class name is given first, followed by the widget instance name. All widgets except the bitmap widget are from the standard @@ -606,13 +610,10 @@ .sp 1 *customization: \-color .sp 1 -.br This will cause bitmap to pick up the colors in the app-defaults color customization file: -.sp 1 - __apploaddir__/Bitmap-color -.sp 1 -.fi +.IP +__apploaddir__/Bitmap\-color .SH BITMAP WIDGET Bitmap widget is a stand-alone widget for editing raster images. It is not designed to edit large images, although it may be used in that 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/bitmap-1.1.1/missing new/bitmap-1.1.2/missing --- old/bitmap-1.1.1/missing 2024-02-03 19:23:50.000000000 +0100 +++ new/bitmap-1.1.2/missing 2026-01-25 00:21:42.000000000 +0100 @@ -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/bitmap-1.1.1/test-driver new/bitmap-1.1.2/test-driver --- old/bitmap-1.1.1/test-driver 2024-02-03 19:23:50.000000000 +0100 +++ new/bitmap-1.1.2/test-driver 2026-01-25 00:21:42.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 2011-2021 Free Software Foundation, Inc. +# Copyright (C) 2011-2025 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,11 +44,16 @@ Usage: test-driver --test-name NAME --log-file PATH --trs-file PATH [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--collect-skipped-logs {yes|no}] [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. See the GNU Automake documentation for information. + +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/>. END } @@ -57,15 +62,17 @@ trs_file= # Where to save the metadata of the test run. expect_failure=no color_tests=no +collect_skipped_logs=yes enable_hard_errors=yes while test $# -gt 0; do case $1 in --help) print_usage; exit $?;; - --version) echo "test-driver $scriptversion"; exit $?;; + --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;; --test-name) test_name=$2; shift;; --log-file) log_file=$2; shift;; --trs-file) trs_file=$2; shift;; --color-tests) color_tests=$2; shift;; + --collect-skipped-logs) collect_skipped_logs=$2; shift;; --expect-failure) expect_failure=$2; shift;; --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; @@ -121,7 +128,7 @@ case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; - 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 77:*) col=$blu res=SKIP recheck=no gcopy=$collect_skipped_logs;; 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; *:*) col=$red res=FAIL recheck=yes gcopy=yes;; @@ -145,9 +152,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:
