Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xcalc for openSUSE:Factory checked in at 2023-05-05 15:59:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcalc (Old) and /work/SRC/openSUSE:Factory/.xcalc.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcalc" Fri May 5 15:59:09 2023 rev:12 rq:1085007 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xcalc/xcalc.changes 2022-08-20 20:29:25.073478282 +0200 +++ /work/SRC/openSUSE:Factory/.xcalc.new.1533/xcalc.changes 2023-05-05 15:59:25.976823457 +0200 @@ -1,0 +2,12 @@ +Fri May 5 09:20:38 UTC 2023 - Stefan Dirsch <[email protected]> + +- Update to version 1.1.2 + * gitlab CI: stop requiring Signed-off-by in commits + * Add -version option + * Fix -version handling to not require opening a display first + * Stop casting function returns to void + * Add -help option + * Accept number keys on main keyboard when NumLock is on + * Key color highlighting still incorrect + +------------------------------------------------------------------- Old: ---- xcalc-1.1.1.tar.xz xcalc-1.1.1.tar.xz.sig New: ---- xcalc-1.1.2.tar.xz xcalc-1.1.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcalc.spec ++++++ --- /var/tmp/diff_new_pack.HXeqY4/_old 2023-05-05 15:59:26.436826093 +0200 +++ /var/tmp/diff_new_pack.HXeqY4/_new 2023-05-05 15:59:26.444826139 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcalc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xcalc -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Scientific calculator for X License: MIT ++++++ xcalc-1.1.1.tar.xz -> xcalc-1.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/ChangeLog new/xcalc-1.1.2/ChangeLog --- old/xcalc-1.1.1/ChangeLog 2022-04-03 19:39:18.000000000 +0200 +++ new/xcalc-1.1.2/ChangeLog 2023-05-05 02:00:27.000000000 +0200 @@ -1,3 +1,79 @@ +commit 62bfb33c545c6afd0cd5ee050168ce1fd461a956 +Author: Alan Coopersmith <[email protected]> +Date: Thu May 4 16:54:24 2023 -0700 + + xcalc 1.1.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit b81cfc8c61991a8f997340f5c67704d695c1fc21 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 18 13:45:45 2023 -0800 + + Accept number keys on main keyboard when NumLock is on + + Adds translations with NumLock modifier active, since removing "None" + from the existing translations would make shifted keys enter numbers + instead of doing the operations corresponding to the shifted character. + + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=173314 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d8e95b8b949970dbeeeeba73b1bc71d7f662e5cc +Author: Alan Coopersmith <[email protected]> +Date: Sun Feb 5 11:13:41 2023 -0800 + + Add -help option + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit fc6543c0f9292880180531d656e80c903e8e7dfd +Author: Alan Coopersmith <[email protected]> +Date: Sun Feb 5 10:22:09 2023 -0800 + + Stop casting function returns to void + + This was used with old versions of lint to stop warnings about + unused return values. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 28429cd68dfdc9850d3ebc7f712dc752a1c9244c +Author: Alan Coopersmith <[email protected]> +Date: Sun Feb 5 10:17:01 2023 -0800 + + Fix -version handling to not require opening a display first + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d624c05dc44dcb69ae48d0c0665e326fcdc972ba +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 28 11:25:46 2023 -0800 + + Add -version option + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 846249c8bb9f113573c7c6504ea45ae673f4652b +Author: Michael Bäuerle <[email protected]> +Date: Wed Jan 25 16:00:51 2023 +0100 + + Key color highlighting still incorrect + + Update red keys on right and make the hexadecimal digit keys white too + + Fixes: 19eb8ce ("TI mode: correct key color highlighting") + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 478c9725430c0087e08547fad5f93072f459da94 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 13 15:46:06 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <[email protected]> + commit dfbeedae7eefa1605ed2f912beb0de31810ec63f Author: Alan Coopersmith <[email protected]> Date: Sun Apr 3 10:33:30 2022 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/aclocal.m4 new/xcalc-1.1.2/aclocal.m4 --- old/xcalc-1.1.1/aclocal.m4 2022-04-03 19:39:11.000000000 +0200 +++ new/xcalc-1.1.2/aclocal.m4 2023-05-05 02:00:19.000000000 +0200 @@ -1426,7 +1426,7 @@ dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1463,7 +1463,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.3]) +m4_define([vers_have], [1.20.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1793,7 +1793,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-xmlto option, it allows maximum flexibilty in making decisions +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -2007,7 +2007,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -2077,7 +2077,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-doxygen option, it allows maximum flexibilty in making decisions +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -2161,7 +2161,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-groff option, it allows maximum flexibilty in making decisions +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -2269,7 +2269,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-fop option, it allows maximum flexibilty in making decisions +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -2363,7 +2363,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -2418,7 +2418,7 @@ # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2451,7 +2451,7 @@ # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2484,7 +2484,7 @@ # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2959,7 +2959,11 @@ AC_DEFUN([XORG_COMPILER_BRAND], [ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ], [C++], [ AC_REQUIRE([AC_PROG_CXX]) @@ -2975,7 +2979,7 @@ # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -2991,7 +2995,11 @@ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) define([PREFIX], [C]) define([CACHE_PREFIX], [cc]) define([COMPILER], [$CC]) @@ -3132,7 +3140,7 @@ # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -3241,23 +3249,35 @@ AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION +# XORG_DEFAULT_NOCODE_OPTIONS +# --------------------------- +# Minimum version: 1.20.0 +# +# Defines default options for X.Org modules which don't compile code, +# such as fonts, bitmaps, cursors, and docs. +# +AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_RELEASE_VERSION +XORG_CHANGELOG +XORG_INSTALL +XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_NOCODE_OPTIONS + # XORG_DEFAULT_OPTIONS # -------------------- # Minimum version: 1.3.0 # -# Defines default options for X.Org modules. +# Defines default options for X.Org modules which compile code. # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) XORG_COMPILER_FLAGS XORG_CWARNFLAGS XORG_STRICT_OPTION -XORG_RELEASE_VERSION -XORG_CHANGELOG -XORG_INSTALL -XORG_MANPAGE_SECTIONS -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +XORG_DEFAULT_NOCODE_OPTIONS ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/app-defaults/XCalc new/xcalc-1.1.2/app-defaults/XCalc --- old/xcalc-1.1.1/app-defaults/XCalc 2022-04-03 19:39:09.000000000 +0200 +++ new/xcalc-1.1.2/app-defaults/XCalc 2023-05-05 02:00:17.000000000 +0200 @@ -68,6 +68,16 @@ None<Key>7:digit(7)\n\ None<Key>8:digit(8)\n\ None<Key>9:digit(9)\n\ + Mod2<Key>0:digit(0)\n\ + Mod2<Key>1:digit(1)\n\ + Mod2<Key>2:digit(2)\n\ + Mod2<Key>3:digit(3)\n\ + Mod2<Key>4:digit(4)\n\ + Mod2<Key>5:digit(5)\n\ + Mod2<Key>6:digit(6)\n\ + Mod2<Key>7:digit(7)\n\ + Mod2<Key>8:digit(8)\n\ + Mod2<Key>9:digit(9)\n\ Shift<Key>a:digit(A)\n\ Shift<Key>b:digit(B)\n\ Shift<Key>c:digit(C)\n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/app-defaults/XCalc-color new/xcalc-1.1.2/app-defaults/XCalc-color --- old/xcalc-1.1.1/app-defaults/XCalc-color 2022-04-03 19:39:09.000000000 +0200 +++ new/xcalc-1.1.2/app-defaults/XCalc-color 2023-05-05 02:00:17.000000000 +0200 @@ -28,21 +28,6 @@ XCalc*ti.Command.background: rgb:c/d/e XCalc*ti.Command.foreground: gray5 -XCalc*ti.button20.foreground: gray5 -XCalc*ti.button20.background: rgb:e/d/c -XCalc*ti.button20.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 -XCalc*ti.button20.borderColor: rgb:9/8/7 - -XCalc*ti.button25.foreground: gray5 -XCalc*ti.button25.background: rgb:e/d/c -XCalc*ti.button25.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 -XCalc*ti.button25.borderColor: rgb:9/8/7 - -XCalc*ti.button30.foreground: gray5 -XCalc*ti.button30.background: rgb:e/d/c -XCalc*ti.button30.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 -XCalc*ti.button30.borderColor: rgb:9/8/7 - XCalc*ti.button35.foreground: gray5 XCalc*ti.button35.background: rgb:e/d/c XCalc*ti.button35.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 @@ -53,8 +38,49 @@ XCalc*ti.button40.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 XCalc*ti.button40.borderColor: rgb:9/8/7 +XCalc*ti.button45.foreground: gray5 +XCalc*ti.button45.background: rgb:e/d/c +XCalc*ti.button45.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button45.borderColor: rgb:9/8/7 + +XCalc*ti.button50.foreground: gray5 +XCalc*ti.button50.background: rgb:e/d/c +XCalc*ti.button50.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button50.borderColor: rgb:9/8/7 + +XCalc*ti.button55.foreground: gray5 +XCalc*ti.button55.background: rgb:e/d/c +XCalc*ti.button55.displayList: foreground rgb:a/9/8;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button55.borderColor: rgb:9/8/7 + ! "Number" keys. +! "D" +XCalc*ti.button27.background: gray95 +XCalc*ti.button27.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button27.borderColor: gray65 +! "E" +XCalc*ti.button28.background: gray95 +XCalc*ti.button28.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button28.borderColor: gray65 +! "F" +XCalc*ti.button29.background: gray95 +XCalc*ti.button29.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button29.borderColor: gray65 + +! "A" +XCalc*ti.button32.background: gray95 +XCalc*ti.button32.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button32.borderColor: gray65 +! "B" +XCalc*ti.button33.background: gray95 +XCalc*ti.button33.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button33.borderColor: gray65 +! "C" +XCalc*ti.button34.background: gray95 +XCalc*ti.button34.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 +XCalc*ti.button34.borderColor: gray65 + ! "7" XCalc*ti.button37.background: gray95 XCalc*ti.button37.displayList: foreground gray75;segments 8,-4,-9,-4,-4,-9,-4,8;draw-arc -14,-14,-4,-4,270,90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/config.guess new/xcalc-1.1.2/config.guess --- old/xcalc-1.1.1/config.guess 2022-04-03 19:39:13.000000000 +0200 +++ new/xcalc-1.1.2/config.guess 2023-05-05 02:00:21.000000000 +0200 @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-06-03' +timestamp='2023-01-01' # This file 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 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -60,7 +60,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -437,7 +437,7 @@ # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 @@ -929,6 +929,9 @@ i*:PW*:*) GUESS=$UNAME_MACHINE-pc-pw32 ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) case $UNAME_MACHINE in x86) @@ -963,6 +966,12 @@ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1033,7 +1042,7 @@ k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1148,16 +1157,27 @@ ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1364,8 +1384,11 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE @@ -1522,6 +1545,9 @@ i*86:rdos:*:*) GUESS=$UNAME_MACHINE-pc-rdos ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; *:AROS:*:*) GUESS=$UNAME_MACHINE-unknown-aros ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/config.sub new/xcalc-1.1.2/config.sub --- old/xcalc-1.1.1/config.sub 2022-04-03 19:39:13.000000000 +0200 +++ new/xcalc-1.1.2/config.sub 2023-05-05 02:00:21.000000000 +0200 @@ -1,14 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-08-14' +timestamp='2023-01-21' # This file 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 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -76,7 +76,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +145,7 @@ nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -1020,6 +1020,11 @@ ;; # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} + ;; dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull @@ -1070,7 +1075,7 @@ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1121,7 +1126,7 @@ xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; - arm64-*) + arm64-* | aarch64le-*) cpu=aarch64 ;; @@ -1202,7 +1207,7 @@ | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1304,7 +1309,7 @@ if test x$basic_os != x then -# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just # set os. case $basic_os in gnu/linux*) @@ -1336,6 +1341,10 @@ kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1748,7 +1757,8 @@ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1756,6 +1766,9 @@ ;; none) ;; + kernel* ) + # Restricted further below + ;; *) echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 exit 1 @@ -1766,16 +1779,26 @@ # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; + -kernel* ) + echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 + exit 1 + ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/configure new/xcalc-1.1.2/configure --- old/xcalc-1.1.1/configure 2022-04-03 19:39:12.000000000 +0200 +++ new/xcalc-1.1.2/configure 2023-05-05 02:00:20.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xcalc 1.1.1. +# Generated by GNU Autoconf 2.71 for xcalc 1.1.2. # -# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcalc/issues>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcalc/-/issues>. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -268,7 +268,7 @@ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else printf "%s\n" "$0: Please tell [email protected] and -$0: https://gitlab.freedesktop.org/xorg/app/xcalc/issues +$0: https://gitlab.freedesktop.org/xorg/app/xcalc/-/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 @@ -612,9 +612,9 @@ # Identity of this package. PACKAGE_NAME='xcalc' PACKAGE_TARNAME='xcalc' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='xcalc 1.1.1' -PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xcalc/issues' +PACKAGE_VERSION='1.1.2' +PACKAGE_STRING='xcalc 1.1.2' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xcalc/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -1348,7 +1348,7 @@ # 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 xcalc 1.1.1 to adapt to many kinds of systems. +\`configure' configures xcalc 1.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1419,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xcalc 1.1.1:";; + short | recursive ) echo "Configuration of xcalc 1.1.2:";; esac cat <<\_ACEOF @@ -1471,7 +1471,7 @@ 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 <https://gitlab.freedesktop.org/xorg/app/xcalc/issues>. +Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcalc/-/issues>. _ACEOF ac_status=$? fi @@ -1535,7 +1535,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xcalc configure 1.1.1 +xcalc configure 1.1.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1805,7 +1805,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xcalc $as_me 1.1.1, which was +It was created by xcalc $as_me 1.1.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3079,7 +3079,7 @@ # Define the identity of the package. PACKAGE='xcalc' - VERSION='1.1.1' + VERSION='1.1.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4445,7 +4445,6 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } if test ${ac_cv_c_undeclared_builtin_options+y} @@ -7110,7 +7109,7 @@ # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -10965,6 +10964,8 @@ + + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -11167,6 +11168,7 @@ + ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" if test "x$ac_cv_func_strlcpy" = xyes then : @@ -11897,7 +11899,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xcalc $as_me 1.1.1, which was +This file was extended by xcalc $as_me 1.1.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11957,7 +11959,7 @@ Configuration commands: $config_commands -Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcalc/issues>." +Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcalc/-/issues>." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` @@ -11965,7 +11967,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xcalc config.status 1.1.1 +xcalc config.status 1.1.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/configure.ac new/xcalc-1.1.2/configure.ac --- old/xcalc-1.1.1/configure.ac 2022-04-03 19:39:09.000000000 +0200 +++ new/xcalc-1.1.2/configure.ac 2023-05-05 02:00:17.000000000 +0200 @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xcalc], [1.1.1], - [https://gitlab.freedesktop.org/xorg/app/xcalc/issues], [xcalc]) +AC_INIT([xcalc], [1.1.2], + [https://gitlab.freedesktop.org/xorg/app/xcalc/-/issues], [xcalc]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/man/xcalc.man new/xcalc-1.1.2/man/xcalc.man --- old/xcalc-1.1.1/man/xcalc.man 2022-04-03 19:39:09.000000000 +0200 +++ new/xcalc-1.1.2/man/xcalc.man 2023-05-05 02:00:17.000000000 +0200 @@ -43,8 +43,11 @@ .SH NAME xcalc \- scientific calculator for X .SH SYNOPSIS -.B xcalc -[-stipple] [-rpn] [-\fItoolkitoption...\fP] +.nf +\fBxcalc\fP [\fB-stipple\fP] [\fB-rpn\fP] [-\fItoolkitoption...\fP] +\fBxcalc -version\fP +\fBxcalc -help\fP +.fi .SH DESCRIPTION .I xcalc is a scientific calculator desktop accessory that can emulate a TI-30 @@ -52,7 +55,7 @@ .SH OPTIONS .PP \fIxcalc\fP accepts all of the standard toolkit command line options along -with two additional options: +with these additional options: .PP .TP 8 .B \-stipple @@ -65,6 +68,12 @@ This option indicates that Reverse Polish Notation should be used. In this mode the calculator will look and behave like an HP-10C. Without this flag, it will emulate a TI-30. +.TP 8 +.B \-help +This option indicates that \fIxcalc\fP should print its usage message and exit. +.TP 8 +.B \-version +This option indicates that \fIxcalc\fP should print its version and exit. .SH OPERATION .PP .I Pointer Usage: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/math.c new/xcalc-1.1.2/math.c --- old/xcalc-1.1.1/math.c 2022-04-03 19:39:09.000000000 +0200 +++ new/xcalc-1.1.2/math.c 2023-05-05 02:00:17.000000000 +0200 @@ -102,15 +102,15 @@ switch (numbase) { case 8: - (void)sscanf(dispstr, "%lo", &n); + sscanf(dispstr, "%lo", &n); *dp = (double)n; break; case 16: - (void)sscanf(dispstr, "%lX", &n); + sscanf(dispstr, "%lX", &n); *dp = (double)n; break; default: - (void)sscanf(dispstr, "%lf", dp); + sscanf(dispstr, "%lf", dp); } errno = olderrno; @@ -490,7 +490,7 @@ if (!entered) { /* something like "5+*" */ if (!isopempty()) - (void) PopOp(); /* replace the prev op */ + PopOp(); /* replace the prev op */ PushOp(keynum); /* with the new one */ return; } @@ -734,7 +734,7 @@ dnum=acc; PushNum(dnum); } - (void) PopNum(); + PopNum(); flagPAREN--; entered=2; format_double(dnum); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xcalc-1.1.1/xcalc.c new/xcalc-1.1.2/xcalc.c --- old/xcalc-1.1.1/xcalc.c 2022-04-03 19:39:09.000000000 +0200 +++ new/xcalc-1.1.2/xcalc.c 2023-05-05 02:00:17.000000000 +0200 @@ -117,6 +117,22 @@ XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); + /* Handle args that don't require opening a display */ + for (int n = 1; n < argc; n++) { + const char *argn = argv[n]; + /* accept single or double dash for -help & -version */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + Syntax(1, argv); + } + if (strcmp(argn, "-version") == 0) { + puts(PACKAGE_STRING); + exit(0); + } + } + toplevel = XtAppInitialize(&xtcontext, "XCalc", Options, XtNumber(Options), &argc, argv, NULL, NULL, 0); if (argc != 1) Syntax(argc, argv); @@ -138,7 +154,7 @@ dpy = XtDisplay(toplevel); wm_delete_window = XInternAtom(dpy, "WM_DELETE_WINDOW", False); - (void) XSetWMProtocols(dpy, XtWindow(toplevel), &wm_delete_window, 1); + XSetWMProtocols(dpy, XtWindow(toplevel), &wm_delete_window, 1); XDefineCursor(dpy, XtWindow(toplevel), appResources.cursor); if (appResources.stipple || (CellsOfScreen(XtScreen(toplevel)) <= 2)) @@ -312,16 +328,21 @@ */ static void Syntax(int argc, char **argv) { - (void) fprintf(stderr, "%s: unknown options:", argv[0]); - for (int i = 1; i <argc; i++) - (void) fprintf(stderr, " %s", argv[i]); - (void) fprintf(stderr, "\n\n"); - (void) fprintf(stderr, "Usage: %s", argv[0]); + if (argc > 1) { + fprintf(stderr, "%s: unknown options:", argv[0]); + for (int i = 1; i <argc; i++) + fprintf(stderr, " %s", argv[i]); + fprintf(stderr, "\n\n"); + } + fprintf(stderr, "Usage: %s", argv[0]); for (Cardinal i = 0; i < XtNumber(Options); i++) - (void) fprintf(stderr, " [%s]", Options[i].option); - (void) fprintf(stderr, "\n"); - XtDestroyApplicationContext(xtcontext); - exit(1); + fprintf(stderr, " [%s]", Options[i].option); + fprintf(stderr, "\n"); + fprintf(stderr, " %s -help\n", argv[0]); + fprintf(stderr, " %s -version\n", argv[0]); + if (xtcontext != NULL) + XtDestroyApplicationContext(xtcontext); + exit((argc > 1) ? 1 : 0); } /*
