commit 5ca86ae1e2309e38912f0f780c087c6a5746a8b6
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Tue Nov 14 15:48:19 2017 +0100
- updated to 1.6.34
libpng-pngminus.patch | 32 --------------------------------
libpng.spec | 6 +++---
2 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/libpng.spec b/libpng.spec
index 3bcf491..12627ce 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -13,16 +13,16 @@ Summary(pl.UTF-8): Biblioteka PNG
Summary(pt_BR.UTF-8): Biblioteca PNG
Summary(tr.UTF-8): PNG kitaplığı
Name: libpng
-Version: 1.6.32
+Version: 1.6.34
Release: 1
Epoch: 2
License: distributable
Group: Libraries
Source0:
http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: e01be057a9369183c959b793a685ad15
+# Source0-md5: c05b6ca7190a5e387b78657dbe5536b2
Patch0: %{name}-pngminus.patch
Patch1:
http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz
-# Patch1-md5: 1760dbaa13c2569fdda6d83f6483701e
+# Patch1-md5: d7a82f1aa85ba628556fb7bd1428668b
URL: http://www.libpng.org/pub/png/libpng.html
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: tar >= 1:1.22
diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index d8be596..d929f9f 100644
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -38,35 +38,3 @@
png2pnm$(O): png2pnm$(C)
$(CC) -c $(CFLAGS) png2pnm$(C)
---- libpng-1.6.32/contrib/pngminus/pnm2png.c~ 2017-08-24 21:44:51.000000000
+0200
-+++ libpng-1.6.32/contrib/pngminus/pnm2png.c 2017-10-22 11:21:14.284686698
+0200
-@@ -376,7 +376,7 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_
- /* row_bytes is the width x number of channels x (bit-depth / 8) */
- row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2);
-
-- if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes)
-+ if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes))
- {
- /* too big */
- return FALSE;
---- libpng-1.6.32/contrib/pngminus/png2pnm.c~ 2017-08-24 21:44:51.000000000
+0200
-+++ libpng-1.6.32/contrib/pngminus/png2pnm.c 2017-10-22 11:25:16.018590786
+0200
-@@ -443,7 +443,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_
- if (png_pixels != (unsigned char*) NULL)
- free (png_pixels);
-
-- PNG_UNUSED(raw) /* to quiet a Coverity defect */
-+
- return TRUE;
-
- } /* end of source */
---- libpng-1.6.32/contrib/pngminus/pnm2png.c~ 2017-10-22 11:26:20.000000000
+0200
-+++ libpng-1.6.32/contrib/pngminus/pnm2png.c 2017-10-22 11:26:43.537683599
+0200
-@@ -513,7 +513,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_
- if (png_pixels != (unsigned char*) NULL)
- free (png_pixels);
-
-- PNG_UNUSED(raw) /* Quiet a Coverity defect */
-
- return TRUE;
- } /* end of pnm2png */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libpng.git/commitdiff/5ca86ae1e2309e38912f0f780c087c6a5746a8b6
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
