[mhgui] Fix build with png15

Nicolas Chauvet kwizart at fedoraproject.org
Sat Jan 21 14:13:41 UTC 2012


commit 283a443ac02cab9e5589d8e36546ba531d1d34ad
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sat Jan 21 15:13:29 2012 +0100

    Fix build with png15

 mhgui-0.2-newpng.patch |   12 ++++++++++++
 mhgui.spec             |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mhgui-0.2-newpng.patch b/mhgui-0.2-newpng.patch
new file mode 100644
index 0000000..bd1976e
--- /dev/null
+++ b/mhgui-0.2-newpng.patch
@@ -0,0 +1,12 @@
+diff -up mhgui-0.2/include/mhgui/ImageData.h.png15 mhgui-0.2/include/mhgui/ImageData.h
+--- mhgui-0.2/include/mhgui/ImageData.h.png15	2007-12-12 22:07:20.000000000 +0100
++++ mhgui-0.2/include/mhgui/ImageData.h	2012-01-21 15:10:13.179933285 +0100
+@@ -67,7 +67,7 @@ class ImageData
+ private:
+   char         *image_data; /* raw png image data */
+   char         *end_bufferPtr;
+-  unsigned long width, height;
++  png_uint_32   width, height;
+   unsigned int  bytesPerRow;
+   bool          alpha;
+ 
diff --git a/mhgui.spec b/mhgui.spec
index 7a70211..234585d 100644
--- a/mhgui.spec
+++ b/mhgui.spec
@@ -1,6 +1,6 @@
 Name:           mhgui
 Version:        0.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A simple GUI library for MakeHuman
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ License:        GPLv3+
 URL:            http://www.dedalo-3d.com
 Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
 Patch0:         mhgui-0.1-pkgconfig.patch
+Patch1:         mhgui-0.2-newpng.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  animorph-devel >= 0.3
@@ -42,6 +43,7 @@ for f in mhgui*.in config.h.in ; do
   touch -r README $f
 done
 %patch0 -p1 -b .pkgconfig
+%patch1 -p1 -b .png15
 
 
 %build
@@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 21 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.2-12
+- Fix build with png15
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list