From: Jan Rękorajski Date: Sun, 29 May 2016 19:23:13 +0000 (+0200) Subject: - drop use of 'restrict' keywork X-Git-Tag: auto/th/DevIL-1.7.8-15~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6de980dc14b99dccd8f2957b0a6c495cb1b5c066;p=packages%2FDevIL.git - drop use of 'restrict' keywork --- diff --git a/DevIL.spec b/DevIL.spec index 88d759f..2df8041 100644 --- a/DevIL.spec +++ b/DevIL.spec @@ -27,6 +27,7 @@ Source2: http://downloads.sourceforge.net/openil/%{name}-docs.tar.gz Patch0: libpng14.patch Patch1: %{name}-squish.patch Patch2: %{name}-as-needed.patch +Patch3: gcc5.patch URL: http://openil.sourceforge.net/ BuildRequires: OpenEXR-devel BuildRequires: OpenGL-GLU-devel @@ -175,6 +176,7 @@ Dokumentacja DevIL. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cd devil-%{version} diff --git a/gcc5.patch b/gcc5.patch new file mode 100644 index 0000000..5064ad6 --- /dev/null +++ b/gcc5.patch @@ -0,0 +1,16 @@ +--- DevIL-1.7.8/devil-1.7.8/include/IL/il.h~ 2016-05-29 21:20:26.000000000 +0200 ++++ DevIL-1.7.8/devil-1.7.8/include/IL/il.h 2016-05-29 21:20:43.592020762 +0200 +@@ -63,13 +63,8 @@ + #endif + #endif + +-#ifdef RESTRICT_KEYWORD +-#define RESTRICT restrict +-#define CONST_RESTRICT const restrict +-#else + #define RESTRICT + #define CONST_RESTRICT const +-#endif + + #include +