Hello community, here is the log from the commit of package fox16 for openSUSE:Factory checked in at Mon Feb 7 23:55:36 CET 2011. -------- --- fox16/fox16.changes 2010-09-01 14:35:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/fox16/fox16.changes 2011-02-07 21:36:17.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Feb 7 20:34:14 UTC 2011 - lars@linux-schulserver.de + +- update to 1.6.43: + + Added missing AC_FUNC_MMAP to configure.ac. Presence of mmap() + and munmap() API's we not being discovered properly. + + Fix libpng version 1.5. Members of png_struct are now hidden, + so fxpngio.cpp must use newly introduced API to use + embedded jmp_buf. + + Fix configure.ac type which caused linkage to libGL and libGLU + even if compiled without GL support. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fox-1.6.40.tar.bz2 New: ---- fox-1.6.43.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.GU7upd/_old 2011-02-07 23:55:19.000000000 +0100 +++ /var/tmp/diff_new_pack.GU7upd/_new 2011-02-07 23:55:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fox16 (Version 1.6.40) +# spec file for package fox16 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: fox16 +Version: 1.6.43 +Release: 1 +License: LGPLv2.1+ Summary: Shared Libraries for the FOX Toolkit Url: http://www.fox-toolkit.org/ Group: Development/Languages/C and C++ -License: LGPLv2.1+ -Version: 1.6.40 -Release: 1 %define soname 1_6 Source: fox-%{version}.tar.bz2 Source1: calculator.png @@ -34,35 +33,60 @@ Source5: adie.desktop Source6: calculator.desktop Source7: pathfinder.desktop -Provides: fox = %{version}-%{release} -Requires: libfox%soname = %{version} +# PATCH-FIX-UPSTREAM add closing html tag Patch2: fox-1.6.26-missing_html_tag.patch +BuildRequires: doxygen +BuildRequires: freetype2-devel +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: pkgconfig +BuildRequires: zlib-devel +Requires: libfox%soname = %{version} +Provides: fox = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: doxygen freetype2-devel gcc-c++ libjpeg-devel libpng-devel libtiff-devel pkgconfig zlib-devel # # SUSE requires # %if 0%{?suse_version} -BuildRequires: cups-devel xorg-x11-devel +BuildRequires: cups-devel BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel %if 0%{?suse_version} >= 1020 -BuildRequires: xorg-x11-Mesa-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel +BuildRequires: xorg-x11-Mesa-devel +BuildRequires: xorg-x11-libXext-devel +BuildRequires: xorg-x11-libXfixes-devel %else -BuildRequires: Mesa-devel XFree86-Mesa XFree86-Mesa-devel XFree86-devel XFree86-libs xorg-x11-libs +BuildRequires: Mesa-devel +BuildRequires: XFree86-Mesa +BuildRequires: XFree86-Mesa-devel +BuildRequires: XFree86-devel +BuildRequires: XFree86-libs +BuildRequires: xorg-x11-libs %endif %endif # # Mandriva Requires # %if 0%{?mandriva_version} -BuildRequires: cups cups-common libxext-devel libxft-devel xorg-x11 +BuildRequires: cups +BuildRequires: cups-common BuildRequires: libmesaglu-devel +BuildRequires: libxext-devel +BuildRequires: libxft-devel +BuildRequires: xorg-x11 %endif # # Fedora Requires # %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: cups-devel libGLU-devel libXext-devel libXft-devel xorg-x11-devel +BuildRequires: cups-devel +BuildRequires: libGLU-devel +BuildRequires: libXext-devel +BuildRequires: libXft-devel +BuildRequires: libXi-devel +BuildRequires: xorg-x11-devel %endif %description @@ -74,28 +98,6 @@ graphics. Subclassing of basic FOX widgets allows for easy extension beyond the built-in widgets by application writers. - - -Authors: --------- - Johnathan Bush - Pierre Cyr - Janusz Ganczarski - Daniel Gehriger - Eric Gillet - Freddy Golos - Angel-Ventura Mendo Gomez - Sean Hubbell - Sander Jansen - Lyle Johnson - Torsten Landschoff - Ren� van Paassen - Guoqing Tian - David Tyree - Charles W. Warren - David Tyree - Jeroen van der Zijp - %package -n libfox1_6 License: LGPLv2.1+ Summary: Shared Libraries for the FOX Toolkit @@ -105,43 +107,57 @@ This package contains the shared libraries needed by applications compiled with the FOX GUI Toolkit. -Authors: --------- - Johnathan Bush - Pierre Cyr - Janusz Ganczarski - Daniel Gehriger - Eric Gillet - Freddy Golos - Angel-Ventura Mendo Gomez - Sean Hubbell - Sander Jansen - Lyle Johnson - Torsten Landschoff - René van Paassen - Guoqing Tian - David Tyree - Charles W. Warren - David Tyree - Jeroen van der Zijp - - %package devel License: LGPLv2.1+ Summary: Development Files and Documentation for the FOX GUI Toolkit Group: Development/Languages/C and C++ -Provides: fox-devel = %{version}-%{release} Requires: %{name} = %{version} -Requires: xorg-x11-devel fontconfig-devel freetype2-devel glibc-devel libpng-devel -Requires: libtiff-devel libjpeg-devel zlib-devel bzip2 cups-libs cups-devel +Requires: bzip2 +Requires: cups-devel +Requires: cups-libs +Requires: fontconfig-devel +Requires: freetype2-devel +Requires: glibc-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libtiff-devel +Requires: xorg-x11-devel +Requires: zlib-devel +Provides: fox-devel = %{version} # # SUSE requires # %if 0%{?suse_version} -Requires: xorg-x11-libXfixes-devel xorg-x11-libXext-devel xorg-x11-libXrender-devel -Requires: xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel Mesa-devel -Requires: libexpat-devel libbz2-devel -Requires: xorg-x11-libs xorg-x11-Mesa-devel expat +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 +Requires: xorg-x11-libXdmcp-devel +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 +%endif +# +# Fedora Requires +# +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +Requires: cups-devel +Requires: libGLU-devel +Requires: libXext-devel +Requires: libXft-devel +Requires: libXi-devel +Requires: xorg-x11-devel %endif %description devel @@ -151,28 +167,6 @@ using the FOX GUI toolkit: the header files, the reswrap resource compiler, manual pages, and HTML documentation. - - -Authors: --------- - Johnathan Bush - Pierre Cyr - Janusz Ganczarski - Daniel Gehriger - Eric Gillet - Freddy Golos - Angel-Ventura Mendo Gomez - Sean Hubbell - Sander Jansen - Lyle Johnson - Torsten Landschoff - Ren� van Paassen - Guoqing Tian - David Tyree - Charles W. Warren - David Tyree - Jeroen van der Zijp - %package devel-static License: LGPLv2.1+ Summary: Static Libraries for the FOX Toolkit @@ -187,34 +181,12 @@ FOX is a C++-based library for graphical user interface development. - - -Authors: --------- - Johnathan Bush - Pierre Cyr - Janusz Ganczarski - Daniel Gehriger - Eric Gillet - Freddy Golos - Angel-Ventura Mendo Gomez - Sean Hubbell - Sander Jansen - Lyle Johnson - Torsten Landschoff - Ren� van Paassen - Guoqing Tian - David Tyree - Charles W. Warren - David Tyree - Jeroen van der Zijp - %package example-apps License: LGPLv2.1+ Summary: Example applications for the FOX GUI toolkit Group: Development/Languages/C and C++ -Provides: fox-example-apps = %{version}-%{release} Requires: %{name} +Provides: fox-example-apps = %{version} %description example-apps The example-apps package contains executables for several FOX-based @@ -228,28 +200,6 @@ * PathFinder : File Browser - - -Authors: --------- - Johnathan Bush - Pierre Cyr - Janusz Ganczarski - Daniel Gehriger - Eric Gillet - Freddy Golos - Angel-Ventura Mendo Gomez - Sean Hubbell - Sander Jansen - Lyle Johnson - Torsten Landschoff - Ren� van Paassen - Guoqing Tian - David Tyree - Charles W. Warren - David Tyree - Jeroen van der Zijp - %prep %setup -q -n fox-%{version} %patch2 -p0 @@ -272,7 +222,7 @@ --with-opengl="no" \ %endif --without-profiling -%{__make} %{?_smp_mflags} +%{__make} %{?jobs:-j%jobs} %install %makeinstall @@ -281,29 +231,29 @@ doxygen -u doxygen.cfg make docs popd -mkdir -p %buildroot/%{_defaultdocdir}/%{name}/html +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/html # FIXME: to be done via configure -if [ -d %buildroot/%{_datadir}/doc/fox-1.6 ]; then - mv %buildroot/%{_datadir}/doc/fox-1.6/* %buildroot%{_defaultdocdir}/%{name}/html/ - rm -rf %buildroot/%{_datadir}/doc/fox-1.6 +if [ -d %{buildroot}%{_datadir}/doc/fox-1.6 ]; then + mv %{buildroot}%{_datadir}/doc/fox-1.6/* %{buildroot}%{_defaultdocdir}/%{name}/html/ + rm -rf %{buildroot}%{_datadir}/doc/fox-1.6 fi -install -m644 ADDITIONS AUTHORS LICENSE* README TRACING index.html %buildroot%{_defaultdocdir}/%{name}/ +install -m644 ADDITIONS AUTHORS LICENSE* README TRACING index.html %{buildroot}%{_defaultdocdir}/%{name}/ # 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/ +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/ %suse_update_desktop_file calculator %suse_update_desktop_file pathfinder %suse_update_desktop_file adie %endif %clean -rm -rf %buildroot +rm -rf %{buildroot} %post -n libfox1_6 -p /sbin/ldconfig ++++++ fox-1.6.40.tar.bz2 -> fox-1.6.43.tar.bz2 ++++++ ++++ 12424 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.40/Makefile.am new/fox-1.6.43/Makefile.am --- old/fox-1.6.40/Makefile.am 2010-08-25 03:58:03.000000000 +0200 +++ new/fox-1.6.43/Makefile.am 2011-02-05 18:26:26.000000000 +0100 @@ -14,8 +14,8 @@ CLEANFILES = fox.tar.gz snapshot: dist-all - cp $(distdir).tar.gz /net/linky/mnt/ftp/pub/fox-snapshot.tar.gz - cp $(distdir).zip /net/linky/mnt/ftp/pub/fox-snapshot.zip + cp $(distdir).tar.gz /net/linkyftp/pub/fox-snapshot.tar.gz + cp $(distdir).zip /net/linkyftp/pub/fox-snapshot.zip @@ -24,7 +24,7 @@ cp -r $(distdir)/doc/* /net/linky/mnt/html drop: dist-all - cp $(distdir).tar.gz /net/linky/mnt/ftp/pub - cp $(distdir).zip /net/linky/mnt/ftp/pub + cp $(distdir).tar.gz /net/linkyftp/pub/ + cp $(distdir).zip /net/linkyftp/pub/ 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.40/configure.ac new/fox-1.6.43/configure.ac --- old/fox-1.6.40/configure.ac 2010-09-01 01:59:01.000000000 +0200 +++ new/fox-1.6.43/configure.ac 2011-02-05 18:24:21.000000000 +0100 @@ -1,7 +1,7 @@ # Version of the code m4_define([fox_major], [1]) m4_define([fox_minor], [6]) -m4_define([fox_level], [40]) +m4_define([fox_level], [43]) m4_define([fox_version],[fox_major.fox_minor.fox_level]) # Init @@ -84,6 +84,7 @@ AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_HEADER_DIRENT +AC_FUNC_MMAP if test "$no_x" = yes; then X_BASE_LIBS="-lcomctl32 -lwsock32 -lwinspool -lmpr -lgdi32 -limm32" @@ -273,8 +274,8 @@ if test "x$with_opengl" != "xno" ; then AC_CHECK_HEADER(GL/glu.h,CXXFLAGS="${CXXFLAGS} -DHAVE_GLU_H=1"; LIBS="${LIBS} ${LIBGLU}") AC_CHECK_HEADER(GL/gl.h,CXXFLAGS="${CXXFLAGS} -DHAVE_GL_H=1"; LIBS="${LIBS} ${LIBGL}") -fi GL_LIBS="${LIBGL} ${LIBGLU}" +fi # Substitute variables in output files AC_SUBST(GL_LIBS) 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.40/fox.pc.in new/fox-1.6.43/fox.pc.in --- old/fox-1.6.40/fox.pc.in 2009-03-13 06:45:10.000000000 +0100 +++ new/fox-1.6.43/fox.pc.in 2010-09-02 03:01:28.000000000 +0200 @@ -1,10 +1,18 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +libdir="@libdir@" +includedir="@includedir@/fox-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@" +LIBS="@LIBS@" +X_LIBS="@X_LIBS@" +X_BASE_LIBS="@X_BASE_LIBS@" +X_EXTRA_LIBS="@X_EXTRA_LIBS@" +GL_LIBS="@GL_LIBS@" +FOX_LIBS=-lFOX-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@ Name: FOX -Description: FOX is a C++ based Toolkit for developing Graphical User Interfaces +Description: The FOX Toolkit +URL: www.fox-toolkit.org Version: @FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@.@FOX_PATCH_LEVEL@ -Libs: -L${libdir} -lFOX-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@ @X_LIBS@ @X_BASE_LIBS@ @X_EXTRA_LIBS@ @GL_LIBS@ @LIBS@ -Cflags: -I${includedir}/fox-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@ +Libs: ${FOX_LIBS} +Libs.private: ${X_LIBS} ${X_BASE_LIBS} ${X_EXTRA_LIBS} ${GL_LIBS} ${LIBS} +Cflags: -I${includedir} 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.40/include/fxver.h new/fox-1.6.43/include/fxver.h --- old/fox-1.6.40/include/fxver.h 2010-09-01 01:59:32.000000000 +0200 +++ new/fox-1.6.43/include/fxver.h 2011-02-05 18:25:08.000000000 +0100 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 40 +#define FOX_LEVEL 43 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.40/src/FXColorWell.cpp new/fox-1.6.43/src/FXColorWell.cpp --- old/fox-1.6.40/src/FXColorWell.cpp 2009-03-13 06:45:10.000000000 +0100 +++ new/fox-1.6.43/src/FXColorWell.cpp 2011-01-29 17:14:00.000000000 +0100 @@ -292,7 +292,9 @@ // Handle drag-and-drop drop long FXColorWell::onDNDDrop(FXObject* sender,FXSelector sel,void* ptr){ - FXushort *clr; FXchar *str; FXuint len; FXColor color; + FXuchar *pointer; + FXuint length; + FXColor color; // Enable updating flags|=FLAG_UPDATE; @@ -301,18 +303,18 @@ if(FXFrame::onDNDDrop(sender,sel,ptr)) return 1; // Try and obtain the color first - if(getDNDData(FROM_DRAGNDROP,colorType,(FXuchar*&)clr,len)){ - color=FXRGBA((clr[0]+128)/257,(clr[1]+128)/257,(clr[2]+128)/257,(clr[3]+128)/257); - FXFREE(&clr); + if(getDNDData(FROM_DRAGNDROP,colorType,pointer,length)){ + color=FXRGBA((((FXushort*)pointer)[0]+128)/257,(((FXushort*)pointer)[1]+128)/257,(((FXushort*)pointer)[2]+128)/257,(((FXushort*)pointer)[3]+128)/257); + FXFREE(&pointer); setRGBA(color,TRUE); return 1; } // Maybe its the name of a color - if(getDNDData(FROM_DRAGNDROP,textType,(FXuchar*&)str,len)){ - FXRESIZE(&str,FXchar,len+1); str[len]='\0'; - color=fxcolorfromname((FXchar*)str); - FXFREE(&str); + if(getDNDData(FROM_DRAGNDROP,textType,pointer,length)){ + FXRESIZE(&pointer,FXuchar,length+1); pointer[length]='\0'; + color=fxcolorfromname((const FXchar*)pointer); + FXFREE(&pointer); // Accept the drop only if it was a valid color name if(color!=FXRGBA(0,0,0,0)){ @@ -510,20 +512,22 @@ // Released middle button causes paste of selection long FXColorWell::onMiddleBtnRelease(FXObject*,FXSelector,void* ptr){ - FXushort *clr; FXchar *str; FXuint len; FXColor color; + FXuchar *pointer; + FXuint length; + FXColor color; if(isEnabled()){ ungrab(); if(target && target->tryHandle(this,FXSEL(SEL_MIDDLEBUTTONRELEASE,message),ptr)) return 1; - if(getDNDData(FROM_SELECTION,colorType,(FXuchar*&)clr,len)){ - color=FXRGBA((clr[0]+128)/257,(clr[1]+128)/257,(clr[2]+128)/257,(clr[3]+128)/257); - FXFREE(&clr); + if(getDNDData(FROM_SELECTION,colorType,pointer,length)){ + color=FXRGBA((((FXushort*)pointer)[0]+128)/257,(((FXushort*)pointer)[1]+128)/257,(((FXushort*)pointer)[2]+128)/257,(((FXushort*)pointer)[3]+128)/257); + FXFREE(&color); setRGBA(color,TRUE); return 1; } - if(getDNDData(FROM_SELECTION,stringType,(FXuchar*&)str,len)){ - FXRESIZE(&str,FXchar,len+1); str[len]='\0'; - color=fxcolorfromname(str); - FXFREE(&str); + if(getDNDData(FROM_SELECTION,stringType,pointer,length)){ + FXRESIZE(&pointer,FXuchar,length+1); pointer[length]='\0'; + color=fxcolorfromname((const FXchar*)pointer); + FXFREE(&pointer); setRGBA(color,TRUE); return 1; } 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.40/src/FXGLVisual.cpp new/fox-1.6.43/src/FXGLVisual.cpp --- old/fox-1.6.40/src/FXGLVisual.cpp 2009-03-13 06:45:10.000000000 +0100 +++ new/fox-1.6.43/src/FXGLVisual.cpp 2011-01-27 23:42:28.000000000 +0100 @@ -536,7 +536,7 @@ int gdblbuf,glstereo,gldepth,glaccel; int glred,glgreen,glblue,glalpha,glstencil; int glaccred,glaccgreen,glaccblue,glaccalpha; - int glindex,glswapcopy; + int glindex,glswapcopy,glcomposition; int bestvis,dmatch,bestmatch; int dred,dgreen,dblue,ddepth,dalpha,dstencil; int daccred,daccgreen,daccblue,daccalpha; @@ -591,6 +591,12 @@ // copy swap buffer glswapcopy=(pfd.dwFlags&PFD_SWAP_COPY)!=0; +#ifndef PFD_SUPPORT_COMPOSITION +#define PFD_SUPPORT_COMPOSITION 0x00008000 +#endif + // Windows Vista and Windows 7 composition support + glcomposition=(pfd.dwFlags&PFD_SUPPORT_COMPOSITION)!=0; + // Get planes glred=pfd.cRedBits; glgreen=pfd.cGreenBits; @@ -685,6 +691,9 @@ if(!glswapcopy) dmatch+=10000000; } + // Composition Support would be nice to have + if(!glcomposition) dmatch+=1; + // Trace FXTRACE((150,"Pixel Format (%d) match value = %d\n",i,dmatch)); FXTRACE((150," red size = %d\n",glred)); 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.40/src/fxpngio.cpp new/fox-1.6.43/src/fxpngio.cpp --- old/fox-1.6.40/src/fxpngio.cpp 2009-03-13 06:45:10.000000000 +0100 +++ new/fox-1.6.43/src/fxpngio.cpp 2011-01-29 16:52:57.000000000 +0100 @@ -75,7 +75,11 @@ static void user_error_fn(png_structp png_ptr,png_const_charp){ FXStream* store=(FXStream*)png_get_error_ptr(png_ptr); store->setError(FXStreamFormat); // Flag this as a format error in FXStream +#if (PNG_LIBPNG_VER < 10500) longjmp(png_ptr->jmpbuf,1); // Bail out +#else + png_longjmp(png_ptr,1); // Bail out +#endif } @@ -118,7 +122,7 @@ } // Set error handling - if(setjmp(png_ptr->jmpbuf)){ + if(setjmp(png_jmpbuf(png_ptr))){ // Free all of the memory associated with the png_ptr and info_ptr png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL); @@ -231,7 +235,7 @@ } // Set error handling. - if(setjmp(png_ptr->jmpbuf)){ + if(setjmp(png_jmpbuf(png_ptr))){ png_destroy_write_struct(&png_ptr,&info_ptr); return false; } 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.40/src/version.rc new/fox-1.6.43/src/version.rc --- old/fox-1.6.40/src/version.rc 2010-09-01 01:59:32.000000000 +0200 +++ new/fox-1.6.43/src/version.rc 2011-02-05 18:25:08.000000000 +0100 @@ -1,5 +1,5 @@ 1 VERSIONINFO -FILEVERSION 1,6,40,0 +FILEVERSION 1,6,43,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -15,7 +15,7 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1,6,40.0\0" +VALUE "FileVersion", "1,6,43.0\0" VALUE "LegalCopyright", "GNU Library General Public License\0" END END ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org