Update xmessage to version 1.0.6 · jcs.org/openbsd-xenocara@b5b3250

+63 -1

app/xmessage/ChangeLog

··· 1 + commit 52d1690c3e1291f7d7be6b4cc39925e3fe4381e3 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Tue Jul 12 10:37:50 2022 -0700 4 + 5 + xmessage 1.0.6 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit f8be5016e618dcd650540b4cea5f710fd9a16e00 10 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 11 + Date: Sat Apr 16 16:01:36 2022 -0700 12 + 13 + gitlab CI: stop requiring Signed-off-by in commits 14 + 15 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 16 + 17 + commit a2d2c371a11302d8df204527119c6ec91cc9e898 18 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 19 + Date: Sat Apr 16 15:58:42 2022 -0700 20 + 21 + Stop casting function return values to void 22 + 23 + This was used to make lint stop warning that you weren't checking 24 + the return value. 25 + 26 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 27 + 28 + commit 55cc3615df9045684c70293dcfcbaa26371e46ad 29 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 30 + Date: Sat Apr 16 15:57:02 2022 -0700 31 + 32 + Stop casting arguments to free() 33 + 34 + This was needed for some pre-ANSI systems that declared free() to take 35 + 'char *' instead of 'void *' arguments, but hasn't been needed in decades. 36 + 37 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 38 + 39 + commit cda8cd860d7cbbcab8da5d0bb28b0e55b35c000f 40 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 41 + Date: Tue Dec 7 12:29:45 2021 -0800 42 + 43 + Build xz tarballs instead of bzip2 44 + 45 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 46 + 47 + commit bed195ac430ffa991e9e5c89ad447c6efc1ed2c8 48 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 49 + Date: Tue Dec 7 12:29:42 2021 -0800 50 + 51 + gitlab CI: add a basic build test 52 + 53 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 54 + 55 + commit e315069848aea3aaeb72bd3bc9a5d0bdb1242ed7 56 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 57 + Date: Wed Nov 21 17:15:50 2018 -0800 58 + 59 + Update configure.ac bug URL for gitlab migration 60 + 61 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 62 + 1 63 commit f1e22dc070daa73857ff2fd951424b9d1ef31a54 2 64 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 65 Date: Fri Mar 9 18:00:17 2018 -0800 ··· 523 585 configure cache, you cache it, and the cached value is probably wrong. 524 586 525 587 commit 665ba4b9cf9a7c94782637051eb8e0d735bbaf7c 526 - Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 588 + Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 527 589 Date: Tue Jul 5 22:51:11 2005 +0000 528 590 529 591 Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,

+4 -3

app/xmessage/Makefile.in

··· 210 210 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ 211 211 done; \ 212 212 reldir="$$dir2" 213 - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 213 + DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz 214 214 GZIP_ENV = --best 215 - DIST_TARGETS = dist-bzip2 dist-gzip 215 + DIST_TARGETS = dist-xz dist-gzip 216 216 distuninstallcheck_listfiles = find . -type f -print 217 217 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 218 218 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' ··· 333 333 prefix = @prefix@ 334 334 program_transform_name = @program_transform_name@ 335 335 psdir = @psdir@ 336 + runstatedir = @runstatedir@ 336 337 sbindir = @sbindir@ 337 338 sharedstatedir = @sharedstatedir@ 338 339 srcdir = @srcdir@ ··· 708 709 dist-gzip: distdir 709 710 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 710 711 $(am__post_remove_distdir) 712 + 711 713 dist-bzip2: distdir 712 714 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 713 715 $(am__post_remove_distdir) ··· 715 717 dist-lzip: distdir 716 718 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 717 719 $(am__post_remove_distdir) 718 - 719 720 dist-xz: distdir 720 721 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 721 722 $(am__post_remove_distdir)

+149 -73

app/xmessage/aclocal.m4

··· 19 19 If you have problems, you may need to regenerate the build system entirely. 20 20 To do so, use the procedure documented by the package, typically 'autoreconf'.])]) 21 21 22 - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 - # serial 1 (pkg-config-0.24) 24 - # 25 - # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 - # 27 - # This program is free software; you can redistribute it and/or modify 28 - # it under the terms of the GNU General Public License as published by 29 - # the Free Software Foundation; either version 2 of the License, or 30 - # (at your option) any later version. 31 - # 32 - # This program is distributed in the hope that it will be useful, but 33 - # WITHOUT ANY WARRANTY; without even the implied warranty of 34 - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 35 - # General Public License for more details. 36 - # 37 - # You should have received a copy of the GNU General Public License 38 - # along with this program; if not, write to the Free Software 39 - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 40 - # 41 - # As a special exception to the GNU General Public License, if you 42 - # distribute this file as part of a program that contains a 43 - # configuration script generated by Autoconf, you may include it under 44 - # the same distribution terms that you use for the rest of that program. 22 + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 + # serial 12 (pkg-config-0.29.2) 24 + 25 + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 + dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 27 + dnl 28 + dnl This program is free software; you can redistribute it and/or modify 29 + dnl it under the terms of the GNU General Public License as published by 30 + dnl the Free Software Foundation; either version 2 of the License, or 31 + dnl (at your option) any later version. 32 + dnl 33 + dnl This program is distributed in the hope that it will be useful, but 34 + dnl WITHOUT ANY WARRANTY; without even the implied warranty of 35 + dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 36 + dnl General Public License for more details. 37 + dnl 38 + dnl You should have received a copy of the GNU General Public License 39 + dnl along with this program; if not, write to the Free Software 40 + dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 41 + dnl 02111-1307, USA. 42 + dnl 43 + dnl As a special exception to the GNU General Public License, if you 44 + dnl distribute this file as part of a program that contains a 45 + dnl configuration script generated by Autoconf, you may include it under 46 + dnl the same distribution terms that you use for the rest of that 47 + dnl program. 48 + 49 + dnl PKG_PREREQ(MIN-VERSION) 50 + dnl ----------------------- 51 + dnl Since: 0.29 52 + dnl 53 + dnl Verify that the version of the pkg-config macros are at least 54 + dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's 55 + dnl installed version of pkg-config, this checks the developer's version 56 + dnl of pkg.m4 when generating configure. 57 + dnl 58 + dnl To ensure that this macro is defined, also add: 59 + dnl m4_ifndef([PKG_PREREQ], 60 + dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) 61 + dnl 62 + dnl See the "Since" comment for each macro you use to see what version 63 + dnl of the macros you require. 64 + m4_defun([PKG_PREREQ], 65 + [m4_define([PKG_MACROS_VERSION], [0.29.2]) 66 + m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, 67 + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) 68 + ])dnl PKG_PREREQ 45 69 46 - # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 47 - # ---------------------------------- 70 + dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) 71 + dnl ---------------------------------- 72 + dnl Since: 0.16 73 + dnl 74 + dnl Search for the pkg-config tool and set the PKG_CONFIG variable to 75 + dnl first found in the path. Checks that the version of pkg-config found 76 + dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is 77 + dnl used since that's the first version where most current features of 78 + dnl pkg-config existed. 48 79 AC_DEFUN([PKG_PROG_PKG_CONFIG], 49 80 [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 50 81 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ··· 66 97 PKG_CONFIG="" 67 98 fi 68 99 fi[]dnl 69 - ])# PKG_PROG_PKG_CONFIG 100 + ])dnl PKG_PROG_PKG_CONFIG 70 101 71 - # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 72 - # 73 - # Check to see whether a particular set of modules exists. Similar 74 - # to PKG_CHECK_MODULES(), but does not set variables or print errors. 75 - # 76 - # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 77 - # only at the first occurence in configure.ac, so if the first place 78 - # it's called might be skipped (such as if it is within an "if", you 79 - # have to call PKG_CHECK_EXISTS manually 80 - # -------------------------------------------------------------- 102 + dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 103 + dnl ------------------------------------------------------------------- 104 + dnl Since: 0.18 105 + dnl 106 + dnl Check to see whether a particular set of modules exists. Similar to 107 + dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 108 + dnl 109 + dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 110 + dnl only at the first occurence in configure.ac, so if the first place 111 + dnl it's called might be skipped (such as if it is within an "if", you 112 + dnl have to call PKG_CHECK_EXISTS manually 81 113 AC_DEFUN([PKG_CHECK_EXISTS], 82 114 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 83 115 if test -n "$PKG_CONFIG" && \ ··· 87 119 $3])dnl 88 120 fi]) 89 121 90 - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 91 - # --------------------------------------------- 122 + dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 123 + dnl --------------------------------------------- 124 + dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting 125 + dnl pkg_failed based on the result. 92 126 m4_define([_PKG_CONFIG], 93 127 [if test -n "$$1"; then 94 128 pkg_cv_[]$1="$$1" ··· 100 134 else 101 135 pkg_failed=untried 102 136 fi[]dnl 103 - ])# _PKG_CONFIG 137 + ])dnl _PKG_CONFIG 104 138 105 - # _PKG_SHORT_ERRORS_SUPPORTED 106 - # ----------------------------- 139 + dnl _PKG_SHORT_ERRORS_SUPPORTED 140 + dnl --------------------------- 141 + dnl Internal check to see if pkg-config supports short errors. 107 142 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 108 143 [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 109 144 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 111 146 else 112 147 _pkg_short_errors_supported=no 113 148 fi[]dnl 114 - ])# _PKG_SHORT_ERRORS_SUPPORTED 149 + ])dnl _PKG_SHORT_ERRORS_SUPPORTED 115 150 116 151 117 - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 118 - # [ACTION-IF-NOT-FOUND]) 119 - # 120 - # 121 - # Note that if there is a possibility the first call to 122 - # PKG_CHECK_MODULES might not happen, you should be sure to include an 123 - # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 124 - # 125 - # 126 - # -------------------------------------------------------------- 152 + dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 153 + dnl [ACTION-IF-NOT-FOUND]) 154 + dnl -------------------------------------------------------------- 155 + dnl Since: 0.4.0 156 + dnl 157 + dnl Note that if there is a possibility the first call to 158 + dnl PKG_CHECK_MODULES might not happen, you should be sure to include an 159 + dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 127 160 AC_DEFUN([PKG_CHECK_MODULES], 128 161 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 129 162 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 130 163 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl 131 164 132 165 pkg_failed=no 133 - AC_MSG_CHECKING([for $1]) 166 + AC_MSG_CHECKING([for $2]) 134 167 135 168 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) 136 169 _PKG_CONFIG([$1][_LIBS], [libs], [$2]) ··· 140 173 See the pkg-config man page for more details.]) 141 174 142 175 if test $pkg_failed = yes; then 143 - AC_MSG_RESULT([no]) 176 + AC_MSG_RESULT([no]) 144 177 _PKG_SHORT_ERRORS_SUPPORTED 145 178 if test $_pkg_short_errors_supported = yes; then 146 179 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` 147 - else 180 + else 148 181 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` 149 182 fi 150 183 # Put the nasty error message in config.log where it belongs ··· 161 194 _PKG_TEXT])[]dnl 162 195 ]) 163 196 elif test $pkg_failed = untried; then 164 - AC_MSG_RESULT([no]) 197 + AC_MSG_RESULT([no]) 165 198 m4_default([$4], [AC_MSG_FAILURE( 166 199 [The pkg-config script could not be found or is too old. Make sure it 167 200 is in your PATH or set the PKG_CONFIG environment variable to the full ··· 177 210 AC_MSG_RESULT([yes]) 178 211 $3 179 212 fi[]dnl 180 - ])# PKG_CHECK_MODULES 213 + ])dnl PKG_CHECK_MODULES 214 + 215 + 216 + dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 217 + dnl [ACTION-IF-NOT-FOUND]) 218 + dnl --------------------------------------------------------------------- 219 + dnl Since: 0.29 220 + dnl 221 + dnl Checks for existence of MODULES and gathers its build flags with 222 + dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags 223 + dnl and VARIABLE-PREFIX_LIBS from --libs. 224 + dnl 225 + dnl Note that if there is a possibility the first call to 226 + dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to 227 + dnl include an explicit call to PKG_PROG_PKG_CONFIG in your 228 + dnl configure.ac. 229 + AC_DEFUN([PKG_CHECK_MODULES_STATIC], 230 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 231 + _save_PKG_CONFIG=$PKG_CONFIG 232 + PKG_CONFIG="$PKG_CONFIG --static" 233 + PKG_CHECK_MODULES($@) 234 + PKG_CONFIG=$_save_PKG_CONFIG[]dnl 235 + ])dnl PKG_CHECK_MODULES_STATIC 181 236 182 237 183 - # PKG_INSTALLDIR(DIRECTORY) 184 - # ------------------------- 185 - # Substitutes the variable pkgconfigdir as the location where a module 186 - # should install pkg-config .pc files. By default the directory is 187 - # $libdir/pkgconfig, but the default can be changed by passing 188 - # DIRECTORY. The user can override through the --with-pkgconfigdir 189 - # parameter. 238 + dnl PKG_INSTALLDIR([DIRECTORY]) 239 + dnl ------------------------- 240 + dnl Since: 0.27 241 + dnl 242 + dnl Substitutes the variable pkgconfigdir as the location where a module 243 + dnl should install pkg-config .pc files. By default the directory is 244 + dnl $libdir/pkgconfig, but the default can be changed by passing 245 + dnl DIRECTORY. The user can override through the --with-pkgconfigdir 246 + dnl parameter. 190 247 AC_DEFUN([PKG_INSTALLDIR], 191 248 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 192 249 m4_pushdef([pkg_description], ··· 197 254 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 198 255 m4_popdef([pkg_default]) 199 256 m4_popdef([pkg_description]) 200 - ]) dnl PKG_INSTALLDIR 257 + ])dnl PKG_INSTALLDIR 201 258 202 259 203 - # PKG_NOARCH_INSTALLDIR(DIRECTORY) 204 - # ------------------------- 205 - # Substitutes the variable noarch_pkgconfigdir as the location where a 206 - # module should install arch-independent pkg-config .pc files. By 207 - # default the directory is $datadir/pkgconfig, but the default can be 208 - # changed by passing DIRECTORY. The user can override through the 209 - # --with-noarch-pkgconfigdir parameter. 260 + dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) 261 + dnl -------------------------------- 262 + dnl Since: 0.27 263 + dnl 264 + dnl Substitutes the variable noarch_pkgconfigdir as the location where a 265 + dnl module should install arch-independent pkg-config .pc files. By 266 + dnl default the directory is $datadir/pkgconfig, but the default can be 267 + dnl changed by passing DIRECTORY. The user can override through the 268 + dnl --with-noarch-pkgconfigdir parameter. 210 269 AC_DEFUN([PKG_NOARCH_INSTALLDIR], 211 270 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 212 271 m4_pushdef([pkg_description], ··· 217 276 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 218 277 m4_popdef([pkg_default]) 219 278 m4_popdef([pkg_description]) 220 - ]) dnl PKG_NOARCH_INSTALLDIR 279 + ])dnl PKG_NOARCH_INSTALLDIR 280 + 281 + 282 + dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 283 + dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 284 + dnl ------------------------------------------- 285 + dnl Since: 0.28 286 + dnl 287 + dnl Retrieves the value of the pkg-config variable for the given module. 288 + AC_DEFUN([PKG_CHECK_VAR], 289 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 290 + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 291 + 292 + _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 293 + AS_VAR_COPY([$1], [pkg_cv_][$1]) 294 + 295 + AS_VAR_IF([$1], [""], [$5], [$4])dnl 296 + ])dnl PKG_CHECK_VAR 221 297 222 298 # Copyright (C) 2002-2012 Free Software Foundation, Inc. 223 299 #

+9 -8

app/xmessage/compile

··· 1 1 #! /bin/sh 2 2 # Wrapper for compilers which do not understand '-c -o'. 3 3 4 - scriptversion=2012-10-14.11; # UTC 4 + scriptversion=2018-03-07.03; # UTC 5 5 6 - # Copyright (C) 1999-2014 Free Software Foundation, Inc. 6 + # Copyright (C) 1999-2021 Free Software Foundation, Inc. 7 7 # Written by Tom Tromey <tromey@cygnus.com>. 8 8 # 9 9 # This program is free software; you can redistribute it and/or modify ··· 17 17 # GNU General Public License for more details. 18 18 # 19 19 # You should have received a copy of the GNU General Public License 20 - # along with this program. If not, see <http://www.gnu.org/licenses/>. 20 + # along with this program. If not, see <https://www.gnu.org/licenses/>. 21 21 22 22 # As a special exception to the GNU General Public License, if you 23 23 # distribute this file as part of a program that contains a ··· 53 53 MINGW*) 54 54 file_conv=mingw 55 55 ;; 56 - CYGWIN*) 56 + CYGWIN* | MSYS*) 57 57 file_conv=cygwin 58 58 ;; 59 59 *) ··· 67 67 mingw/*) 68 68 file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` 69 69 ;; 70 - cygwin/*) 70 + cygwin/* | msys/*) 71 71 file=`cygpath -m "$file" || echo "$file"` 72 72 ;; 73 73 wine/*) ··· 255 255 echo "compile $scriptversion" 256 256 exit $? 257 257 ;; 258 - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 258 + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ 259 + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) 259 260 func_cl_wrapper "$@" # Doesn't return... 260 261 ;; 261 262 esac ··· 339 340 # Local Variables: 340 341 # mode: shell-script 341 342 # sh-indentation: 2 342 - # eval: (add-hook 'write-file-hooks 'time-stamp) 343 + # eval: (add-hook 'before-save-hook 'time-stamp) 343 344 # time-stamp-start: "scriptversion=" 344 345 # time-stamp-format: "%:y-%02m-%02d.%02H" 345 - # time-stamp-time-zone: "UTC" 346 + # time-stamp-time-zone: "UTC0" 346 347 # time-stamp-end: "; # UTC" 347 348 # End:

+36 -51

app/xmessage/configure

··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for xmessage 1.0.5. 3 + # Generated by GNU Autoconf 2.69 for xmessage 1.0.6. 4 4 # 5 - # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 5 + # Report bugs to <https://gitlab.freedesktop.org/xorg/app/xmessage/issues>. 6 6 # 7 7 # 8 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ··· 267 267 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 268 268 else 269 269 $as_echo "$0: Please tell bug-autoconf@gnu.org and 270 - $0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 270 + $0: https://gitlab.freedesktop.org/xorg/app/xmessage/issues 271 271 $0: about your system, including any error possibly output 272 272 $0: before this message. Then install a modern shell, or 273 273 $0: manually run the script under such a shell if you do ··· 581 581 # Identity of this package. 582 582 PACKAGE_NAME='xmessage' 583 583 PACKAGE_TARNAME='xmessage' 584 - PACKAGE_VERSION='1.0.5' 585 - PACKAGE_STRING='xmessage 1.0.5' 586 - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 584 + PACKAGE_VERSION='1.0.6' 585 + PACKAGE_STRING='xmessage 1.0.6' 586 + PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xmessage/issues' 587 587 PACKAGE_URL='' 588 588 589 589 ac_unique_file="Makefile.am" ··· 732 732 docdir 733 733 oldincludedir 734 734 includedir 735 + runstatedir 735 736 localstatedir 736 737 sharedstatedir 737 738 sysconfdir ··· 815 816 sysconfdir='${prefix}/etc' 816 817 sharedstatedir='${prefix}/com' 817 818 localstatedir='${prefix}/var' 819 + runstatedir='${localstatedir}/run' 818 820 includedir='${prefix}/include' 819 821 oldincludedir='/usr/include' 820 822 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ··· 1067 1069 | -silent | --silent | --silen | --sile | --sil) 1068 1070 silent=yes ;; 1069 1071 1072 + -runstatedir | --runstatedir | --runstatedi | --runstated \ 1073 + | --runstate | --runstat | --runsta | --runst | --runs \ 1074 + | --run | --ru | --r) 1075 + ac_prev=runstatedir ;; 1076 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1077 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1078 + | --run=* | --ru=* | --r=*) 1079 + runstatedir=$ac_optarg ;; 1080 + 1070 1081 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1071 1082 ac_prev=sbindir ;; 1072 1083 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ··· 1204 1215 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1205 1216 datadir sysconfdir sharedstatedir localstatedir includedir \ 1206 1217 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1207 - libdir localedir mandir 1218 + libdir localedir mandir runstatedir 1208 1219 do 1209 1220 eval ac_val=\$$ac_var 1210 1221 # Remove trailing slashes. ··· 1317 1328 # Omit some internal or obsolete options to make the list less imposing. 1318 1329 # This message is too long to be a string in the A/UX 3.1 sh. 1319 1330 cat <<_ACEOF 1320 - \`configure' configures xmessage 1.0.5 to adapt to many kinds of systems. 1331 + \`configure' configures xmessage 1.0.6 to adapt to many kinds of systems. 1321 1332 1322 1333 Usage: $0 [OPTION]... [VAR=VALUE]... 1323 1334 ··· 1357 1368 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1358 1369 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1359 1370 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1371 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1360 1372 --libdir=DIR object code libraries [EPREFIX/lib] 1361 1373 --includedir=DIR C header files [PREFIX/include] 1362 1374 --oldincludedir=DIR C header files for non-gcc [/usr/include] ··· 1387 1399 1388 1400 if test -n "$ac_init_help"; then 1389 1401 case $ac_init_help in 1390 - short | recursive ) echo "Configuration of xmessage 1.0.5:";; 1402 + short | recursive ) echo "Configuration of xmessage 1.0.6:";; 1391 1403 esac 1392 1404 cat <<\_ACEOF 1393 1405 ··· 1444 1456 Use these variables to override the choices made by `configure' or to help 1445 1457 it to find libraries and programs with nonstandard names/locations. 1446 1458 1447 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 1459 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/xmessage/issues>. 1448 1460 _ACEOF 1449 1461 ac_status=$? 1450 1462 fi ··· 1507 1519 test -n "$ac_init_help" && exit $ac_status 1508 1520 if $ac_init_version; then 1509 1521 cat <<\_ACEOF 1510 - xmessage configure 1.0.5 1522 + xmessage configure 1.0.6 1511 1523 generated by GNU Autoconf 2.69 1512 1524 1513 1525 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1764 1776 This file contains any messages produced by compilers while 1765 1777 running configure, to aid debugging if configure makes a mistake. 1766 1778 1767 - It was created by xmessage $as_me 1.0.5, which was 1779 + It was created by xmessage $as_me 1.0.6, which was 1768 1780 generated by GNU Autoconf 2.69. Invocation command line was 1769 1781 1770 1782 $ $0 $@ ··· 2593 2605 2594 2606 # Define the identity of the package. 2595 2607 PACKAGE='xmessage' 2596 - VERSION='1.0.5' 2608 + VERSION='1.0.6' 2597 2609 2598 2610 2599 2611 cat >>confdefs.h <<_ACEOF ··· 2637 2649 2638 2650 2639 2651 2640 - 2641 - 2642 - 2643 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 2644 - $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } 2645 - # Check whether --enable-maintainer-mode was given. 2646 - if test "${enable_maintainer_mode+set}" = set; then : 2647 - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval 2648 - else 2649 - USE_MAINTAINER_MODE=no 2650 - fi 2651 - 2652 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 2653 - $as_echo "$USE_MAINTAINER_MODE" >&6; } 2654 - if test $USE_MAINTAINER_MODE = yes; then 2655 - MAINTAINER_MODE_TRUE= 2656 - MAINTAINER_MODE_FALSE='#' 2657 - else 2658 - MAINTAINER_MODE_TRUE='#' 2659 - MAINTAINER_MODE_FALSE= 2660 - fi 2661 - 2662 - MAINT=$MAINTAINER_MODE_TRUE 2663 2652 2664 2653 2665 2654 ··· 10441 10430 # Checks for pkg-config packages 10442 10431 10443 10432 pkg_failed=no 10444 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMESSAGE" >&5 10445 - $as_echo_n "checking for XMESSAGE... " >&6; } 10433 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw7" >&5 10434 + $as_echo_n "checking for xaw7... " >&6; } 10446 10435 10447 10436 if test -n "$XMESSAGE_CFLAGS"; then 10448 10437 pkg_cv_XMESSAGE_CFLAGS="$XMESSAGE_CFLAGS" ··· 10482 10471 10483 10472 10484 10473 if test $pkg_failed = yes; then 10485 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10474 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10486 10475 $as_echo "no" >&6; } 10487 10476 10488 10477 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10509 10498 and XMESSAGE_LIBS to avoid the need to call pkg-config. 10510 10499 See the pkg-config man page for more details." "$LINENO" 5 10511 10500 elif test $pkg_failed = untried; then 10512 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10501 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10513 10502 $as_echo "no" >&6; } 10514 10503 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10515 10504 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 10533 10522 10534 10523 10535 10524 pkg_failed=no 10536 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPDEFS" >&5 10537 - $as_echo_n "checking for APPDEFS... " >&6; } 10525 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xt" >&5 10526 + $as_echo_n "checking for xt... " >&6; } 10538 10527 10539 10528 if test -n "$APPDEFS_CFLAGS"; then 10540 10529 pkg_cv_APPDEFS_CFLAGS="$APPDEFS_CFLAGS" ··· 10574 10563 10575 10564 10576 10565 if test $pkg_failed = yes; then 10577 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10566 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10578 10567 $as_echo "no" >&6; } 10579 10568 10580 10569 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10601 10590 and APPDEFS_LIBS to avoid the need to call pkg-config. 10602 10591 See the pkg-config man page for more details." "$LINENO" 5 10603 10592 elif test $pkg_failed = untried; then 10604 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10593 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10605 10594 $as_echo "no" >&6; } 10606 10595 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10607 10596 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 10761 10750 am__EXEEXT_FALSE= 10762 10751 fi 10763 10752 10764 - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then 10765 - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. 10766 - Usually this means the macro was only invoked conditionally." "$LINENO" 5 10767 - fi 10768 10753 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then 10769 10754 as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. 10770 10755 Usually this means the macro was only invoked conditionally." "$LINENO" 5 ··· 11174 11159 # report actual input values of CONFIG_FILES etc. instead of their 11175 11160 # values after options handling. 11176 11161 ac_log=" 11177 - This file was extended by xmessage $as_me 1.0.5, which was 11162 + This file was extended by xmessage $as_me 1.0.6, which was 11178 11163 generated by GNU Autoconf 2.69. Invocation command line was 11179 11164 11180 11165 CONFIG_FILES = $CONFIG_FILES ··· 11234 11219 Configuration commands: 11235 11220 $config_commands 11236 11221 11237 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." 11222 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/xmessage/issues>." 11238 11223 11239 11224 _ACEOF 11240 11225 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 11241 11226 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11242 11227 ac_cs_version="\\ 11243 - xmessage config.status 1.0.5 11228 + xmessage config.status 1.0.6 11244 11229 configured by $0, generated by GNU Autoconf 2.69, 11245 11230 with options \\"\$ac_cs_config\\" 11246 11231

+3 -4

app/xmessage/configure.ac

··· 23 23 24 24 # Initialize Autoconf 25 25 AC_PREREQ([2.60]) 26 - AC_INIT(xmessage, [1.0.5], 27 - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xmessage) 26 + AC_INIT(xmessage, [1.0.6], 27 + [https://gitlab.freedesktop.org/xorg/app/xmessage/issues], xmessage) 28 28 AC_CONFIG_SRCDIR([Makefile.am]) 29 29 AC_CONFIG_HEADERS([config.h]) 30 30 31 31 # Initialize Automake 32 - AM_INIT_AUTOMAKE([foreign dist-bzip2]) 33 - AM_MAINTAINER_MODE 32 + AM_INIT_AUTOMAKE([foreign dist-xz]) 34 33 35 34 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS 36 35 m4_ifndef([XORG_MACROS_VERSION],

+5 -5

app/xmessage/makeform.c

··· 115 115 116 116 cp = malloc (len + 1); 117 117 if (!cp) { 118 - (void) free ((char *) br); 118 + free (br); 119 119 return -1; 120 120 } 121 121 copy = cp; ··· 164 164 fprintf (stderr, 165 165 "%s: internal error, found extra pairs (should be %d)\n", 166 166 ProgramName, shouldfind); 167 - (void) free ((char *) br); 168 - (void) free (copy); 167 + free (br); 168 + free (copy); 169 169 return -1; 170 170 } 171 171 ··· 183 183 if (npairs != shouldfind) { 184 184 fprintf (stderr, "%s: internal error found %d instead of %d pairs\n", 185 185 ProgramName, npairs, shouldfind); 186 - (void) free ((char *) br); 187 - (void) free (copy); 186 + free (br); 187 + free (copy); 188 188 return -1; 189 189 } 190 190

+1

app/xmessage/man/Makefile.in

··· 225 225 prefix = @prefix@ 226 226 program_transform_name = @program_transform_name@ 227 227 psdir = @psdir@ 228 + runstatedir = @runstatedir@ 228 229 sbindir = @sbindir@ 229 230 sharedstatedir = @sharedstatedir@ 230 231 srcdir = @srcdir@

+4 -4

app/xmessage/readfile.c

··· 63 63 fp = fopen (filename, "r"); 64 64 if (!fp) { 65 65 perror(filename); 66 - (void) free (cp); 66 + free (cp); 67 67 return NULL; 68 68 } 69 69 70 70 count = fread (cp, 1, statbuf.st_size, fp); 71 71 if (count == 0 && statbuf.st_size != 0) { 72 72 perror(filename); 73 - (void) free (cp); 74 - (void) fclose (fp); 73 + free (cp); 74 + fclose (fp); 75 75 return NULL; 76 76 } 77 77 78 78 cp[count] = '\0'; /* since we allocated one extra */ 79 79 *len_return = count; 80 - (void) fclose (fp); 80 + fclose (fp); 81 81 return cp; 82 82 } 83 83

Configure Feed

Configure Feed