Merge branch 'master' into i486

2 files changed, 28 insertions, 0 deletions

diff --git a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch b/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch
new file mode 100644
index 00000000..57e22254
--- /dev/null
+++ b/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch
@@ -0,0 +1,17 @@
+diff -rauN ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h
+--- ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h	2018-08-28 14:31:12.000000000 +0200
++++ ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h	2018-09-01 15:14:05.133038562 +0200
+@@ -122,11 +122,12 @@
+     {
+       return (static_cast<double>(quantum_)/QuantumRange);
+     }
+-#endif
++#else
+     static double scaleQuantumToDouble(const double quantum_)
+     {
+       return (quantum_/QuantumRange);
+     }
++#endif
+ 
+   protected:
+ 
diff --git a/extra/imagemagick6/PKGBUILD b/extra/imagemagick6/PKGBUILD
new file mode 100644
index 00000000..c16dae59
--- /dev/null
+++ b/extra/imagemagick6/PKGBUILD
@@ -0,0 +1,11 @@
+# see https://github.com/ImageMagick/ImageMagick6/issues/17
+
+source+=('ImageMagick-6.9.10-11-bug17.patch')
+sha256sums+=('59592dba2feebf4457e0d79e95bd212f41a6e6bbec0ed7d3aaf43328047e9c96')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch/ a patch -Np1 -i ../ImageMagick-6.9.10-11-bug17.patch
+    '
+)"