diff --git a/app/viewres/ChangeLog b/app/viewres/ChangeLog index 1602a347b..ba497b815 100644 --- a/app/viewres/ChangeLog +++ b/app/viewres/ChangeLog @@ -1,3 +1,75 @@ +commit 5661dfdc04572cdbb6ed4e641049657c4ba39252 +Author: Alan Coopersmith +Date: Sun Aug 25 16:11:01 2019 -0700 + + viewres 1.0.6 + + Signed-off-by: Alan Coopersmith + +commit 85f2a20e7535a5f8dcdeb805f3e30f387d45baf3 +Author: Alan Coopersmith +Date: Sat Jun 8 19:20:26 2019 -0700 + + Fix -Wshadow warnings + + viewres.c: In function ‘select_callback’: + viewres.c:620:18: warning: declaration of ‘node’ shadows a previous local [-Wshadow] + XmuWidgetNode *node = selected_list.elements[i]; + ^~~~ + viewres.c:593:20: note: shadowed declaration is here + XmuWidgetNode *node; + ^~~~ + viewres.c:658:18: warning: declaration of ‘node’ shadows a previous local [-Wshadow] + XmuWidgetNode *node = selected_list.elements[i]; + ^~~~ + viewres.c:593:20: note: shadowed declaration is here + XmuWidgetNode *node; + ^~~~ + + Signed-off-by: Alan Coopersmith + +commit 917269949545cf1ab1e0068cc2ba7c1f9a775012 +Author: Alan Coopersmith +Date: Sat Jun 8 19:16:53 2019 -0700 + + Fix -Wsign-compare warnings + + viewres.c: In function ‘set_resource_labels’: + viewres.c:313:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] + for (i = 0; i < node->nresources; i++, res++, wn++) { + ^ + viewres.c:329:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] + for (i = 0; i < node->nconstraints; i++, res++, wn++) { + ^ + + Signed-off-by: Alan Coopersmith + +commit f846695df6b5d9543e12d1c8f04d9d7575df1ac6 +Author: Alan Coopersmith +Date: Sat Jun 8 19:15:34 2019 -0700 + + Pass -D_CONST_X_STRING to make libXt declare String as const char * + + Clears up 32 of 38 gcc -Wdiscarded-qualifiers warnings + + Signed-off-by: Alan Coopersmith + +commit 74bd63d6e6768f96c3e6fc2b692a5b012edbcea3 +Author: Alan Coopersmith +Date: Wed Nov 21 16:58:21 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith + +commit 8ee2177d894c91a4a864b5b182705d72055e0090 +Author: Alan Coopersmith +Date: Fri Nov 16 20:55:55 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith + commit 3b72d922ec82789124d43ef11e601a2f1e620458 Author: Alan Coopersmith Date: Sun Mar 4 19:38:27 2018 -0800 diff --git a/app/viewres/Makefile.am b/app/viewres/Makefile.am index ad435daab..959d138d1 100644 --- a/app/viewres/Makefile.am +++ b/app/viewres/Makefile.am @@ -23,6 +23,7 @@ SUBDIRS = man bin_PROGRAMS = viewres AM_CFLAGS = $(VIEWRES_CFLAGS) $(CWARNFLAGS) +AM_CPPFLAGS = -D_CONST_X_STRING viewres_LDADD = $(VIEWRES_LIBS) viewres_SOURCES = \ @@ -48,3 +49,5 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +EXTRA_DIST = README.md diff --git a/app/viewres/Makefile.in b/app/viewres/Makefile.in index f528e6360..3087726b0 100644 --- a/app/viewres/Makefile.in +++ b/app/viewres/Makefile.in @@ -74,7 +74,7 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = viewres$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \ +DIST_COMMON = $(am__configure_deps) $(dist_appdefault_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(top_srcdir)/configure COPYING \ ChangeLog INSTALL compile config.guess config.sub depcomp \ @@ -340,6 +340,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = man AM_CFLAGS = $(VIEWRES_CFLAGS) $(CWARNFLAGS) +AM_CPPFLAGS = -D_CONST_X_STRING viewres_LDADD = $(VIEWRES_LIBS) viewres_SOURCES = \ viewres.c @@ -352,6 +353,7 @@ dist_appdefault_DATA = \ app-defaults/Viewres-color MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = README.md all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/app/viewres/README b/app/viewres/README deleted file mode 100644 index b90054f65..000000000 --- a/app/viewres/README +++ /dev/null @@ -1,26 +0,0 @@ -viewres displays a tree showing the widget class hierarchy of the -Athena Widget Set (libXaw). - -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/viewres - - http://cgit.freedesktop.org/xorg/app/viewres - -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/viewres/README.md b/app/viewres/README.md new file mode 100644 index 000000000..81ece1998 --- /dev/null +++ b/app/viewres/README.md @@ -0,0 +1,18 @@ +viewres displays a tree showing the widget class hierarchy of the +Athena Widget Set (libXaw). + +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/viewres + +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/viewres/aclocal.m4 b/app/viewres/aclocal.m4 index 8bef9a948..2a518c4b6 100644 --- a/app/viewres/aclocal.m4 +++ b/app/viewres/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. +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl +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. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +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.1]) +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,19 +146,17 @@ 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 @@ -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/viewres/configure b/app/viewres/configure index 762759ce9..392f6b91d 100644 --- a/app/viewres/configure +++ b/app/viewres/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for viewres 1.0.5. +# Generated by GNU Autoconf 2.69 for viewres 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/viewres/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='viewres' PACKAGE_TARNAME='viewres' -PACKAGE_VERSION='1.0.5' -PACKAGE_STRING='viewres 1.0.5' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='1.0.6' +PACKAGE_STRING='viewres 1.0.6' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/viewres/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -1313,7 +1313,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 viewres 1.0.5 to adapt to many kinds of systems. +\`configure' configures viewres 1.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of viewres 1.0.5:";; + short | recursive ) echo "Configuration of viewres 1.0.6:";; esac cat <<\_ACEOF @@ -1436,7 +1436,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 @@ -1499,7 +1499,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -viewres configure 1.0.5 +viewres configure 1.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1756,7 +1756,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 viewres $as_me 1.0.5, which was +It was created by viewres $as_me 1.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2585,7 +2585,7 @@ fi # Define the identity of the package. PACKAGE='viewres' - VERSION='1.0.5' + VERSION='1.0.6' cat >>confdefs.h <<_ACEOF @@ -11074,7 +11074,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 viewres $as_me 1.0.5, which was +This file was extended by viewres $as_me 1.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11134,13 +11134,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="\\ -viewres config.status 1.0.5 +viewres config.status 1.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/app/viewres/configure.ac b/app/viewres/configure.ac index a727c5b1a..6059b85b5 100644 --- a/app/viewres/configure.ac +++ b/app/viewres/configure.ac @@ -23,8 +23,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([viewres], [1.0.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [viewres]) +AC_INIT([viewres], [1.0.6], + [https://gitlab.freedesktop.org/xorg/app/viewres/issues], [viewres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff --git a/app/viewres/viewres.c b/app/viewres/viewres.c index 259af2853..8200f81a5 100644 --- a/app/viewres/viewres.c +++ b/app/viewres/viewres.c @@ -294,7 +294,7 @@ initialize_widgetnode_list (XmuWidgetNode ***listp, int *sizep, int n) static Boolean set_resource_labels (XmuWidgetNode *node) { - int i; + Cardinal i; const char **cur; XtResourceList res; XmuWidgetNode **wn; @@ -617,9 +617,9 @@ select_callback ( add_to_selected_list (node->superclass, TRUE); } else { for (i = 0; i < nselected; i++) { - XmuWidgetNode *node = selected_list.elements[i]; - if (node->superclass) - add_to_selected_list (node->superclass, TRUE); + XmuWidgetNode *nodeI = selected_list.elements[i]; + if (nodeI->superclass) + add_to_selected_list (nodeI->superclass, TRUE); } } break; @@ -655,11 +655,11 @@ select_callback ( } } else { for (i = 0; i < nselected; i++) { - XmuWidgetNode *node = selected_list.elements[i]; + XmuWidgetNode *nodeI = selected_list.elements[i]; - add_to_selected_list (node, TRUE); - for (node = node->children; node; node = node->siblings) { - add_to_selected_list (node, TRUE); + add_to_selected_list (nodeI, TRUE); + for (nodeI = nodeI->children; nodeI; nodeI = nodeI->siblings) { + add_to_selected_list (nodeI, TRUE); } } } @@ -885,7 +885,7 @@ main (int argc, char *argv[]) toplevel = XtAppInitialize (&app_con, "Viewres", Options, XtNumber (Options), - &argc, argv, (char **) fallback_resources, + &argc, argv, (String *) fallback_resources, (ArgList) NULL, ZERO); if (argc != 1) usage ();