Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ico for openSUSE:Factory checked in at 2026-04-19 14:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ico (Old) and /work/SRC/openSUSE:Factory/.ico.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ico" Sun Apr 19 14:20:59 2026 rev:9 rq:1348004 version:1.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ico/ico.changes 2022-09-01 22:11:59.144377825 +0200 +++ /work/SRC/openSUSE:Factory/.ico.new.11940/ico.changes 2026-04-19 14:21:27.130309276 +0200 @@ -1,0 +2,8 @@ +Sun Apr 19 09:39:31 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.7 + * This release adds support for building with meson as well as + autoconf. +- switch to meson + +------------------------------------------------------------------- Old: ---- ico-1.0.6.tar.xz New: ---- ico-1.0.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ico.spec ++++++ --- /var/tmp/diff_new_pack.jNamUX/_old 2026-04-19 14:21:27.590327982 +0200 +++ /var/tmp/diff_new_pack.jNamUX/_new 2026-04-19 14:21:27.594328145 +0200 @@ -1,7 +1,7 @@ # # spec file for package ico # -# Copyright (c) 2022 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: ico -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Simple animation program used for testing X11 operations and extensions License: MIT Group: System/X11/Utilities URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson BuildRequires: pkg-config BuildRequires: pkgconfig(x11) >= 0.99.1 BuildRequires: pkgconfig(xproto) >= 7.0.22 @@ -41,15 +42,16 @@ %setup -q %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %files %defattr(-,root,root) -%doc ChangeLog COPYING README.md +%doc ChangeLog README.md +%license COPYING %{_bindir}/ico %{_mandir}/man1/ico.1%{?ext_man} ++++++ ico-1.0.6.tar.xz -> ico-1.0.7.tar.xz ++++++ ++++ 14738 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/ico-1.0.6/COPYING new/ico-1.0.7/COPYING --- old/ico-1.0.6/COPYING 2022-08-31 02:16:47.000000000 +0200 +++ new/ico-1.0.7/COPYING 2026-04-18 23:59:22.000000000 +0200 @@ -26,13 +26,13 @@ All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -45,7 +45,7 @@ ------------------------------------------------------------------------------ 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 @@ -55,7 +55,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 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/ico-1.0.6/ChangeLog new/ico-1.0.7/ChangeLog --- old/ico-1.0.6/ChangeLog 2022-08-31 02:16:58.000000000 +0200 +++ new/ico-1.0.7/ChangeLog 2026-04-18 23:59:32.000000000 +0200 @@ -1,3 +1,92 @@ +commit a087b16ab5b6fa2db21ba785247ff2e3d21d7da7 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 18 14:54:54 2026 -0700 + + ico 1.0.7 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7439467739e6ac159d83d935e02434c02bba163a +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 14 10:49:38 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/ico/-/merge_requests/9> + +commit 57f6aab4b6d232e60c629426eaf6dee10ac46517 +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/ico/-/merge_requests/9> + +commit 56e476b9e5705f46e7b3c6a9be761cd32474d903 +Author: Alan Coopersmith <[email protected]> +Date: Sun Aug 3 15:15:22 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/ico/-/merge_requests/8> + +commit ee8e015b5e2581d49b1305f5b41369454bdc25c9 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 26 14:37:48 2025 -0700 + + man pages: fix warnings from `mandoc -T lint` + + mandoc: man/ico.1:1:11: WARNING: cannot parse date, using it verbatim: TH ico 1.0.6 + mandoc: man/ico.1:68:2: WARNING: skipping paragraph macro: PP after SH + mandoc: man/ico.1:75:2: WARNING: skipping paragraph macro: PP after SH + mandoc: man/ico.1:91:2: WARNING: skipping paragraph macro: PP after SH + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/ico/-/merge_requests/7> + +commit 25b1195d40ad77dd4fdc7a5692c81f8dd3e329f3 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 29 15:38:19 2025 -0700 + + Improve man page formatting + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/ico/-/merge_requests/6> + +commit 713f06d0d262fb8d9157740b506df0bb38278557 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 22 14:51:22 2025 -0700 + + Accept -help & --help without printing an unknown option error message + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/ico/-/merge_requests/6> + +commit 3ea0e0d66d423dac459f4ad5ab14c9ed08a07644 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 3737d77a549d94043e0fbdb5f30562973da66fa8 Author: Alan Coopersmith <[email protected]> Date: Tue Aug 30 17:13:18 2022 -0700 @@ -671,7 +760,7 @@ configure cache, you cache it, and the cached value is probably wrong. commit 9e0555e9d980217dd20d1f7385ff47514675629c -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Tue Jun 28 15:00:13 2005 +0000 Check in build system for ico 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/ico-1.0.6/Makefile.am new/ico-1.0.7/Makefile.am --- old/ico-1.0.6/Makefile.am 2022-08-31 02:16:47.000000000 +0200 +++ new/ico-1.0.7/Makefile.am 2026-04-18 23:59:22.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 @@ -47,4 +47,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build 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/ico-1.0.6/compile new/ico-1.0.7/compile --- old/ico-1.0.6/compile 2022-08-31 02:16:51.000000000 +0200 +++ new/ico-1.0.7/compile 2026-04-18 23:59:26.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/ico-1.0.6/config.h.in new/ico-1.0.7/config.h.in --- old/ico-1.0.6/config.h.in 2022-08-31 02:16:51.000000000 +0200 +++ new/ico-1.0.7/config.h.in 2026-04-18 23:59:25.000000000 +0200 @@ -57,7 +57,7 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS 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/ico-1.0.6/configure.ac new/ico-1.0.7/configure.ac --- old/ico-1.0.6/configure.ac 2022-08-31 02:16:47.000000000 +0200 +++ new/ico-1.0.7/configure.ac 2026-04-18 23:59:22.000000000 +0200 @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([ico], [1.0.6], +AC_INIT([ico], [1.0.7], [https://gitlab.freedesktop.org/xorg/app/ico/issues], [ico]) 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/ico-1.0.6/ico.c new/ico-1.0.7/ico.c --- old/ico-1.0.6/ico.c 2022-08-31 02:16:47.000000000 +0200 +++ new/ico-1.0.7/ico.c 2026-04-18 23:59:22.000000000 +0200 @@ -28,13 +28,13 @@ All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -154,7 +154,7 @@ Point3D xv[2][MAXNV]; int xv_buffer; double wo2, ho2; -#ifdef MULTITHREAD +#ifdef MULTITHREAD int thread_num; #endif }; @@ -191,11 +191,11 @@ " -bg color background color\n" " -colors color ... codes to use on sides\n" " -p# use # (1 through 8) primary colors\n" -#ifdef MULTIBUFFER +#ifdef MULTIBUFFER " -dbl use double buffering extension (if present)\n" -#else +#else " -dbl use double buffering (software only)\n" -#endif +#endif " -softdbl use software double buffering\n" " -noedges don't draw wire frame edges\n" " -faces draw faces\n" @@ -207,7 +207,7 @@ " -sleep number seconds to sleep in between draws\n" " -obj objname type of polyhedral object to draw\n" " -objhelp list polyhedral objects available\n" -#ifdef MULTITHREAD +#ifdef MULTITHREAD " -threads number number of windows, each its own thread\n" #endif " -version print program version\n" @@ -842,7 +842,7 @@ Bool do_it = True; char buf[20]; struct closure *closure = ptr; -#ifdef MULTITHREAD +#ifdef MULTITHREAD int len; #endif @@ -862,7 +862,7 @@ if (XAllocNamedColor (dpy, closure->cmap, background_colorname, &cdef, &igndef)) bg = cdef.pixel; - else + else icoFatal("background: no such color \"%s\"",background_colorname); } if (numcolors && (!dofaces || numcolors == 1)) { @@ -870,7 +870,7 @@ if (XAllocNamedColor (dpy, closure->cmap, colornames[0], &cdef, &igndef)) fg = cdef.pixel; - else + else icoFatal("face: no such color \"%s\"", colornames[0]); } @@ -892,7 +892,7 @@ closure->winW = closure->winH = (multibufext&&dblbuf ? 300 : 600); winX = (DisplayWidth(dpy, DefaultScreen(dpy)) - closure->winW) >> 1; winY = (DisplayHeight(dpy, DefaultScreen(dpy)) - closure->winH) >> 1; - if (geom) + if (geom) XParseGeometry(geom, &winX, &winY, (unsigned int *)&closure->winW, (unsigned int *)&closure->winH); @@ -904,19 +904,19 @@ xswa.border_pixel = fg; closure->draw_window = XCreateWindow(dpy, - DefaultRootWindow(dpy), - winX, winY, closure->winW, closure->winH, 0, - DefaultDepth(dpy, DefaultScreen(dpy)), + DefaultRootWindow(dpy), + winX, winY, closure->winW, closure->winH, 0, + DefaultDepth(dpy, DefaultScreen(dpy)), InputOutput, DefaultVisual(dpy, DefaultScreen(dpy)), CWEventMask | CWBackPixel | CWBorderPixel, &xswa); -#ifdef MULTITHREAD +#ifdef MULTITHREAD len = sprintf(buf, "Ico: thread %d", closure->thread_num); XChangeProperty(dpy, closure->draw_window, - XA_WM_NAME, XA_STRING, 8, + XA_WM_NAME, XA_STRING, 8, PropModeReplace, (unsigned char *)buf, len); #else XChangeProperty(dpy, closure->draw_window, - XA_WM_NAME, XA_STRING, 8, + XA_WM_NAME, XA_STRING, 8, PropModeReplace, (unsigned char *)"Ico", 3); #endif (void) XSetWMProtocols (dpy, closure->draw_window, @@ -940,7 +940,7 @@ closure->winH = xwa.height; } - if (ico_geom) + if (ico_geom) XParseGeometry (ico_geom, &icoX, &icoY, (unsigned int *)&icoW, (unsigned int *)&icoH); @@ -970,7 +970,7 @@ DefaultGC(dpy, DefaultScreen(dpy)), 0, 0, closure->winW, closure->winH, 0, 0); closure->win = closure->multibuffers[1]; - } else + } else icoFatal ("unable to obtain 2 buffers"); } #endif /* MULTIBUFFER */ @@ -1272,16 +1272,23 @@ polyobj = findpoly(*++argv); argc--; } else if (!strcmp(*argv, "-dsync")) dsync = 1; - else if (!strncmp(*argv, "-sync", 5)) + else if (!strncmp(*argv, "-sync", 5)) xsync = 1; else if (!strcmp(*argv, "-objhelp")) { giveObjHelp(); exit(1); } - else if (strcmp(*argv, "-version") == 0) { + else if (strcmp(*argv, "-version") == 0 || + strcmp(*argv, "--version") == 0) { puts(PACKAGE_STRING); exit(0); } + else if (strcmp(*argv, "-help") == 0 || + strcmp(*argv, "--help") == 0) { + fprintf (stdout, "usage: %s [options]\n\n%s", + ProgramName, help_message); + exit (0); + } else { /* unknown arg */ fprintf (stderr, "%s: unrecognized argument %s\n\n", ProgramName, *argv); 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/ico-1.0.6/man/ico.man new/ico-1.0.7/man/ico.man --- old/ico-1.0.6/man/ico.man 2022-08-31 02:16:47.000000000 +0200 +++ new/ico-1.0.7/man/ico.man 2026-04-18 23:59:22.000000000 +0200 @@ -1,35 +1,33 @@ -.TH ICO 1 __xorgversion__ +.TH ICO 1 2025-03-22 __xorgversion__ .SH NAME ico \- animate an icosahedron or other polyhedron .SH SYNOPSIS -.B ico -[-display display] [-geometry geometry] -[-r] [-d pattern] [-i] [-dbl] [-faces] [-noedges] -[-sleep n] [-obj object] [-colors color-list] -.LP -.B ico --objhelp +.nf +\fBico\fR [\fB\-display\fR \fIdisplay\fR] [\fB\-geometry\fR \fIgeometry\fR] [\fB\-r\fR] [\fB\-d\fR \fIpattern\fR] + [\fB\-i\fR] [\fB\-dbl\fR] [\fB\-faces\fR] [\fB\-noedges\fR] [\fB\-sleep\fR \fIn\fR] [\fB\-obj\fR \fIobject\fR] + [\fB\-colors\fR \fIcolor\-list\fR] +.fi .LP .B ico --version +\fB\-help\fR | \fB\-objhelp\fR | \fB\-version\fR .SH DESCRIPTION -.I Ico +.B Ico displays a wire-frame rotating polyhedron, with hidden lines removed, or a solid-fill polyhedron with hidden faces removed. There are a number of different polyhedra available; adding a new polyhedron to the program is quite simple. .SH OPTIONS .TP -.B -r +.B \-r Display on the root window instead of creating a new window. .TP -.B -d pattern +.B \-d \fIpattern\fP Specify a bit pattern for drawing dashed lines for wire frames. .TP -.B -i +.B \-i Use inverted colors for wire frames. .TP -.B -dbl +.B \-dbl Use double buffering on the display. This works for either wire frame or solid fill drawings. For solid fill drawings, using this switch results in substantially @@ -39,40 +37,41 @@ most eight-bit-plane displays will probably be limited to eight colors when using double buffering. .TP -.B -faces +.B \-faces Draw filled faces instead of wire frames. .TP -.B -noedges +.B \-noedges Don't draw the wire frames. -Typically used only when -faces is used. +Typically used only when \fB\-faces\fP is used. .TP -.B -sleep \fIn\fP -Sleep n seconds between each move of the object. +.B \-sleep \fIn\fP +Sleep \fIn\fP seconds between each move of the object. .TP -.B -obj \fIobject\fP +.B \-obj \fIobject\fP Specify what object to draw. If no object is specified, an icosahedron is drawn. .TP -.B -objhelp -Print out a list of the available objects, along with information -about each object. -.TP -.B -colors \fIcolor color ...\fP +.B \-colors \fIcolor color ...\fP Specify what colors should be used to draw the filled faces of the object. If less colors than faces are given, the colors are reused. .TP -.B -version +.B \-help +Print program usage information and exit. +.TP +.B \-objhelp +Print out a list of the available objects, along with information +about each object, and then exit. +.TP +.B \-version Print program version information and exit. .SH PROGRAM TERMINATION -.LP Pressing "q" will close a window. If compiled with threads support, the program will stop only when all threads terminate. You can also close an animation window using the ICCCM \fIdelete\fP message (depending on your window manager, you will have a decoration button or menu to send such message). .SH ADDING POLYHEDRA -.LP -If you have the source to ico, it is very easy to add more polyhedra. +If you have the source to \fBico\fP, it is very easy to add more polyhedra. Each polyhedron is defined in an include file by the name of objXXX.h, where XXX is something related to the name of the polyhedron. The format of the include file is defined in the file polyinfo.h. @@ -85,11 +84,11 @@ files. Doing a 'make' after this will rebuild ico with the new object information. .SH "SEE ALSO" -X(__miscmansuffix__) +.BR X (__miscmansuffix__) .SH BUGS -.LP Pyramids and tetrahedrons with filled faces do not display correctly. .LP -A separate color cell is allocated for each name in the -colors list, even -when the same name may be specified twice. Color allocation fails in -TrueColor displays and option \fI-faces\fP does not work well. +A separate color cell is allocated for each name in the \fB\-colors\fP list, +even when the same name may be specified twice. +Color allocation fails in TrueColor displays and +option \fB\-faces\fP does not work well. 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/ico-1.0.6/meson.build new/ico-1.0.7/meson.build --- old/ico-1.0.6/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/ico-1.0.7/meson.build 2026-04-18 23:59:22.000000000 +0200 @@ -0,0 +1,94 @@ +# 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( + 'ico', + 'c', + version: '1.0.7', + license: 'X11 AND StandardML-NJ', + license_files: 'COPYING', + meson_version: '>= 1.3.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_libx11 = dependency('x11', required: true, version: '>= 0.99.1') +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.22') +deps = [dep_libx11, dep_xproto] + +# Checks for system libraries +dep_threads = dependency('threads') +dep_libm = cc.find_library('m', required: false) +deps += [dep_threads, dep_libm] + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +ico_sources = [ + config_h, + 'allobjs.h', + 'ico.c', + 'objcube.h', + 'objico.h', + 'objocta.h', + 'objplane.h', + 'objpyr.h', + 'polyinfo.h', +] + +executable( + 'ico', + ico_sources, + dependencies: deps, + install: true +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'ico.man', + input: 'man/ico.man', + output: 'ico.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-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/ico-1.0.6/missing new/ico-1.0.7/missing --- old/ico-1.0.6/missing 2022-08-31 02:16:51.000000000 +0200 +++ new/ico-1.0.7/missing 2026-04-18 23:59:26.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:
