Hello community, here is the log from the commit of package fox16 for openSUSE:Factory checked in at 2020-08-17 12:02:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fox16 (Old) and /work/SRC/openSUSE:Factory/.fox16.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fox16" Mon Aug 17 12:02:37 2020 rev:39 rq:826895 version:1.6.57 Changes: -------- --- /work/SRC/openSUSE:Factory/fox16/fox16.changes 2017-05-18 20:51:50.949378929 +0200 +++ /work/SRC/openSUSE:Factory/.fox16.new.3399/fox16.changes 2020-08-17 12:03:19.242625395 +0200 @@ -1,0 +2,16 @@ +Sun May 5 15:48:14 UTC 2019 - l...@linux-schulserver.de - 1.6.57 + +- package license files in library package +- ran spec-cleaner + +------------------------------------------------------------------- +Fri Oct 5 12:19:52 UTC 2018 - l...@linux-schulserver.de + +- Update to 1.6.57: + + Libtool flags added on behalf of FXRuby builds and missing + UNICODE flag added for CYGWIN32 build. + + Problem fixed in FXString vformat(). + + Fix FXMemoryStream position() API: error code was set moving + stream position to end of buffer. + +------------------------------------------------------------------- Old: ---- fox-1.6.54.tar.gz New: ---- fox-1.6.57.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.CxDA6A/_old 2020-08-17 12:03:20.242625952 +0200 +++ /var/tmp/diff_new_pack.CxDA6A/_new 2020-08-17 12:03:20.242625952 +0200 @@ -1,7 +1,7 @@ # # spec file for package fox16 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Name: fox16 %define lname libFOX-1_6-0 -Version: 1.6.54 + +Name: fox16 +Version: 1.6.57 Release: 0 Summary: Shared Libraries for the FOX Toolkit -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Languages/C and C++ -Url: http://www.fox-toolkit.org/ - -Source0: http://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz +URL: http://www.fox-toolkit.org/ +Source0: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz Source1: calculator.png Source2: pathfinder.png Source3: adie.png @@ -45,30 +45,18 @@ BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: pkgconfig -%if 0%{?suse_version} > 1220 -BuildRequires: pkgconfig(glu) -%endif BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(glu) # # SUSE requires # %if 0%{?suse_version} BuildRequires: cups-devel BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -%if 0%{?suse_version} >= 1020 BuildRequires: xorg-x11-Mesa-devel +BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXfixes-devel -%else -BuildRequires: Mesa-devel -BuildRequires: XFree86-Mesa -BuildRequires: XFree86-Mesa-devel -BuildRequires: XFree86-devel -BuildRequires: XFree86-libs -BuildRequires: xorg-x11-libs -%endif %endif # # Mandriva Requires @@ -92,6 +80,7 @@ BuildRequires: libXi-devel BuildRequires: xorg-x11-devel %endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FOX is a C++-based library for graphical user interface development. @@ -102,18 +91,22 @@ graphics. Subclassing of basic FOX widgets allows for easy extension beyond the built-in widgets by application writers. -%package -n %lname +%package -n %{lname} Summary: Shared libraries for the FOX toolkit 1.6 Group: System/Libraries -Provides: fox = %version +Provides: fox = %{version}-%{release} # Added O/P in 13.2 -Provides: libfox1_6 = %version-%release -Obsoletes: libfox1_6 < %version +Provides: libfox1_6 = %{version}-%{release} +Obsoletes: libfox1_6 < %{version} -%description -n %lname +%description -n %{lname} This package contains the shared libraries needed by applications compiled with the FOX GUI Toolkit. +%if 0%{?centos_version} >= 800 +%global debug_package %{nil} +%endif + %package devel Summary: Development Files and Documentation for the FOX GUI Toolkit 1.6 Group: Development/Languages/C and C++ @@ -128,11 +121,9 @@ Requires: libpng-devel Requires: libtiff-devel Requires: xorg-x11-devel -%if 0%{?suse_version} > 1220 -Requires: pkgconfig(glu) -%endif Requires: zlib-devel Provides: fox-devel = %{version}-%{release} +Requires: pkgconfig(glu) # # SUSE requires # @@ -140,8 +131,6 @@ Requires: expat Requires: libbz2-devel Requires: libexpat-devel -Requires: xorg-x11-libs -%if 0%{?suse_version} >= 1020 Requires: xorg-x11-Mesa-devel Requires: xorg-x11-libX11-devel Requires: xorg-x11-libXau-devel @@ -149,18 +138,13 @@ Requires: xorg-x11-libXext-devel Requires: xorg-x11-libXfixes-devel Requires: xorg-x11-libXrender-devel -%else -Requires: Mesa-devel -Requires: XFree86-Mesa -Requires: XFree86-Mesa-devel -Requires: XFree86-devel -Requires: XFree86-libs -%endif +Requires: xorg-x11-libs %endif # # Fedora Requires # %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} +Requires: bzip2-devel Requires: cups-devel Requires: libGLU-devel Requires: libXext-devel @@ -179,9 +163,7 @@ %package doc Summary: Documentation for the FOX Toolkit 1.6 Group: Documentation/HTML -%if 0%{?suse_version} >= 1130 || !0%{?suse_version} BuildArch: noarch -%endif %description doc FOX is a C++-based library for graphical user interface development. @@ -191,9 +173,9 @@ %package devel-static Summary: Static Libraries for the FOX Toolkit 1.6 Group: Development/Languages/C and C++ -Provides: %name-static = %version-%release -Obsoletes: %name-static < 1.6.36 -Requires: %name-devel = %version +Requires: %{name}-devel = %{version} +Provides: %{name}-static = %{version}-%{release} +Obsoletes: %{name}-static < 1.6.36 # skip dependency checks required by libtool .la files => skip-check-libtool-deps %description devel-static @@ -221,11 +203,16 @@ %prep %setup -q -n fox-%{version} -%patch1 -p0 -%patch2 -p0 +%patch1 +%patch2 %build autoreconf -fi +%if 0%{?centos_version} >= 800 +export CFLAGS="%optflags -fPIC" +export CXXFLAGS="%optflags -fPIC" +export LDFLAGS="-fPIC" +%endif %configure \ --enable-threadsafe \ --enable-release \ @@ -245,7 +232,7 @@ make %{?_smp_mflags} %install -%makeinstall +%make_install # install docu pushd doc doxygen -u doxygen.cfg @@ -261,21 +248,19 @@ # install desktop files for example applications %if 0%{?suse_version} mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps} -install -m 644 %SOURCE1 %{buildroot}%{_datadir}/pixmaps/ -install -m 644 %SOURCE2 %{buildroot}%{_datadir}/pixmaps/ -install -m 644 %SOURCE3 %{buildroot}%{_datadir}/pixmaps/ -install -m 644 %SOURCE5 %{buildroot}%{_datadir}/applications/ -install -m 644 %SOURCE6 %{buildroot}%{_datadir}/applications/ -install -m 644 %SOURCE7 %{buildroot}%{_datadir}/applications/ +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/ +install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ +install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/ +install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/applications/ +install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/applications/ +install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ %suse_update_desktop_file calculator %suse_update_desktop_file pathfinder %suse_update_desktop_file adie %endif -%post -n %lname -p /sbin/ldconfig - -%postun -n %lname -p /sbin/ldconfig - +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %post devel test -f %{_bindir}/fox-config || ln -s fox16-config %{_bindir}/fox-config test -f %{_bindir}/reswrap || ln -s reswrap16 %{_bindir}/reswrap @@ -285,8 +270,9 @@ %defattr(-,root,root) %doc %{_defaultdocdir}/%{name} -%files -n %lname -%defattr(-, root, root) +%files -n %{lname} +%defattr(-,root,root) +%license LICENSE* %{_libdir}/libFOX-*.so.* %{_libdir}/libCHART-*.so.* @@ -294,7 +280,7 @@ %defattr(-,root,root) %{_bindir}/reswrap %{_bindir}/fox-config -%{_mandir}/man1/reswrap.1* +%{_mandir}/man1/reswrap.1%{?ext_man} %{_includedir}/fox-*/ %{_libdir}/pkgconfig/fox.pc %{_libdir}/libFOX-*.la ++++++ fox-1.6.54.tar.gz -> fox-1.6.57.tar.gz ++++++ ++++ 33704 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/Makefile.am new/fox-1.6.57/Makefile.am --- old/fox-1.6.54/Makefile.am 2016-06-16 06:21:03.000000000 +0200 +++ new/fox-1.6.57/Makefile.am 2018-04-04 05:46:56.000000000 +0200 @@ -21,10 +21,12 @@ web: distdir cd $(distdir)/doc && doxygen doxygen.cfg - cp -r $(distdir)/doc/* /net/linky/mnt/html + cp -r $(distdir)/doc/* /site/www drop: dist-all - cp $(distdir).tar.gz /home/site/ftp/pub - cp $(distdir).zip /home/site/ftp/pub + cp $(distdir).tar.gz /site/ftp/pub + cp $(distdir).zip /site/ftp/pub + sha1sum $(distdir).tar.gz >/site/ftp/pub/$(distdir).tar.gz.sha1sum + sha1sum $(distdir).zip >/site/ftp/pub/$(distdir).zip.sha1sum diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/chart/Makefile.am new/fox-1.6.57/chart/Makefile.am --- old/fox-1.6.54/chart/Makefile.am 2016-03-15 14:26:37.000000000 +0100 +++ new/fox-1.6.57/chart/Makefile.am 2018-04-04 05:42:41.000000000 +0200 @@ -12,7 +12,8 @@ libCHART_1_6_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic + -export-dynamic \ + -no-undefined chartincludedir=$(includedir)/fox-1.6/chart diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/compile new/fox-1.6.57/compile --- old/fox-1.6.54/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/fox-1.6.57/compile 2017-08-15 09:25:07.000000000 +0200 @@ -0,0 +1,348 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2016-01-11.22; # UTC + +# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Written by Tom Tromey <tro...@cygnus.com>. +# +# 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, 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, see <http://www.gnu.org/licenses/>. + +# 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. + +# This file is maintained in Automake, please report +# bugs to <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <bug-autom...@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/configure.ac new/fox-1.6.57/configure.ac --- old/fox-1.6.54/configure.ac 2017-04-21 02:34:42.000000000 +0200 +++ new/fox-1.6.57/configure.ac 2018-04-04 05:46:56.000000000 +0200 @@ -1,7 +1,7 @@ # Version of the code m4_define([fox_major], [1]) m4_define([fox_minor], [6]) -m4_define([fox_level], [54]) +m4_define([fox_level], [57]) m4_define([fox_version],[fox_major.fox_minor.fox_level]) # Init @@ -109,8 +109,9 @@ # Add copious amounts of debugging with gcc if test "${GXX}" = "yes" ; then - CXXFLAGS="${CXXFLAGS} -Wall -Wformat -Woverloaded-virtual -Wshadow" + CXXFLAGS="${CXXFLAGS} -Wall -Wformat -Woverloaded-virtual -Wshadow -DUNICODE" #LDFLAGS="-rdynamic ${LDFLAGS}" + LDFLAGS="-no-undefined ${LDFLAGS}" fi # Debugging turned on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/include/fxver.h new/fox-1.6.57/include/fxver.h --- old/fox-1.6.54/include/fxver.h 2017-04-21 02:38:43.000000000 +0200 +++ new/fox-1.6.57/include/fxver.h 2018-04-04 05:47:34.000000000 +0200 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 54 +#define FOX_LEVEL 57 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/missing new/fox-1.6.57/missing --- old/fox-1.6.54/missing 2012-09-18 04:53:51.000000000 +0200 +++ new/fox-1.6.57/missing 2017-08-15 09:25:07.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # 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 @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-autom...@gnu.org>." exit $? @@ -99,233 +70,146 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks '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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/src/FXMemoryStream.cpp new/fox-1.6.57/src/FXMemoryStream.cpp --- old/fox-1.6.54/src/FXMemoryStream.cpp 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.57/src/FXMemoryStream.cpp 2018-04-04 05:42:42.000000000 +0200 @@ -154,15 +154,15 @@ if(whence==FXFromCurrent) offset=offset+pos; else if(whence==FXFromEnd) offset=offset+endptr-begptr; if(dir==FXStreamSave){ - if(begptr+offset>=endptr){ + if(begptr+offset>endptr){ if(!owns){ setError(FXStreamFull); return false; } setSpace(offset); - if(begptr+offset>=endptr) return false; + if(begptr+offset>endptr) return false; } wrptr=begptr+offset; } else{ - if(begptr+offset>=endptr){ setError(FXStreamEnd); return false; } + if(begptr+offset>endptr){ setError(FXStreamEnd); return false; } rdptr=begptr+offset; } pos=offset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/src/FXString.cpp new/fox-1.6.57/src/FXString.cpp --- old/fox-1.6.54/src/FXString.cpp 2017-04-21 02:34:42.000000000 +0200 +++ new/fox-1.6.57/src/FXString.cpp 2018-04-04 05:42:42.000000000 +0200 @@ -2356,16 +2356,16 @@ #if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) va_list ag; va_copy(ag,args); - result=vsnprintf(str,length(),fmt,ag); + result=vsnprintf(str,empty()?0:length()+1,fmt,ag); va_end(ag); - if(length()<=result){ + if(length()<result && 0<result){ length(result); result=vsnprintf(str,length()+1,fmt,args); } #else va_list ag; x: va_copy(ag,args); - result=vsnprintf(str,empty() ? 0 : length()+1,fmt,ag); + result=vsnprintf(str,empty()?0:length()+1,fmt,ag); va_end(ag); if(result<0){ length(FXMAX(64,length()*2)); goto x; } if(length()<result){ length(result); goto x; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/src/Makefile.am new/fox-1.6.57/src/Makefile.am --- old/fox-1.6.54/src/Makefile.am 2014-05-14 06:32:41.000000000 +0200 +++ new/fox-1.6.57/src/Makefile.am 2018-04-04 05:42:42.000000000 +0200 @@ -11,7 +11,8 @@ libFOX_1_6_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic + -export-dynamic \ + -no-undefined CURSORS = \ crosshair.xbm \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fox-1.6.54/src/version.rc new/fox-1.6.57/src/version.rc --- old/fox-1.6.54/src/version.rc 2017-04-21 02:38:43.000000000 +0200 +++ new/fox-1.6.57/src/version.rc 2018-04-04 05:47:34.000000000 +0200 @@ -1,7 +1,7 @@ #include <windows.h> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,6,54,0 +FILEVERSION 1,6,57,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -18,12 +18,12 @@ BEGIN VALUE "CompanyName", "Jeroen van der Zijp\0" VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1.6.54.0\0" +VALUE "FileVersion", "1.6.57.0\0" VALUE "InternalName", "FOXDLL-1.@FOX_MINOR_VERSION\0" VALUE "LegalCopyright", "GNU Lesser General Public License Version 2.1 and License Addendum\0" VALUE "OriginalFilename", "FOXDLL-1.@FOX_MINOR_VERSION.dll\0" VALUE "ProductName", "FOX GUI Library\0" -VALUE "ProductVersion", "1.6.54.0\0" +VALUE "ProductVersion", "1.6.57.0\0" END END BLOCK "VarFileInfo" ++++++ fox16-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.CxDA6A/_old 2020-08-17 12:03:20.750626235 +0200 +++ /var/tmp/diff_new_pack.CxDA6A/_new 2020-08-17 12:03:20.754626238 +0200 @@ -2,3 +2,5 @@ addFilter("script-without-shebang .*/usr/bin/Adie.stx") # fox16 doesn't contain any binary - but the subpackages do addFilter("W: no-binary") +# package name is libFOX +addFilter("no-dependency-on fox16*/fox16-libs/libfox16*");
