Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at Wed Apr 7 21:38:39 CEST 2010. -------- --- open-vm-tools/open-vm-tools.changes 2010-03-24 10:45:38.000000000 +0100 +++ open-vm-tools/open-vm-tools.changes 2010-04-07 12:46:05.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 7 10:44:31 UTC 2010 - dimstar@opensuse.org + +- Add open-vm-tools-libpng14.patch to fix build with libpng 1.4. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- open-vm-tools-libpng14.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.BiJCGU/_old 2010-04-07 21:37:40.000000000 +0200 +++ /var/tmp/diff_new_pack.BiJCGU/_new 2010-04-07 21:37:40.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Emulators/PC Summary: Open Virtual Machine Tools Version: 2010.03.20 -Release: 1 +Release: 2 %define svn_rev 243334 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 @@ -36,6 +36,8 @@ Source5: vmware-user-autostart-wrapper Source6: open-vm-tools-modprobe.conf Source98: preamble +# PATCH-FIX-UPSTREAM open-vm-tools-libpng14.patch sf#2983141 dimstar@opensuse.org -- Fix build with libpng 1.4 +Patch0: open-vm-tools-libpng14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: kernel-source @@ -147,6 +149,7 @@ %prep %setup -q -n %{name}-%{version}-%{svn_rev} +%patch0 -p1 chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README ++++++ open-vm-tools-libpng14.patch ++++++ Index: open-vm-tools-2010.03.20-243334/lib/image/imageUtilPng.c =================================================================== --- open-vm-tools-2010.03.20-243334.orig/lib/image/imageUtilPng.c +++ open-vm-tools-2010.03.20-243334/lib/image/imageUtilPng.c @@ -136,7 +136,7 @@ ImageUtil_ReadPNGBuffer(ImageInfo *image goto exit; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); goto exit; } @@ -350,7 +350,7 @@ ImageUtil_ConstructPNGBuffer(const Image goto error; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); goto error; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org