Hello community, here is the log from the commit of package xv checked in at Mon Sep 8 17:01:53 CEST 2008. -------- --- xv/xv.changes 2008-08-01 18:56:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/xv/xv.changes 2008-09-03 14:54:00.528700000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 3 14:53:31 CEST 2008 - werner@suse.de + +- Do not deleted PNG window twice (bnc#419422) + +------------------------------------------------------------------- New: ---- xv-3.10a-png.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xv.spec ++++++ --- /var/tmp/diff_new_pack.hr3207/_old 2008-09-08 17:01:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hr3207/_new 2008-09-08 17:01:43.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package xv (Version 3.10a) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ # @@ -19,7 +26,7 @@ Provides: xv300 AutoReqProv: on Version: 3.10a -Release: 1242 +Release: 1264 Summary: GIF/TIFF/JPEG/PostScript Image Viewer Source: xv-3.10a.tar.bz2 #Url http://pobox.com/~newt/greg_xv.html @@ -33,6 +40,7 @@ Patch2: xv-3.10a-signal.dif Patch3: xv-3.10a-overflow.dif Patch4: xv-3.10a-jpeg8.dif +Patch5: xv-3.10a-png.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -75,6 +83,7 @@ %patch2 -p0 -b .sig %patch3 -p0 -b .ovf %patch4 -p0 -b .jpg8 +%patch5 -p0 -b .png %patch %build @@ -127,6 +136,8 @@ %doc %{_mandir}/man1/xvpictoppm.1x.gz %changelog +* Wed Sep 03 2008 werner@suse.de +- Do not deleted PNG window twice (bnc#419422) * Fri Aug 01 2008 werner@suse.de - In jpeg library the numbers of out_color_components and color_components are diffenrent for quantize_colors, that is ++++++ xv-3.10a-png.dif ++++++ --- xvmisc.c +++ xvmisc.c 2008-09-03 14:48:59.484162067 +0200 @@ -561,10 +561,6 @@ void Quit(i) if (mgcsfxW) XDestroyWindow(theDisp, mgcsfxW); #endif -#ifdef HAVE_PNG - if (pngW) XDestroyWindow(theDisp, pngW); -#endif - /* if NOT using stdcmap for images, free stdcmap */ if (colorMapMode != CM_STDCMAP) { int j; @@ -770,10 +766,6 @@ static void set_cursors(mainc, otherc) if (pngW) XDefineCursor(theDisp, pngW, otherc); #endif -#ifdef HAVE_PNG - if (pngW) XDefineCursor(theDisp, pngW, otherc); -#endif - #ifdef HAVE_PCD if (pcdW) XDefineCursor(theDisp, pcdW, otherc); #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org