diff --git a/blender-gcc6.patch b/blender-gcc6.patch new file mode 100644 index 0000000..82f648d --- /dev/null +++ b/blender-gcc6.patch @@ -0,0 +1,28 @@ +--- a/intern/ghost/intern/GHOST_WindowX11.cpp ++++ b/intern/ghost/intern/GHOST_WindowX11.cpp +@@ -106,7 +106,7 @@ typedef struct { + */ + + /* See the python script above to regenerate the 48x48 icon within blender */ +-static long BLENDER_ICON_48x48x32[] = { ++static long long BLENDER_ICON_48x48x32[] = { + 48,48, + 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, + 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, +--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp ++++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +@@ -55,12 +55,13 @@ + // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + // OTHER DEALINGS IN THE SOFTWARE. + ++// Include stdlib first to restore undefined min/max behavior w/ GCC 6 ++#include // malloc + #include + #include + #include + + #include // printf +-#include // malloc + #include // sqrt + #include + diff --git a/blender.spec b/blender.spec index 5834e04..96f7fc8 100644 --- a/blender.spec +++ b/blender.spec @@ -38,6 +38,8 @@ Source5: blender.xml Source10: macros.blender Patch0: blender-2.76-droid.patch +# Patch for GCC 6 narrowing conversion error +Patch1: blender-gcc6.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -154,6 +156,7 @@ sets. %prep %setup -q %patch0 -p1 -b .droid +%patch1 -p1 -b .gcc6 find -name '.svn' -print | xargs rm -rf @@ -356,6 +359,7 @@ fi %changelog * Tue Feb 16 2016 Richard Shaw - 1:2.76-7 - Rebuild for updated openCOLLADA. +- Add patch for GCC 6 issues. * Wed Feb 03 2016 Fedora Release Engineering - 1:2.76-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild