pool/open-vm-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with libpng 1.4

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=157
This commit is contained in:
Dominique Leuenberger 2010-04-07 10:46:07 +00:00 committed by Git OBS Bridge
parent 05c3da9643
commit 1e84307ad8
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
open-vm-tools-libpng14.patch Normal file
View File

@ -0,0 +1,22 @@
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;
}

5
open-vm-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 7 10:44:31 UTC 2010 - dimstar@opensuse.org
- Add open-vm-tools-libpng14.patch to fix build with libpng 1.4.
-------------------------------------------------------------------
Wed Mar 24 09:43:33 UTC 2010 - dimstar@opensuse.org

3
open-vm-tools.spec
View File

@ -36,6 +36,8 @@ Source4: open-vm-tools.permissions
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 @@ if you intend to create own plugins for vmtoolsd.
%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