diff --git a/app/ico/ChangeLog b/app/ico/ChangeLog index 97b6717e9..87664fda0 100644 --- a/app/ico/ChangeLog +++ b/app/ico/ChangeLog @@ -1,3 +1,118 @@ +commit 3737d77a549d94043e0fbdb5f30562973da66fa8 +Author: Alan Coopersmith +Date: Tue Aug 30 17:13:18 2022 -0700 + + ico 1.0.6 + + Signed-off-by: Alan Coopersmith + +commit c125d8bac5b1629e36069c13a13919e542dc3a9b +Author: Alan Coopersmith +Date: Sat Aug 13 16:04:06 2022 -0700 + + Add cast to clear -Wsign-compare warning + + ico.c: In function ‘do_ico_window’: + ico.c:1084:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] + if (xev.xclient.data.l[0] == wm_delete_window) + ^~ + + Signed-off-by: Alan Coopersmith + +commit fc54ce8a6f248e465a518f807dd5e51657b6e535 +Author: Alan Coopersmith +Date: Sat Aug 13 15:59:06 2022 -0700 + + Rename global "poly" to fix gcc -Wshadow warnings + + ico.c: In function ‘initPoly’: + ico.c:472:45: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow] + initPoly(struct closure *closure, Polyinfo *poly, int icoW, int icoH) + ^~~~ + ico.c:238:18: note: shadowed declaration is here + static Polyinfo *poly; /* -obj: the poly to draw */ + ^~~~ + ico.c: In function ‘drawPoly’: + ico.c:567:45: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow] + drawPoly(struct closure *closure, Polyinfo *poly, GC gc, + ^~~~ + ico.c:238:18: note: shadowed declaration is here + static Polyinfo *poly; /* -obj: the poly to draw */ + ^~~~ + ico.c: In function ‘giveObjHelp’: + ico.c:1137:13: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow] + Polyinfo *poly = polygons+i; + ^~~~ + ico.c:238:18: note: shadowed declaration is here + static Polyinfo *poly; /* -obj: the poly to draw */ + ^~~~ + ico.c: In function ‘findpoly’: + ico.c:1152:13: warning: declaration of ‘poly’ shadows a global declaration [-Wshadow] + Polyinfo *poly = polygons+i; + ^~~~ + ico.c:238:18: note: shadowed declaration is here + static Polyinfo *poly; /* -obj: the poly to draw */ + ^~~~ + + Signed-off-by: Alan Coopersmith + +commit 9e5fe5ae18c3f6eae93cd1521645717295ce2c23 +Author: Alan Coopersmith +Date: Sat Aug 13 15:56:22 2022 -0700 + + Apply scope reduction suggestions from cppcheck + + [ico.c:587]: (style) The scope of the variable 'pxvz' can be reduced. + [ico.c:730]: (style) The scope of the variable 't' can be reduced. + [ico.c:1132]: (style) The scope of the variable 'poly' can be reduced. + [ico.c:1149]: (style) The scope of the variable 'poly' can be reduced. + + Signed-off-by: Alan Coopersmith + +commit bd5040cdec7770501619393021eeffeb591e73f6 +Author: Alan Coopersmith +Date: Sat Apr 2 11:51:12 2022 -0700 + + man page: remove out-of-date COPYRIGHT section + + The information previously listed here didn't match what is present in + the source code or the COPYING file, and the X(7) man page doesn't list + any license information as this had claimed. + + Signed-off-by: Alan Coopersmith + +commit 9fa65d638319f6c10abde4a637e596872ff159c7 +Author: Alan Coopersmith +Date: Fri Dec 3 15:48:28 2021 -0800 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Alan Coopersmith + +commit d46e6314e03009ae3519f69aaf5773b095822f34 +Author: Alan Coopersmith +Date: Fri Dec 3 15:48:26 2021 -0800 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith + +commit 4635817dde85c6a6197857b8bf09d47dbb3fed93 +Author: Alan Coopersmith +Date: Wed Nov 21 16:47:57 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith + +commit 7aa38ed59eff2519138af7aa3b3b8a8e1270e408 +Author: Alan Coopersmith +Date: Fri Nov 16 20:01:30 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith + commit e2a3e08d7a93738a88fdc889517f85d17371b626 Author: Alan Coopersmith Date: Fri Mar 9 22:26:48 2018 -0800 @@ -556,7 +671,7 @@ Date: Wed Jul 20 19:31:48 2005 +0000 configure cache, you cache it, and the cached value is probably wrong. commit 9e0555e9d980217dd20d1f7385ff47514675629c -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Tue Jun 28 15:00:13 2005 +0000 Check in build system for ico diff --git a/app/ico/Makefile.am b/app/ico/Makefile.am index 8130a5818..ece7067c8 100644 --- a/app/ico/Makefile.am +++ b/app/ico/Makefile.am @@ -46,3 +46,5 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +EXTRA_DIST = README.md diff --git a/app/ico/Makefile.in b/app/ico/Makefile.in index be8ed0d0a..b8f489c50 100644 --- a/app/ico/Makefile.in +++ b/app/ico/Makefile.in @@ -73,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = ico$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure COPYING ChangeLog INSTALL compile \ config.guess config.sub depcomp install-sh missing @@ -179,9 +179,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -300,6 +300,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -322,6 +323,7 @@ ico_SOURCES = \ polyinfo.h MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = README.md all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -648,6 +650,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -655,7 +658,6 @@ dist-bzip2: distdir dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) diff --git a/app/ico/README b/app/ico/README deleted file mode 100644 index 6664a3846..000000000 --- a/app/ico/README +++ /dev/null @@ -1,28 +0,0 @@ -ico is a simple animation program that may be used for testing various -X11 operations and extensions. It displays a wire-frame rotating -polyhedron, with hidden lines removed, or a solid-fill polyhedron with -hidden faces removed. - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/app/ico - - http://cgit.freedesktop.org/xorg/app/ico - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage - diff --git a/app/ico/README.md b/app/ico/README.md new file mode 100644 index 000000000..56380da52 --- /dev/null +++ b/app/ico/README.md @@ -0,0 +1,20 @@ +ico is a simple animation program that may be used for testing various +X11 operations and extensions. It displays a wire-frame rotating +polyhedron, with hidden lines removed, or a solid-fill polyhedron with +hidden faces removed. + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/app/ico + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + diff --git a/app/ico/aclocal.m4 b/app/ico/aclocal.m4 index 8bef9a948..d0a818e1e 100644 --- a/app/ico/aclocal.m4 +++ b/app/ico/aclocal.m4 @@ -19,32 +19,63 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -87,8 +119,10 @@ m4_ifvaln([$3], [else $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG], else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -111,26 +146,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -140,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -161,7 +194,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -177,16 +210,40 @@ else AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir], AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -217,7 +276,24 @@ AC_ARG_WITH([noarch-pkgconfigdir], AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2012 Free Software Foundation, Inc. # diff --git a/app/ico/compile b/app/ico/compile index a85b723c7..df363c8fb 100644 --- a/app/ico/compile +++ b/app/ico/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/app/ico/configure b/app/ico/configure index 7a31af9ef..e952dd803 100644 --- a/app/ico/configure +++ b/app/ico/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ico 1.0.5. +# Generated by GNU Autoconf 2.69 for ico 1.0.6. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,7 +267,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/app/ico/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -581,9 +581,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ico' PACKAGE_TARNAME='ico' -PACKAGE_VERSION='1.0.5' -PACKAGE_STRING='ico 1.0.5' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='1.0.6' +PACKAGE_STRING='ico 1.0.6' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/ico/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -730,6 +730,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -810,6 +811,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1062,6 +1064,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1199,7 +1210,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1312,7 +1323,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ico 1.0.5 to adapt to many kinds of systems. +\`configure' configures ico 1.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1352,6 +1363,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1382,7 +1394,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ico 1.0.5:";; + short | recursive ) echo "Configuration of ico 1.0.6:";; esac cat <<\_ACEOF @@ -1426,7 +1438,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1489,7 +1501,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ico configure 1.0.5 +ico configure 1.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1813,7 +1825,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ico $as_me 1.0.5, which was +It was created by ico $as_me 1.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2642,7 +2654,7 @@ fi # Define the identity of the package. PACKAGE='ico' - VERSION='1.0.5' + VERSION='1.0.6' cat >>confdefs.h <<_ACEOF @@ -2689,29 +2701,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -10503,8 +10492,8 @@ done # Checks for pkg-config packages pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICO" >&5 -$as_echo_n "checking for ICO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 >= 0.99.1 xproto >= 7.0.22" >&5 +$as_echo_n "checking for x11 >= 0.99.1 xproto >= 7.0.22... " >&6; } if test -n "$ICO_CFLAGS"; then pkg_cv_ICO_CFLAGS="$ICO_CFLAGS" @@ -10544,7 +10533,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -10571,7 +10560,7 @@ Alternatively, you may set the environment variables ICO_CFLAGS and ICO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -10724,10 +10713,6 @@ else am__EXEEXT_FALSE= fi -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -11137,7 +11122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ico $as_me 1.0.5, which was +This file was extended by ico $as_me 1.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11197,13 +11182,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ico config.status 1.0.5 +ico config.status 1.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/app/ico/configure.ac b/app/ico/configure.ac index 00f703773..b14e0e80b 100644 --- a/app/ico/configure.ac +++ b/app/ico/configure.ac @@ -23,14 +23,13 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([ico], [1.0.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [ico]) +AC_INIT([ico], [1.0.6], + [https://gitlab.freedesktop.org/xorg/app/ico/issues], [ico]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([foreign dist-xz]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], diff --git a/app/ico/ico.c b/app/ico/ico.c index 1492e730e..70b75bfcb 100644 --- a/app/ico/ico.c +++ b/app/ico/ico.c @@ -235,7 +235,7 @@ static int dofaces = 0; /* -faces */ static int invert = 0; /* -i */ static const char *ico_geom = NULL; /* -size: size of object in window */ static const char *delta_geom = NULL; /* -delta: amount by which to move object */ -static Polyinfo *poly; /* -obj: the poly to draw */ +static Polyinfo *polyobj; /* -obj: the poly to draw */ static int dsync = 0; /* -dsync */ static int xsync = 0; /* -sync */ static int msleepcount = 10; /* -sleep value in milliseconds*/ @@ -584,7 +584,6 @@ drawPoly(struct closure *closure, Polyinfo *poly, GC gc, int facecolor; int pcount; - double pxvz; XPoint ppts[MAXEDGESPERPOLY]; /* Switch double-buffer and rotate vertices */ @@ -635,9 +634,10 @@ drawPoly(struct closure *closure, Polyinfo *poly, GC gc, XSync(dpy, 0); for (i = NF - 1; i >= 0; --i, pf += pcount) { + double pxvz = 0.0; pcount = *pf++; /* number of edges for this face */ - pxvz = 0.0; + for (j=0; jpixels[0] = bg; closure->plane_masks[0] = fg ^ bg; } else { - t = XAllocColorCells(dpy,closure->cmap,0, - closure->plane_masks,closure->totalplanes, closure->pixels,1); + int t = XAllocColorCells(dpy, closure->cmap, 0, + closure->plane_masks, closure->totalplanes, + closure->pixels, 1); /* allocate color planes */ if (t==0) { icoFatal("can't allocate enough color planes"); @@ -1024,7 +1025,7 @@ do_ico_window(void *ptr) icodeltax2 = icoDeltaX * 2; icodeltay2 = icoDeltaY * 2; - initPoly(closure, poly, icoW, icoH); + initPoly(closure, polyobj, icoW, icoH); while (do_it) { int prevX; @@ -1083,7 +1084,7 @@ do_ico_window(void *ptr) #ifdef DEBUG printf("thread %x message\n", xthread_self()); #endif - if (xev.xclient.data.l[0] == wm_delete_window) + if ((Atom) xev.xclient.data.l[0] == wm_delete_window) do_it = False; else XBell (dpy, 0); @@ -1107,7 +1108,7 @@ do_ico_window(void *ptr) icodeltay2 = icoDeltaY * 2; } - drawPoly(closure, poly, closure->gcontext, + drawPoly(closure, polyobj, closure->gcontext, icoX, icoY, icoW, icoH, prevX, prevY); } XDestroyWindow(dpy, closure->win); @@ -1132,12 +1133,12 @@ static void giveObjHelp(void) { unsigned int i; - Polyinfo *poly; printf("%-16s%-12s #Vert. #Edges #Faces %-16s\n", "Name", "ShortName", "Dual"); for (i=0; ilongname, poly->shortname, poly->numverts, poly->numedges, poly->numfaces, @@ -1149,10 +1150,10 @@ static Polyinfo * findpoly(const char *name) { unsigned int i; - Polyinfo *poly; for (i=0; ilongname)==0 || strcmp(name,poly->shortname)==0) return poly; } @@ -1175,7 +1176,7 @@ int main(int argc, const char **argv) /* Process arguments: */ - poly = findpoly("icosahedron"); /* default */ + polyobj = findpoly("icosahedron"); /* default */ for (argv++, argc--; argc > 0; argv++, argc--) { if (!strcmp (*argv, "-display")) { @@ -1271,7 +1272,7 @@ int main(int argc, const char **argv) } else if (!strcmp (*argv, "-obj")) { if (argc < 2) icoFatal("missing argument for %s", *argv); - poly = findpoly(*++argv); argc--; + polyobj = findpoly(*++argv); argc--; } else if (!strcmp(*argv, "-dsync")) dsync = 1; else if (!strncmp(*argv, "-sync", 5)) diff --git a/app/ico/man/Makefile.in b/app/ico/man/Makefile.in index 7c9c26c0c..15d7131d7 100644 --- a/app/ico/man/Makefile.in +++ b/app/ico/man/Makefile.in @@ -223,6 +223,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/app/ico/man/ico.man b/app/ico/man/ico.man index 70319d5b0..55a770c95 100644 --- a/app/ico/man/ico.man +++ b/app/ico/man/ico.man @@ -94,7 +94,3 @@ Pyramids and tetrahedrons with filled faces do not display correctly. 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. -.SH COPYRIGHT -Copyright 1994 X Consortium -.br -See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.