packages: earth3d/earth3d.spec, earth3d/libpng.patch (NEW) - patch for libpng

glen glen at pld-linux.org
Thu Jun 23 10:39:26 CEST 2011


Author: glen                         Date: Thu Jun 23 08:39:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch for libpng

---- Files affected:
packages/earth3d:
   earth3d.spec (1.2 -> 1.3) , libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/earth3d/earth3d.spec
diff -u packages/earth3d/earth3d.spec:1.2 packages/earth3d/earth3d.spec:1.3
--- packages/earth3d/earth3d.spec:1.2	Thu Jun 23 10:21:36 2011
+++ packages/earth3d/earth3d.spec	Thu Jun 23 10:39:21 2011
@@ -8,6 +8,7 @@
 Source0:	http://downloads.sourceforge.net/earth3d/%{name}_client-%{version}-src.tar.bz2
 # Source0-md5:	d273437a473f66401b01acf7521808c3
 Patch0:		gcc.patch
+Patch1:		libpng.patch
 URL:		http://www.earth3d.org/
 BuildRequires:	ImageMagick-devel
 BuildRequires:	qt-devel
@@ -20,6 +21,7 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=/usr
@@ -47,6 +49,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/06/23 08:39:21  glen
+- patch for libpng
+
 Revision 1.2  2011/06/23 08:21:36  glen
 - missing headers for g++
 

================================================================
Index: packages/earth3d/libpng.patch
diff -u /dev/null packages/earth3d/libpng.patch:1.1
--- /dev/null	Thu Jun 23 10:39:26 2011
+++ packages/earth3d/libpng.patch	Thu Jun 23 10:39:21 2011
@@ -0,0 +1,20 @@
+--- earth3d/pngutils.cpp~	2011-06-23 11:38:20.000000000 +0300
++++ earth3d/pngutils.cpp	2011-06-23 11:38:22.730048870 +0300
+@@ -28,7 +28,7 @@
+     /* read image */
+     int depth, color_type, interlace_type;
+ 
+-    png_read_png(png_ptr, info_ptr, 0, png_voidp_NULL);
++    png_read_png(png_ptr, info_ptr, 0, NULL);
+ //     png_read_end(png_ptr, info_ptr);
+     height = png_get_image_height(png_ptr, info_ptr);
+     width  = png_get_image_width(png_ptr, info_ptr);
+@@ -60,7 +60,7 @@
+    }
+    
+    /* clean */
+-   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ //     png_set_read_fn(png_ptr, NULL, NULL);
+    delete(inbuffer);
+ #ifdef EARTH3DDEBUG
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/earth3d/earth3d.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list