Hello community, here is the log from the commit of package fox16 checked in at Thu Dec 7 20:11:44 CET 2006. -------- --- fox16/fox16.changes 2006-10-13 04:19:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/fox16/fox16.changes 2006-12-05 18:02:59.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Dec 1 02:13:52 CET 2006 - lrupp@suse.de + +- update to 1.6.20 + + Rolled back explicit template instantiation stuff: + not supported everywhere. + + Fix bug in FXMutex::locked() implementation. + + Suppress 4244 warning (possible loss of data) on VC++ compiler. + + Bug fix in FXApp drag and drop. + + Wrong error message in argument check in FXTable API. + + Fixed minor issues in FXPicker: now issues message on mouse + button release. + + Fixed problems in FXFile, FXSocket, FXPipe occurring on + 64-bit Windows. + +------------------------------------------------------------------- Old: ---- fox-1.6.16.tar.bz2 fox-1.6.16_AM_CFLAGS.patch fox-1.6.16_configure_x11_extensions_header.patch fox-1.6.16_initialise_local_variable.patch New: ---- fox-1.6.20.tar.bz2 fox-1.6.20_AM_CFLAGS.patch fox-1.6.20_configure_x11_extensions_header.patch fox-1.6.20_initialise_local_variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.4k0SoX/_old 2006-12-07 20:11:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4k0SoX/_new 2006-12-07 20:11:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package fox16 (Version 1.6.16) +# spec file for package fox16 (Version 1.6.20) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,19 +12,23 @@ Name: fox16 URL: http://www.fox-toolkit.org/ -Version: 1.6.16 +Version: 1.6.20 Release: 1 Summary: Shared Libraries for the FOX Toolkit Group: Development/Languages/C and C++ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Source: fox-%{version}.tar.bz2 Obsoletes: fox <= %{version} Provides: fox -Patch: fox-1.6.16_configure_x11_extensions_header.patch -Patch1: fox-1.6.16_AM_CFLAGS.patch -Patch2: fox-1.6.16_initialise_local_variable.patch +Patch: fox-1.6.20_configure_x11_extensions_header.patch +Patch1: fox-1.6.20_AM_CFLAGS.patch +Patch2: fox-1.6.20_initialise_local_variable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %suse_version >= 1000 BuildRequires: cups-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libtiff-devel pkgconfig xorg-x11-Mesa-devel xorg-x11-devel zlib-devel +%else +BuildRequires: XFree86-Mesa XFree86-Mesa-devel XFree86-devel XFree86-libs cups-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libtiff-devel pkgconfig zlib-devel +%endif Autoreqprov: on %description @@ -195,6 +199,18 @@ %{_mandir}/man1/shutterbug* %changelog -n fox16 +* Fri Dec 01 2006 - lrupp@suse.de +- update to 1.6.20 + + Rolled back explicit template instantiation stuff: + not supported everywhere. + + Fix bug in FXMutex::locked() implementation. + + Suppress 4244 warning (possible loss of data) on VC++ compiler. + + Bug fix in FXApp drag and drop. + + Wrong error message in argument check in FXTable API. + + Fixed minor issues in FXPicker: now issues message on mouse + button release. + + Fixed problems in FXFile, FXSocket, FXPipe occurring on + 64-bit Windows. * Fri Oct 13 2006 - lrupp@suse.de - update to 1.6.16 + Fixed issue with FXMDIChild and FXTopWindow close() routine; ++++++ fox-1.6.16.tar.bz2 -> fox-1.6.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/Makefile.in new/fox-1.6.20/Makefile.in --- old/fox-1.6.16/Makefile.in 2006-09-30 20:57:42.000000000 +0200 +++ new/fox-1.6.20/Makefile.in 2006-11-17 17:08:00.000000000 +0100 @@ -80,11 +80,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/aclocal.m4 new/fox-1.6.20/aclocal.m4 --- old/fox-1.6.16/aclocal.m4 2006-09-29 04:26:19.000000000 +0200 +++ new/fox-1.6.20/aclocal.m4 2006-11-17 17:03:07.000000000 +0100 @@ -10,825 +10,6 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. -# lib-prefix.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -# lib-link.m4 serial 6 (gettext-0.14.3) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ(2.50) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; -*) - acl_cv_prog_gnu_ld=no ;; -esac]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) - -dnl From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) - # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/adie/Makefile.in new/fox-1.6.20/adie/Makefile.in --- old/fox-1.6.16/adie/Makefile.in 2006-09-30 20:57:50.000000000 +0200 +++ new/fox-1.6.20/adie/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/calculator/Makefile.in new/fox-1.6.20/calculator/Makefile.in --- old/fox-1.6.16/calculator/Makefile.in 2006-09-30 20:57:51.000000000 +0200 +++ new/fox-1.6.20/calculator/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/chart/Makefile.in new/fox-1.6.20/chart/Makefile.in --- old/fox-1.6.16/chart/Makefile.in 2006-09-30 20:57:47.000000000 +0200 +++ new/fox-1.6.20/chart/Makefile.in 2006-11-17 17:08:02.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/configure new/fox-1.6.20/configure --- old/fox-1.6.16/configure 2006-09-29 04:26:24.000000000 +0200 +++ new/fox-1.6.20/configure 2006-11-17 17:03:21.000000000 +0100 @@ -1520,7 +1520,7 @@ FOX_MINOR_VERSION=6 -FOX_PATCH_LEVEL=16 +FOX_PATCH_LEVEL=20 FOX_INTERFACE_VERSION=0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/configure.in new/fox-1.6.20/configure.in --- old/fox-1.6.16/configure.in 2006-09-29 04:26:16.000000000 +0200 +++ new/fox-1.6.20/configure.in 2006-11-17 17:03:07.000000000 +0100 @@ -8,7 +8,7 @@ FOX_MINOR_VERSION=6 dnl Increment after every source code change -FOX_PATCH_LEVEL=16 +FOX_PATCH_LEVEL=20 dnl Binaries compiled with this patchlevel of FOX will need at least dnl version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/doc/Makefile.in new/fox-1.6.20/doc/Makefile.in --- old/fox-1.6.16/doc/Makefile.in 2006-09-30 20:57:48.000000000 +0200 +++ new/fox-1.6.20/doc/Makefile.in 2006-11-17 17:08:02.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/doc/art/Makefile.in new/fox-1.6.20/doc/art/Makefile.in --- old/fox-1.6.16/doc/art/Makefile.in 2006-09-30 20:57:48.000000000 +0200 +++ new/fox-1.6.20/doc/art/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/doc/screenshots/Makefile.in new/fox-1.6.20/doc/screenshots/Makefile.in --- old/fox-1.6.16/doc/screenshots/Makefile.in 2006-09-30 20:57:48.000000000 +0200 +++ new/fox-1.6.20/doc/screenshots/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXGLObject.h new/fox-1.6.20/include/FXGLObject.h --- old/fox-1.6.16/include/FXGLObject.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/FXGLObject.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXGLObject.h,v 1.28.2.2 2006/07/28 00:56:30 fox Exp $ * +* $Id: FXGLObject.h,v 1.28.2.3 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXGLOBJECT_H #define FXGLOBJECT_H @@ -79,10 +79,6 @@ }; -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXGLObject>; - - /// List of GL objects typedef FXObjectListOf<FXGLObject> FXGLObjectList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXHeader.h new/fox-1.6.20/include/FXHeader.h --- old/fox-1.6.16/include/FXHeader.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/FXHeader.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXHeader.h,v 1.70.2.1 2006/07/28 00:56:30 fox Exp $ * +* $Id: FXHeader.h,v 1.70.2.2 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXHEADER_H #define FXHEADER_H @@ -163,10 +163,6 @@ }; -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXHeaderItem>; - - /// List of FXHeaderItem's typedef FXObjectListOf<FXHeaderItem> FXHeaderItemList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXIconList.h new/fox-1.6.20/include/FXIconList.h --- old/fox-1.6.16/include/FXIconList.h 2006-08-04 02:15:37.000000000 +0200 +++ new/fox-1.6.20/include/FXIconList.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXIconList.h,v 1.95.2.3 2006/08/02 01:31:07 fox Exp $ * +* $Id: FXIconList.h,v 1.95.2.4 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXICONLIST_H #define FXICONLIST_H @@ -168,10 +168,6 @@ typedef FXint (*FXIconListSortFunc)(const FXIconItem*,const FXIconItem*); -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXIconItem>; - - /// List of FXIconItem's typedef FXObjectListOf<FXIconItem> FXIconItemList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXList.h new/fox-1.6.20/include/FXList.h --- old/fox-1.6.16/include/FXList.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/FXList.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXList.h,v 1.88.2.1 2006/07/28 00:56:30 fox Exp $ * +* $Id: FXList.h,v 1.88.2.2 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXLIST_H #define FXLIST_H @@ -149,10 +149,6 @@ typedef FXint (*FXListSortFunc)(const FXListItem*,const FXListItem*); -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXListItem>; - - /// List of FXListItem's typedef FXObjectListOf<FXListItem> FXListItemList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/Makefile.in new/fox-1.6.20/include/Makefile.in --- old/fox-1.6.16/include/Makefile.in 2006-09-30 20:57:43.000000000 +0200 +++ new/fox-1.6.20/include/Makefile.in 2006-11-17 17:08:00.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/fxdefs.h new/fox-1.6.20/include/fxdefs.h --- old/fox-1.6.16/include/fxdefs.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/fxdefs.h 2006-11-10 02:00:26.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: fxdefs.h,v 1.178.2.1 2006/07/28 00:56:30 fox Exp $ * +* $Id: fxdefs.h,v 1.178.2.2 2006/11/09 23:21:43 fox Exp $ * ********************************************************************************/ #ifndef FXDEFS_H #define FXDEFS_H @@ -131,10 +131,11 @@ #endif -// Templates with DLL linkage +// Disable some warnings in VC++ #ifdef _MSC_VER #pragma warning(disable: 4251) #pragma warning(disable: 4231) +#pragma warning(disable: 4244) #endif // Checking printf and scanf format strings diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/fxver.h new/fox-1.6.20/include/fxver.h --- old/fox-1.6.16/include/fxver.h 2006-09-29 04:27:13.000000000 +0200 +++ new/fox-1.6.20/include/fxver.h 2006-11-17 17:03:59.000000000 +0100 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 16 +#define FOX_LEVEL 20 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/pathfinder/Makefile.in new/fox-1.6.20/pathfinder/Makefile.in --- old/fox-1.6.16/pathfinder/Makefile.in 2006-09-30 20:57:51.000000000 +0200 +++ new/fox-1.6.20/pathfinder/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/shutterbug/Makefile.in new/fox-1.6.20/shutterbug/Makefile.in --- old/fox-1.6.16/shutterbug/Makefile.in 2006-09-30 20:57:50.000000000 +0200 +++ new/fox-1.6.20/shutterbug/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXApp.cpp new/fox-1.6.20/src/FXApp.cpp --- old/fox-1.6.16/src/FXApp.cpp 2006-09-30 20:56:10.000000000 +0200 +++ new/fox-1.6.20/src/FXApp.cpp 2006-10-02 14:36:47.000000000 +0200 @@ -21,7 +21,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXApp.cpp,v 1.617.2.3 2006/09/27 13:13:33 fox Exp $ * +* $Id: FXApp.cpp,v 1.617.2.4 2006/10/02 12:36:47 fox Exp $ * ********************************************************************************/ #ifdef WIN32 #if _WIN32_WINNT < 0x0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXFile.cpp new/fox-1.6.20/src/FXFile.cpp --- old/fox-1.6.16/src/FXFile.cpp 2006-08-04 02:15:41.000000000 +0200 +++ new/fox-1.6.20/src/FXFile.cpp 2006-11-07 16:59:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXFile.cpp,v 1.249.2.1 2006/08/01 18:04:31 fox Exp $ * +* $Id: FXFile.cpp,v 1.249.2.2 2006/11/07 15:58:52 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -207,7 +207,10 @@ FXival nread=-1; if(isOpen()){ #ifdef WIN32 - if(0==::ReadFile(device,data,count,(DWORD*)&nread,NULL)) nread=-1; + DWORD nr; + if(::ReadFile(device,data,(DWORD)count,&nr,NULL)!=0){ + nread=(FXival)nr; + } #else do{ nread=::read(device,data,count); @@ -224,7 +227,10 @@ FXival nwritten=-1; if(isOpen()){ #ifdef WIN32 - if(0==::WriteFile(device,data,count,(DWORD*)&nwritten,NULL)) nwritten=-1; + DWORD nw; + if(::WriteFile(device,data,(DWORD)count,&nw,NULL)!=0){ + nwritten=(FXival)nw; + } #else do{ nwritten=::write(device,data,count); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXPicker.cpp new/fox-1.6.20/src/FXPicker.cpp --- old/fox-1.6.16/src/FXPicker.cpp 2006-01-22 18:58:37.000000000 +0100 +++ new/fox-1.6.20/src/FXPicker.cpp 2006-11-07 16:59:09.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXPicker.cpp,v 1.21 2006/01/22 17:58:37 fox Exp $ * +* $Id: FXPicker.cpp,v 1.21.2.1 2006/10/19 19:15:19 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -107,18 +107,23 @@ handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr); flags&=~FLAG_TIP; if(isEnabled()){ - if(state!=STATE_DOWN){ + if(state==STATE_UP){ grab(); setState(STATE_DOWN); flags&=~FLAG_UPDATE; } else{ + setState(STATE_UP); + } +/* + else{ ungrab(); flags|=FLAG_UPDATE; setState(STATE_UP); FXPoint point(event->root_x,event->root_y); if(target){ target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)&point); } } +*/ return 1; } return 0; @@ -126,7 +131,17 @@ // Released mouse button -long FXPicker::onLeftBtnRelease(FXObject*,FXSelector,void*){ +long FXPicker::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){ + FXEvent* event=(FXEvent*)ptr; + if(isEnabled()){ + if(state==STATE_UP){ + ungrab(); + flags|=FLAG_UPDATE; + FXPoint point(event->root_x,event->root_y); + if(target){ target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)&point); } + } + return 1; + } return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXPipe.cpp new/fox-1.6.20/src/FXPipe.cpp --- old/fox-1.6.16/src/FXPipe.cpp 2006-01-22 18:58:37.000000000 +0100 +++ new/fox-1.6.20/src/FXPipe.cpp 2006-11-07 16:59:09.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXPipe.cpp,v 1.7 2006/01/22 17:58:37 fox Exp $ * +* $Id: FXPipe.cpp,v 1.7.2.1 2006/11/07 15:58:53 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -73,7 +73,10 @@ FXival nread=-1; if(isOpen()){ #ifdef WIN32 - if(0==::ReadFile(device,data,count,(DWORD*)&nread,NULL)) nread=-1; + DWORD nr; + if(::ReadFile(device,data,(DWORD)count,&nr,NULL)!=0){ + nread=(FXival)nr; + } #else do{ nread=::read(device,data,count); @@ -90,7 +93,10 @@ FXival nwritten=-1; if(isOpen()){ #ifdef WIN32 - if(0==::WriteFile(device,data,count,(DWORD*)&nwritten,NULL)) nwritten=-1; + DWORD nw; + if(::WriteFile(device,data,(DWORD)count,&nw,NULL)!=0){ + nwritten=(FXival)nw; + } #else do{ nwritten=::write(device,data,count); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXSocket.cpp new/fox-1.6.20/src/FXSocket.cpp --- old/fox-1.6.16/src/FXSocket.cpp 2006-01-22 18:58:41.000000000 +0100 +++ new/fox-1.6.20/src/FXSocket.cpp 2006-11-07 16:59:09.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXSocket.cpp,v 1.6 2006/01/22 17:58:41 fox Exp $ * +* $Id: FXSocket.cpp,v 1.6.2.1 2006/11/07 15:58:53 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -73,7 +73,10 @@ FXival nread=-1; if(isOpen()){ #ifdef WIN32 - if(0==::ReadFile(device,data,count,(DWORD*)&nread,NULL)) nread=-1; + DWORD nr; + if(::ReadFile(device,data,(DWORD)count,&nr,NULL)!=0){ + nread=(FXival)nr; + } #else do{ nread=::read(device,data,count); @@ -90,7 +93,10 @@ FXival nwritten=-1; if(isOpen()){ #ifdef WIN32 - if(0==::WriteFile(device,data,count,(DWORD*)&nwritten,NULL)) nwritten=-1; + DWORD nw; + if(::WriteFile(device,data,(DWORD)count,&nw,NULL)!=0){ + nwritten=(FXival)nw; + } #else do{ nwritten=::write(device,data,count); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXTable.cpp new/fox-1.6.20/src/FXTable.cpp --- old/fox-1.6.16/src/FXTable.cpp 2006-08-04 02:15:46.000000000 +0200 +++ new/fox-1.6.20/src/FXTable.cpp 2006-11-07 16:59:10.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXTable.cpp,v 1.245.2.4 2006/08/02 01:31:10 fox Exp $ * +* $Id: FXTable.cpp,v 1.245.2.5 2006/10/16 21:10:48 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -3821,7 +3821,7 @@ FXTableRange tablerange; // Must be in range - if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::removeItem: index out of range.\n",getClassName()); } + if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::extractItem: index out of range.\n",getClassName()); } // Extent of cell sr=startRow(row,col); er=endRow(row,col); @@ -3901,7 +3901,7 @@ register FXint r,c; // Verify range - if(startrow<0 || startcol<0 || nrows<=endrow || ncols<=endcol){ fxerror("%s::clearRange: index out of range.\n",getClassName()); } + if(startrow<0 || startcol<0 || nrows<=endrow || ncols<=endcol){ fxerror("%s::removeRange: index out of range.\n",getClassName()); } // Free all cells for(r=startrow; r<=endrow; r++){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXThread.cpp new/fox-1.6.20/src/FXThread.cpp --- old/fox-1.6.16/src/FXThread.cpp 2006-07-28 07:30:49.000000000 +0200 +++ new/fox-1.6.20/src/FXThread.cpp 2006-11-09 01:30:58.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXThread.cpp,v 1.53.2.7 2006/07/28 05:30:49 fox Exp $ * +* $Id: FXThread.cpp,v 1.53.2.8 2006/11/08 22:58:28 fox Exp $ * ********************************************************************************/ #ifdef WIN32 #if _WIN32_WINNT < 0x0400 @@ -125,9 +125,11 @@ // Test if locked FXbool FXMutex::locked(){ - if(pthread_mutex_trylock((pthread_mutex_t*)data)==EBUSY) return TRUE; - pthread_mutex_unlock((pthread_mutex_t*)data); - return FALSE; + if(pthread_mutex_trylock((pthread_mutex_t*)data)==0){ + pthread_mutex_unlock((pthread_mutex_t*)data); + return false; + } + return true; } @@ -553,10 +555,12 @@ // Test if locked FXbool FXMutex::locked(){ #if(_WIN32_WINNT >= 0x0400) - if(TryEnterCriticalSection((CRITICAL_SECTION*)data)==0) return FALSE; - LeaveCriticalSection((CRITICAL_SECTION*)data); + if(TryEnterCriticalSection((CRITICAL_SECTION*)data)!=0){ + LeaveCriticalSection((CRITICAL_SECTION*)data); + return false; + } #endif - return TRUE; + return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/Makefile.in new/fox-1.6.20/src/Makefile.in --- old/fox-1.6.16/src/Makefile.in 2006-09-30 20:57:46.000000000 +0200 +++ new/fox-1.6.20/src/Makefile.in 2006-11-17 17:08:01.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/version.rc new/fox-1.6.20/src/version.rc --- old/fox-1.6.16/src/version.rc 2006-09-30 20:57:45.000000000 +0200 +++ new/fox-1.6.20/src/version.rc 2006-11-17 17:08:01.000000000 +0100 @@ -1,5 +1,5 @@ 1 VERSIONINFO -FILEVERSION 1,6,16,0 +FILEVERSION 1,6,20,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -15,7 +15,7 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1,6,16.0\0" +VALUE "FileVersion", "1,6,20.0\0" VALUE "LegalCopyright", "GNU Library General Public License\0" END END diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/vsscanf.cpp new/fox-1.6.20/src/vsscanf.cpp --- old/fox-1.6.16/src/vsscanf.cpp 2006-01-22 18:58:58.000000000 +0100 +++ new/fox-1.6.20/src/vsscanf.cpp 2006-11-09 01:58:13.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: vsscanf.cpp,v 1.20 2006/01/22 17:58:58 fox Exp $ * +* $Id: vsscanf.cpp,v 1.20.2.1 2006/11/09 00:58:13 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -46,7 +46,9 @@ #ifndef HAVE_VSSCANF // API +#if !defined(_MSC_VER) || (_MSC_VER < 1400) extern "C" int vfscanf(FILE *stream, const char *format, va_list arg_ptr); +#endif // API @@ -388,10 +390,12 @@ // API +#if !defined(_MSC_VER) || (_MSC_VER < 1400) int vfscanf(FILE *stream,const char *format,va_list arg_ptr){ arg_scanf farg={(void*)stream,(int(*)(void*))fgetc,(int(*)(int,void*))ungetc}; return __v_scanf(&farg,format,arg_ptr); } +#endif // API diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/tests/Makefile.in new/fox-1.6.20/tests/Makefile.in --- old/fox-1.6.16/tests/Makefile.in 2006-09-30 20:57:49.000000000 +0200 +++ new/fox-1.6.20/tests/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/utils/Makefile.in new/fox-1.6.20/utils/Makefile.in --- old/fox-1.6.16/utils/Makefile.in 2006-09-30 20:57:43.000000000 +0200 +++ new/fox-1.6.20/utils/Makefile.in 2006-11-17 17:08:00.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/windows/Makefile.in new/fox-1.6.20/windows/Makefile.in --- old/fox-1.6.16/windows/Makefile.in 2006-09-30 20:57:52.000000000 +0200 +++ new/fox-1.6.20/windows/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ ++++++ fox-1.6.16_AM_CFLAGS.patch -> fox-1.6.20_AM_CFLAGS.patch ++++++ ++++++ fox-1.6.16_configure_x11_extensions_header.patch -> fox-1.6.20_configure_x11_extensions_header.patch ++++++ ++++++ fox-1.6.16_initialise_local_variable.patch -> fox-1.6.20_initialise_local_variable.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org