From ff82da05598eac3c4c1e908bf74935310bdfef81 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 27 Oct 2018 18:22:46 +0000 Subject: Sat Oct 27 18:22:46 UTC 2018 d/rust-1.30.0-x86_64-1.txz: Upgraded. l/gdbm-1.18.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_14-x86_64-1.txz: Upgraded. l/mozilla-nss-3.40-x86_64-1.txz: Upgraded. x/libevdev-1.6.0-x86_64-1.txz: Upgraded. --- .../l/imagemagick/ImageMagick.fix.overloading.error.diff | 16 ---------------- source/l/imagemagick/imagemagick.SlackBuild | 4 ---- 2 files changed, 20 deletions(-) delete mode 100644 source/l/imagemagick/ImageMagick.fix.overloading.error.diff (limited to 'source/l/imagemagick') diff --git a/source/l/imagemagick/ImageMagick.fix.overloading.error.diff b/source/l/imagemagick/ImageMagick.fix.overloading.error.diff deleted file mode 100644 index 0306390fd..000000000 --- a/source/l/imagemagick/ImageMagick.fix.overloading.error.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- ./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(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 0741fbb2b..cf231ac5d 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -103,10 +103,6 @@ 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 \ -- cgit v1.2.3