Hello community, here is the log from the commit of package fox16 for openSUSE:Factory checked in at 2012-07-13 11:31:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fox16 (Old) and /work/SRC/openSUSE:Factory/.fox16.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fox16", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/fox16/fox16.changes 2012-02-14 13:05:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fox16.new/fox16.changes 2012-07-13 11:31:14.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jul 12 18:52:28 UTC 2012 - [email protected] + +- update to 1.6.46: + + Small tweak to FXIcon's guessthresh(), thanks to Fanglin. + + Fixed quaternion arc() routine. In case of vectors that are + (almost) 180 degrees apart, the wrong quaternion was returned. + + Invalid handle issue fixed in FXWindow. + + Backported FXPath shell escaping routine. +- added fox16-remove_date_from_reswrap.patch + to remove date from reswrap help to support build compare + +------------------------------------------------------------------- Old: ---- fox-1.6.44.tar.bz2 New: ---- fox-1.6.46.tar.bz2 fox16-remove_date_from_reswrap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.hkGqR9/_old 2012-07-13 11:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.hkGqR9/_new 2012-07-13 11:31:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fox16 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: fox16 -Version: 1.6.44 -Release: 1 -License: LGPL-2.1+ +Version: 1.6.46 +Release: 0 Summary: Shared Libraries for the FOX Toolkit -Url: http://www.fox-toolkit.org/ +License: LGPL-2.1+ Group: Development/Languages/C and C++ +Url: http://www.fox-toolkit.org/ %define soname 1_6 Source: fox-%{version}.tar.bz2 Source1: calculator.png @@ -33,6 +32,8 @@ Source5: adie.desktop Source6: calculator.desktop Source7: pathfinder.desktop +# PATCH-FIX-OPENSUSE remove date from reswrap help to support build compare +Patch1: fox16-remove_date_from_reswrap.patch # PATCH-FIX-UPSTREAM add closing html tag Patch2: fox-1.6.26-missing_html_tag.patch BuildRequires: doxygen @@ -81,7 +82,7 @@ # # Fedora Requires # -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} BuildRequires: cups-devel BuildRequires: libGLU-devel BuildRequires: libXext-devel @@ -100,7 +101,6 @@ beyond the built-in widgets by application writers. %package -n libfox1_6 -License: LGPL-2.1+ Summary: Shared Libraries for the FOX Toolkit Group: Development/Languages/C and C++ @@ -109,7 +109,6 @@ by applications compiled with the FOX GUI Toolkit. %package devel -License: LGPL-2.1+ Summary: Development Files and Documentation for the FOX GUI Toolkit Group: Development/Languages/C and C++ Requires: %{name} = %{version} @@ -169,7 +168,6 @@ compiler, manual pages, and HTML documentation. %package devel-static -License: LGPL-2.1+ Summary: Static Libraries for the FOX Toolkit Group: Development/Languages/C and C++ Provides: %name-static = %version-%release @@ -183,7 +181,6 @@ FOX is a C++-based library for graphical user interface development. %package example-apps -License: LGPL-2.1+ Summary: Example applications for the FOX GUI toolkit Group: Development/Languages/C and C++ Requires: %{name} @@ -203,6 +200,7 @@ %prep %setup -q -n fox-%{version} +%patch1 -p0 %patch2 -p0 %build ++++++ fox-1.6.44.tar.bz2 -> fox-1.6.46.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/configure new/fox-1.6.46/configure --- old/fox-1.6.44/configure 2011-09-24 00:44:38.000000000 +0200 +++ new/fox-1.6.46/configure 2012-07-12 02:40:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for fox 1.6.44. +# Generated by GNU Autoconf 2.68 for fox 1.6.46. # # Report bugs to <[email protected]>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='fox' PACKAGE_TARNAME='fox' -PACKAGE_VERSION='1.6.44' -PACKAGE_STRING='fox 1.6.44' +PACKAGE_VERSION='1.6.46' +PACKAGE_STRING='fox 1.6.46' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1333,7 +1333,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fox 1.6.44 to adapt to many kinds of systems. +\`configure' configures fox 1.6.46 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1407,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fox 1.6.44:";; + short | recursive ) echo "Configuration of fox 1.6.46:";; esac cat <<\_ACEOF @@ -1531,7 +1531,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fox configure 1.6.44 +fox configure 1.6.46 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2252,7 +2252,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fox $as_me 1.6.44, which was +It was created by fox $as_me 1.6.46, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3071,7 +3071,7 @@ # Define the identity of the package. PACKAGE='fox' - VERSION='1.6.44' + VERSION='1.6.46' cat >>confdefs.h <<_ACEOF @@ -3115,7 +3115,7 @@ # Set version FOX_MAJOR_VERSION=1 FOX_MINOR_VERSION=6 -FOX_PATCH_LEVEL=44 +FOX_PATCH_LEVEL=46 # Binaries compiled with this patchlevel of FOX will need at least # version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion @@ -18722,7 +18722,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fox $as_me 1.6.44, which was +This file was extended by fox $as_me 1.6.46, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18779,7 +18779,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -fox config.status 1.6.44 +fox config.status 1.6.46 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/configure.ac new/fox-1.6.46/configure.ac --- old/fox-1.6.44/configure.ac 2011-09-24 00:43:16.000000000 +0200 +++ new/fox-1.6.46/configure.ac 2012-07-12 02:40:13.000000000 +0200 @@ -1,7 +1,7 @@ # Version of the code m4_define([fox_major], [1]) m4_define([fox_minor], [6]) -m4_define([fox_level], [44]) +m4_define([fox_level], [46]) m4_define([fox_version],[fox_major.fox_minor.fox_level]) # Init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/include/fxver.h new/fox-1.6.46/include/fxver.h --- old/fox-1.6.44/include/fxver.h 2011-09-24 00:45:17.000000000 +0200 +++ new/fox-1.6.46/include/fxver.h 2012-07-12 02:44:23.000000000 +0200 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 44 +#define FOX_LEVEL 46 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/src/FXGLVisual.cpp new/fox-1.6.46/src/FXGLVisual.cpp --- old/fox-1.6.44/src/FXGLVisual.cpp 2011-09-24 00:43:16.000000000 +0200 +++ new/fox-1.6.46/src/FXGLVisual.cpp 2012-07-12 02:38:41.000000000 +0200 @@ -692,7 +692,7 @@ } // Composition Support would be nice to have - if(!glcomposition) dmatch+=1; + if(!glcomposition) dmatch+=100; // Trace FXTRACE((150,"Pixel Format (%d) match value = %d\n",i,dmatch)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/src/FXIcon.cpp new/fox-1.6.46/src/FXIcon.cpp --- old/fox-1.6.44/src/FXIcon.cpp 2011-09-24 00:43:16.000000000 +0200 +++ new/fox-1.6.46/src/FXIcon.cpp 2012-07-12 02:40:13.000000000 +0200 @@ -113,7 +113,7 @@ for(j=765,cum=0; j>0; --j){ if((cum+=frequency[j])>=med) break; } - guess=(i+j+1)>>1; + guess=((i+j+1)>>1)+1; // Fanglin Zhu: raise threshold by one in case of single-color image return guess; } @@ -240,7 +240,7 @@ // Guess threshold thresh=guessthresh(data,width,height); - + // Get Visual vis=(Visual*)visual->visual; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/src/FXQuatd.cpp new/fox-1.6.46/src/FXQuatd.cpp --- old/fox-1.6.44/src/FXQuatd.cpp 2011-09-24 00:43:16.000000000 +0200 +++ new/fox-1.6.46/src/FXQuatd.cpp 2012-07-12 02:38:41.000000000 +0200 @@ -532,10 +532,27 @@ w= 1.0; } else if(dot<-0.999999){ // 180 quaternion - x= 0.0; - y= 0.0; - z=-1.0; - w= 0.0; + if(fabs(f.z)<fabs(f.x) && fabs(f.z)<fabs(f.y)){ // x, y largest magnitude + x= f.x*f.z-f.z*f.y; + y= f.z*f.x+f.y*f.z; + z=-f.y*f.y-f.x*f.x; + } + else if(fabs(f.y)<fabs(f.x)){ // y, z largest magnitude + x= f.y*f.z-f.x*f.y; + y= f.x*f.x+f.z*f.z; + z=-f.z*f.y-f.y*f.x; + } + else{ // x, z largest magnitude + x=-f.z*f.z-f.y*f.y; + y= f.y*f.x-f.x*f.z; + z= f.x*f.y+f.z*f.x; + } + dot=x*x+y*y+z*z; + div=sqrt(dot); + x/=div; + y/=div; + z/=div; + w=0.0; } else{ div=sqrt((dot+1.0)*2.0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/src/FXQuatf.cpp new/fox-1.6.46/src/FXQuatf.cpp --- old/fox-1.6.44/src/FXQuatf.cpp 2011-09-24 00:43:16.000000000 +0200 +++ new/fox-1.6.46/src/FXQuatf.cpp 2012-07-12 02:38:41.000000000 +0200 @@ -533,10 +533,27 @@ w= 1.0f; } else if(dot<-0.999999f){ // 180 quaternion - x= 0.0f; - y= 0.0f; - z=-1.0f; - w= 0.0f; + if(fabsf(f.z)<fabsf(f.x) && fabsf(f.z)<fabs(f.y)){ // x, y largest magnitude + x= f.x*f.z-f.z*f.y; + y= f.z*f.x+f.y*f.z; + z=-f.y*f.y-f.x*f.x; + } + else if(fabsf(f.y)<fabsf(f.x)){ // y, z largest magnitude + x= f.y*f.z-f.x*f.y; + y= f.x*f.x+f.z*f.z; + z=-f.z*f.y-f.y*f.x; + } + else{ // x, z largest magnitude + x=-f.z*f.z-f.y*f.y; + y= f.y*f.x-f.x*f.z; + z= f.x*f.y+f.z*f.x; + } + dot=x*x+y*y+z*z; + div=sqrtf(dot); + x/=div; + y/=div; + z/=div; + w=0.0f; } else{ div=sqrtf((dot+1.0f)*2.0f); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.44/src/version.rc new/fox-1.6.46/src/version.rc --- old/fox-1.6.44/src/version.rc 2011-09-24 00:45:17.000000000 +0200 +++ new/fox-1.6.46/src/version.rc 2012-07-12 02:44:23.000000000 +0200 @@ -1,5 +1,5 @@ 1 VERSIONINFO -FILEVERSION 1,6,44,0 +FILEVERSION 1,6,46,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -15,7 +15,7 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1,6,44.0\0" +VALUE "FileVersion", "1,6,46.0\0" VALUE "LegalCopyright", "GNU Library General Public License\0" END END ++++++ fox16-remove_date_from_reswrap.patch ++++++ Index: utils/reswrap.cpp =================================================================== --- utils/reswrap.cpp.orig +++ utils/reswrap.cpp @@ -86,7 +86,7 @@ void printusage(){ /* Print version information */ void printversion(){ - fprintf(stderr,"Reswrap %s %s.\n",version,__DATE__); + fprintf(stderr,"Reswrap %s.\n",version); fprintf(stderr,"Copyright (C) 1997,2005 Jeroen van der Zijp. All Rights Reserved.\n"); fprintf(stderr,"Please visit: http://www.fox-toolkit.org for further information.\n"); fprintf(stderr,"\n"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
