From cc0cfeb3939487923509541e178c27711dfe1d56 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Wed, 5 Jul 2017 09:11:28 +0700
Subject: graphics/exact-image: Fix build on -current.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/exact-image/c98.patch              | 12 ++++++++++++
 graphics/exact-image/exact-image.SlackBuild |  5 ++++-
 graphics/exact-image/raw.patch              | 11 +++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 graphics/exact-image/c98.patch
 create mode 100644 graphics/exact-image/raw.patch

(limited to 'graphics')

diff --git a/graphics/exact-image/c98.patch b/graphics/exact-image/c98.patch
new file mode 100644
index 0000000000..2c8d42a285
--- /dev/null
+++ b/graphics/exact-image/c98.patch
@@ -0,0 +1,12 @@
+--- exact-image-0.9.2/Makefile.orig	2016-12-12 09:23:11.937243882 +0000
++++ exact-image-0.9.2/Makefile	2016-12-12 09:27:03.967245907 +0000
+@@ -48,7 +48,7 @@
+ # we have some unimplemented colorspaces in the Image::iterator :-(
+ CFLAGS += $(call cc-option,-Wno-switch -Wno-switch-enum,)
+ 
+-CXXFLAGS := $(CFLAGS) -Wno-sign-compare
++CXXFLAGS := $(CFLAGS) -Wno-sign-compare -std=gnu++98
+ 
+ ifeq "$(STATIC)" "1"
+ X_EXEFLAGS += -static
+
diff --git a/graphics/exact-image/exact-image.SlackBuild b/graphics/exact-image/exact-image.SlackBuild
index 790c5c8631..062349e00f 100644
--- a/graphics/exact-image/exact-image.SlackBuild
+++ b/graphics/exact-image/exact-image.SlackBuild
@@ -56,12 +56,15 @@ sed "s,@vendorlib@,$vendorlib,g" $CWD/fixup-perl_paths.diff | patch -p1 --verbos
 # Fix for swig-3.0.7
 sed -i -e '/^# manually/d' api/api-swig.hh
 
+patch -p1 < $CWD/c98.patch
+patch -p1 < $CWD/raw.patch
+
 ./configure \
   --bindir=/usr/bin \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --without-php
 
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS -Wno-narrowing -fpermissive"
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/graphics/exact-image/raw.patch b/graphics/exact-image/raw.patch
new file mode 100644
index 0000000000..555fef4fc1
--- /dev/null
+++ b/graphics/exact-image/raw.patch
@@ -0,0 +1,11 @@
+--- exact-image-0.9.2/codecs/raw.cc.orig	2017-07-05 09:07:52.988538841 +0700
++++ exact-image-0.9.2/codecs/raw.cc	2017-07-05 09:08:21.813539168 +0700
+@@ -71,7 +71,7 @@
+   if (!image.getRawData())
+     return false;
+ 
+-  return stream->write ((char*)image.getRawData(), image.stride()*image.h)
++  return (bool) stream->write ((char*)image.getRawData(), image.stride()*image.h)
+     /* ==
+        (size_t) image.stride()*image.h*/;
+ }
-- 
cgit v1.2.3