Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libraries/DevIL: Add patch for gcc 5.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Dugan Chen 2015-11-26 23:33:32 +07:00 committed by Willy Sudiarto Raharjo
parent b6c74f9319
commit b7ef55005e
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/DevIL/DevIL.SlackBuild
View file

@ -8,7 +8,7 @@
PRGNAM=DevIL
SRCNAM=devil
VERSION=${VERSION:-1.7.8}
BUILD=${BUILD:-2}
BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -51,7 +51,10 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix build with gcc5
patch -p0 < $CWD/patch-include_IL_il.h
# Build against libpng14, not libpng12.
sed -i 's/png12/png14/g' configure

13
libraries/DevIL/patch-include_IL_il.h Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-include_IL_il.h,v 1.1 2012/07/09 19:16:33 joerg Exp $
--- include/IL/il.h.orig 2012-07-06 12:31:13.000000000 +0000
+++ include/IL/il.h
@@ -63,7 +63,7 @@ extern "C" {
#endif
#endif
-#ifdef RESTRICT_KEYWORD
+#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
#define RESTRICT restrict
#define CONST_RESTRICT const restrict
#else