rpms/libpng10/devel libpng-1.0.49-garbage.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 libpng10.spec, 1.33, 1.34 sources, 1.23, 1.24
Paul Howarth
pghmcfc at fedoraproject.org
Fri Sep 11 06:26:01 UTC 2009
Author: pghmcfc
Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16755
Modified Files:
.cvsignore libpng10.spec sources
Added Files:
libpng-1.0.49-garbage.patch
Log Message:
update to 1.0.49 (minor bugfixes)
patch out garbage in source files left over from edit gone wrong
libpng-1.0.49-garbage.patch:
pngset.c | 10 +++++-----
pngwutil.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE libpng-1.0.49-garbage.patch ---
diff -ur libpng-1.0.49.orig/pngset.c libpng-1.0.49/pngset.c
--- libpng-1.0.49.orig/pngset.c 2009-09-10 12:38:26.000000000 +0100
+++ libpng-1.0.49/pngset.c 2009-09-10 23:06:25.000000000 +0100
@@ -901,17 +901,17 @@
#if defined(PNG_tRNS_SUPPORTED)
void PNGAPI
png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
- png_bytep %TA%, int num_trans, png_color_16p trans_values)
+ png_bytep trans, int num_trans, png_color_16p trans_values)
{
png_debug1(1, "in %s storage function", "tRNS");
if (png_ptr == NULL || info_ptr == NULL)
return;
- if (%TA% != NULL)
+ if (trans != NULL)
{
/*
- * It may not actually be necessary to set png_ptr->%TA% here;
+ * It may not actually be necessary to set png_ptr->trans here;
* we do it for backward compatibility with the way the png_handle_tRNS
* function used to do the allocation.
*/
@@ -921,10 +921,10 @@
#endif
/* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
- png_ptr->%TA% = info_ptr->%TA% = (png_bytep)png_malloc(png_ptr,
+ png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
(png_uint_32)PNG_MAX_PALETTE_LENGTH);
if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
- png_memcpy(info_ptr->%TA%, %TA%, (png_size_t)num_trans);
+ png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);
}
if (trans_values != NULL)
diff -ur libpng-1.0.49.orig/pngwutil.c libpng-1.0.49/pngwutil.c
--- libpng-1.0.49.orig/pngwutil.c 2009-09-10 12:38:26.000000000 +0100
+++ libpng-1.0.49/pngwutil.c 2009-09-10 23:06:25.000000000 +0100
@@ -1068,7 +1068,7 @@
#if defined(PNG_WRITE_tRNS_SUPPORTED)
/* Write the tRNS chunk */
void /* PRIVATE */
-png_write_tRNS(png_structp png_ptr, png_bytep %TA%, png_color_16p tran,
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
int num_trans, int color_type)
{
#ifdef PNG_USE_LOCAL_ARRAYS
@@ -1086,7 +1086,7 @@
return;
}
/* Write the chunk out as it is */
- png_write_chunk(png_ptr, (png_bytep)png_tRNS, %TA%,
+ png_write_chunk(png_ptr, (png_bytep)png_tRNS, trans,
(png_size_t)num_trans);
}
else if (color_type == PNG_COLOR_TYPE_GRAY)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore 13 Aug 2009 15:45:11 -0000 1.23
+++ .cvsignore 11 Sep 2009 06:25:59 -0000 1.24
@@ -1 +1 @@
-libpng-1.0.48.tar.bz2
+libpng-1.0.49.tar.bz2
Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libpng10.spec 13 Aug 2009 15:45:12 -0000 1.33
+++ libpng10.spec 11 Sep 2009 06:25:59 -0000 1.34
@@ -1,12 +1,13 @@
Summary: Old version of libpng, needed to run old binaries
Name: libpng10
-Version: 1.0.48
+Version: 1.0.49
Release: 1%{?dist}
License: zlib
Group: System Environment/Libraries
URL: http://www.libpng.org/pub/png/libpng.html
Source: ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
Patch0: libpng-1.0.48-soname.patch
+Patch1: libpng-1.0.49-garbage.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
Conflicts: libpng < 2:1.2.0
@@ -38,6 +39,9 @@ libpng10-devel.
# We want an soname of 2.%{version}
%patch0 -p1 -b .soname
+# Apply edit upstream forgot to do
+%patch1 -p1 -b .garbage
+
%build
%configure \
--disable-static \
@@ -111,6 +115,10 @@ libpng10-devel.
%{_libdir}/pkgconfig/libpng10.pc
%changelog
+* Thu Sep 10 2009 Paul Howarth <paul at city-fan.org> 1.0.49-1
+- update to 1.0.49 (minor bugfixes)
+- patch out garbage in source files left over from edit gone wrong
+
* Thu Aug 13 2009 Paul Howarth <paul at city-fan.org> 1.0.48-1
- update to 1.0.48
- avoid a possible NULL dereference in debug build, in png_set_text_2()
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 13 Aug 2009 15:45:12 -0000 1.23
+++ sources 11 Sep 2009 06:25:59 -0000 1.24
@@ -1 +1 @@
-e440d8789d8ce5563d4ada7e57a8b0ac libpng-1.0.48.tar.bz2
+77fd98589f10710c1413fcbf5605372f libpng-1.0.49.tar.bz2
More information about the fedora-extras-commits
mailing list