Accepting request 509235 from home:Andreas_Schwab:Factory

- png-version-info-only.patch: fix missing PNG_VERSION_INFO_ONLY check

OBS-URL: https://build.opensuse.org/request/show/509235
OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=96

libpng16.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 10 15:11:14 UTC 2017 - schwab@suse.de
+
+- png-version-info-only.patch: fix missing PNG_VERSION_INFO_ONLY check
+
 -------------------------------------------------------------------
 Fri Jun 30 15:48:21 UTC 2017 - pgajdos@suse.com
 

libpng16.spec

@@ -35,6 +35,7 @@ Source1:        ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{versio
 Source2:        libpng16.keyring
 Source3:        rpm-macros.libpng-tools
 Source4:        baselibs.conf
+Patch0:         png-version-info-only.patch
 #BuildRequires:  gpg-offline
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -109,6 +110,7 @@ PNG files.
 
 %prep
 %setup -n libpng-%{version}
+%patch0 -p1
 
 %build
 # PNG_SAFE_LIMITS_SUPPORTED: http://www.openwall.com/lists/oss-security/2015/01/10/1

png-version-info-only.patch

@@ -0,0 +1,20 @@
+Index: libpng-1.6.30/pngpriv.h
+===================================================================
+--- libpng-1.6.30.orig/pngpriv.h
++++ libpng-1.6.30/pngpriv.h
+@@ -466,6 +466,7 @@
+    static_cast<type>(static_cast<const void*>(value))
+ #else
+ #  define png_voidcast(type, value) (value)
++#  ifndef PNG_VERSION_INFO_ONLY
+ #  ifdef _WIN64
+ #     ifdef __GNUC__
+          typedef unsigned long long png_ptruint;
+@@ -475,6 +476,7 @@
+ #  else
+       typedef unsigned long png_ptruint;
+ #  endif
++#  endif
+ #  define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value))
+ #  define png_aligncast(type, value) ((void*)(value))
+ #  define png_aligncastconst(type, value) ((const void*)(value))