pool/libpng16
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 511457 from home:StefanBruens:branches:graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/511457
OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=98
This commit is contained in:
Ismail Dönmez
2017-07-20 09:32:06 +00:00
committed by Git OBS Bridge
parent 58b3c5b66a
commit d230136457
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpng16.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 19 15:51:28 UTC 2017 - stefan.bruens@rwth-aachen.de
- Drop png-version-info-only.patch, it has no effect after applying
0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
Both patches achieve the same, prefer the upstream version
-------------------------------------------------------------------
Fri Jul 14 15:57:51 UTC 2017 - stefan.bruens@rwth-aachen.de

4
libpng16.spec
View File

@@ -35,9 +35,8 @@ 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
# PATCH-FIX-UPSTREAM 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch stefan.bruens@rwth-aachen.de -- Cherry-pick upstream fix for ARM build, fixed in 1.6.31
Patch1: 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
Patch0: 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
#BuildRequires: gpg-offline
BuildRequires: libtool
BuildRequires: pkg-config
@@ -113,7 +112,6 @@ PNG files.
%prep
%setup -n libpng-%{version}
%patch0 -p1
%patch1 -p1
%build
# PNG_SAFE_LIMITS_SUPPORTED: http://www.openwall.com/lists/oss-security/2015/01/10/1

20
png-version-info-only.patch
View File

@@ -1,20 +0,0 @@
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))