summaryrefslogtreecommitdiff
path: root/source/l/imagemagick
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/imagemagick')
-rw-r--r--source/l/imagemagick/ImageMagick.fix.overloading.error.diff16
-rwxr-xr-xsource/l/imagemagick/imagemagick.SlackBuild6
2 files changed, 21 insertions, 1 deletions
diff --git a/source/l/imagemagick/ImageMagick.fix.overloading.error.diff b/source/l/imagemagick/ImageMagick.fix.overloading.error.diff
new file mode 100644
index 00000000..0306390f
--- /dev/null
+++ b/source/l/imagemagick/ImageMagick.fix.overloading.error.diff
@@ -0,0 +1,16 @@
+--- ./Magick++/lib/Magick++/Color.h.orig 2018-08-28 07:31:12.000000000 -0500
++++ ./Magick++/lib/Magick++/Color.h 2018-09-20 21:57:14.555014712 -0500
+@@ -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/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index aab17f3f..0741fbb2 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -60,7 +60,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -103,6 +103,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix an error that only occurs on 32-bit, but I'm pretty sure that this
+# needed an #else in there:
+zcat $CWD/ImageMagick.fix.overloading.error.diff.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \