From adc74c9aef335a24c859c0316f24f6f929ab0c12 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 19:10:26 +0300 Subject: freeimage: update patch: fix build with GCC >= 6.x --- src/freeimage-1-fixes.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index ba6bdbc..bcc626c 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -76,3 +76,22 @@ index 1111111..2222222 100644 CXXFLAGS += $(INCLUDE) ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) + +From: Boris Pek +Date: Wed, 04 May 2016 18:43:16 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +diff --git a/Makefile.mingw b/Makefile.mingw +index 1111111..2222222 100644 +--- a/Makefile.mingw ++++ b/Makefile.mingw +@@ -67,7 +67,7 @@ + RESOURCE = $(RCFILE:.rc=.coff) + CFLAGS ?= -O3 -fexceptions -DNDEBUG $(WIN32_CFLAGS) + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -DNDEBUG $(WIN32_CXXFLAGS) ++CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -Wno-narrowing -DNDEBUG $(WIN32_CXXFLAGS) + CXXFLAGS += $(INCLUDE) + RCFLAGS ?= -DNDEBUG + LDFLAGS ?= -s -shared -static -Wl,-soname,$(SOLIBNAME) $(WIN32_LDFLAGS) + -- cgit v0.12