Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

imagemagick: Update to 7.0.8.1

Browse Source
This commit is contained in:
Alexey Pavlov
2018-06-18 20:52:25 +03:00
parent a43a3243fe
commit 5f75ea909e
2 changed files with 19 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
mingw-w64-imagemagick/003-7.0.1.8-cplusplus-fixes.patch
View File

@@ -1,217 +0,0 @@
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Blob.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Blob.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Blob.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Blob.cpp 2016-06-03 13:22:18.419489600 +0300
@@ -13,8 +13,6 @@
#include "Magick++/Blob.h"
#include "Magick++/BlobRef.h"
-#include <string.h>
-
Magick::Blob::Blob(void)
: _blobRef(new Magick::BlobRef(0,0))
{
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/BlobRef.cpp ImageMagick-7.0.1-8-p/Magick++/lib/BlobRef.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/BlobRef.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/BlobRef.cpp 2016-06-03 13:23:05.051825900 +0300
@@ -9,12 +9,8 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
#include "Magick++/BlobRef.h"
#include "Magick++/Exception.h"
-#include "Magick++/Thread.h"
-
-#include <string.h>
Magick::BlobRef::BlobRef(const void* data_,const size_t length_)
: allocator(Magick::Blob::NewAllocator),
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/CoderInfo.cpp ImageMagick-7.0.1-8-p/Magick++/lib/CoderInfo.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/CoderInfo.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/CoderInfo.cpp 2016-06-03 13:23:18.049526000 +0300
@@ -9,7 +9,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
#include "Magick++/CoderInfo.h"
#include "Magick++/Exception.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Color.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Color.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Color.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Color.cpp 2016-06-03 13:23:37.062624500 +0300
@@ -9,9 +9,6 @@
#define MAGICKCORE_IMPLEMENTATION
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
-#include <string>
-
using namespace std;
#include "Magick++/Color.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Drawable.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Drawable.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Drawable.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Drawable.cpp 2016-06-03 13:24:06.666044400 +0300
@@ -10,9 +10,7 @@
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#define MAGICK_DRAWABLE_IMPLEMENTATION
-#include "Magick++/Include.h"
#include <math.h>
-#include <string>
#include "Magick++/Drawable.h"
#include "Magick++/Image.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Exception.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Exception.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Exception.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Exception.cpp 2016-06-03 13:24:23.897044400 +0300
@@ -9,10 +9,7 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
-#include <string>
#include <errno.h>
-#include <string.h>
using namespace std;
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Functions.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Functions.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Functions.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Functions.cpp 2016-06-03 13:24:53.376044400 +0300
@@ -9,9 +9,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
-#include <string>
-
using namespace std;
#include "Magick++/Functions.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Geometry.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Geometry.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Geometry.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Geometry.cpp 2016-06-03 13:25:06.583044400 +0300
@@ -9,8 +9,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
-#include <string>
#include <ctype.h> // for isdigit
#if !defined(MAGICKCORE_WINDOWS_SUPPORT)
#include <strings.h>
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Image.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Image.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Image.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Image.cpp 2016-06-03 13:25:17.758044400 +0300
@@ -9,10 +9,7 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
#include <cstdlib>
-#include <string>
-#include <string.h>
#include <errno.h>
#include <math.h>
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Magick++/ImageRef.h ImageMagick-7.0.1-8-p/Magick++/lib/Magick++/ImageRef.h
--- ImageMagick-7.0.1-8/Magick++/lib/Magick++/ImageRef.h 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Magick++/ImageRef.h 2016-06-03 13:26:21.323044400 +0300
@@ -12,9 +12,9 @@
#if !defined(Magick_ImageRef_header)
#define Magick_ImageRef_header
-#include <string>
#include "Magick++/Include.h"
#include "Magick++/Thread.h"
+#include <string>
namespace Magick
{
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Magick++/Include.h ImageMagick-7.0.1-8-p/Magick++/lib/Magick++/Include.h
--- ImageMagick-7.0.1-8/Magick++/lib/Magick++/Include.h 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Magick++/Include.h 2016-06-03 13:20:45.313801100 +0300
@@ -24,6 +24,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <time.h>
+#include <string.h>
#include <math.h>
#include <sys/types.h>
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Magick++/Options.h ImageMagick-7.0.1-8-p/Magick++/lib/Magick++/Options.h
--- ImageMagick-7.0.1-8/Magick++/lib/Magick++/Options.h 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Magick++/Options.h 2016-06-03 13:16:53.143983600 +0300
@@ -15,8 +15,8 @@
#if !defined(Magick_Options_header)
#define Magick_Options_header
-#include "Magick++/Include.h"
#include <string>
+#include "Magick++/Include.h"
#include "Magick++/Color.h"
#include "Magick++/Geometry.h"
#include "Magick++/Drawable.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Montage.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Montage.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Montage.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Montage.cpp 2016-06-03 13:26:32.298044400 +0300
@@ -8,10 +8,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
-#include <string>
-#include <string.h>
-
#include "Magick++/Montage.h"
#include "Magick++/Functions.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Options.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Options.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Options.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Options.cpp 2016-06-03 13:26:44.889242100 +0300
@@ -11,9 +11,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
-#include <string>
-#include <string.h>
#include <stdlib.h>
#include <math.h>
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Statistic.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Statistic.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Statistic.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Statistic.cpp 2016-06-03 13:26:54.561795400 +0300
@@ -8,7 +8,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
#include "Magick++/Exception.h"
#include "Magick++/Statistic.h"
#include "Magick++/Image.h"
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/Thread.cpp ImageMagick-7.0.1-8-p/Magick++/lib/Thread.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/Thread.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/Thread.cpp 2016-06-03 13:27:44.874448000 +0300
@@ -12,8 +12,6 @@
#include "Magick++/Thread.h"
#include "Magick++/Exception.h"
-#include <string.h>
-
// Default constructor
Magick::MutexLock::MutexLock(void)
#if defined(MAGICKCORE_HAVE_PTHREAD)
diff -Naur ImageMagick-7.0.1-8/Magick++/lib/TypeMetric.cpp ImageMagick-7.0.1-8-p/Magick++/lib/TypeMetric.cpp
--- ImageMagick-7.0.1-8/Magick++/lib/TypeMetric.cpp 2016-06-01 01:23:00.000000000 +0300
+++ ImageMagick-7.0.1-8-p/Magick++/lib/TypeMetric.cpp 2016-06-03 13:27:52.337701600 +0300
@@ -10,7 +10,6 @@
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#include "Magick++/TypeMetric.h"
-#include <string.h>
Magick::TypeMetric::TypeMetric(void)
{

36
mingw-w64-imagemagick/PKGBUILD
View File

@@ -3,7 +3,9 @@
_realname=imagemagick
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=7.0.7.28
_basever=7.0.8
_rc=-1
pkgver=${_basever}${_rc//-/.}
pkgrel=1
pkgdesc="An image viewing/manipulation program (mingw-w64)"
arch=('any')
@@ -34,6 +36,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
"${MINGW_PACKAGE_PREFIX}-libtiff"
"${MINGW_PACKAGE_PREFIX}-libtool"
"${MINGW_PACKAGE_PREFIX}-libwebp"
"${MINGW_PACKAGE_PREFIX}-libxml2"
"${MINGW_PACKAGE_PREFIX}-openjpeg2"
#"${MINGW_PACKAGE_PREFIX}-perl"
"${MINGW_PACKAGE_PREFIX}-ttf-dejavu"
@@ -43,24 +46,23 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
optdepends=("${MINGW_PACKAGE_PREFIX}-ghostscript: for Ghostscript support"
"${MINGW_PACKAGE_PREFIX}-openexr: for OpenEXR support"
"${MINGW_PACKAGE_PREFIX}-librsvg: for SVG support"
"${MINGW_PACKAGE_PREFIX}-libxml2: for XML support"
#"${MINGW_PACKAGE_PREFIX}-libxml2: for XML support"
#"${MINGW_PACKAGE_PREFIX}-jasper: for JPEG-2000 support"
#"${MINGW_PACKAGE_PREFIX}-libpng: for PNG support"
#"${MINGW_PACKAGE_PREFIX}-libtiff: for PNG support"
#"${MINGW_PACKAGE_PREFIX}-libwebp: for WEBP support"
)
options=('staticlibs' 'strip' '!debug' 'libtool')
source=(https://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
source=(#https://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
https://www.imagemagick.org/download/ImageMagick-${_basever}${_rc}.tar.xz{,.asc}
ImageMagick-7.0.1.3-mingw.patch
001-7.0.4.1-relocate.patch
002-7.0.4.1-build-fixes.patch
003-7.0.1.8-cplusplus-fixes.patch)
sha256sums=('e8311c2dd536367808a633aa3f4f0f6b1a34d04ed06b3db59c21d43cab41d4ce'
002-7.0.4.1-build-fixes.patch)
sha256sums=('94b578a2af43b57d4fa6916eeb42e78336436e48605c354687abdff0753b9565'
'SKIP'
'313e781918c66a2acfdbd99fab3de2fd680c34efdaaab18318d7543d4c79bb3e'
'c4170e9d32cd3f2a4003d1a4a34d24993dac17dff940158314313845062ada59'
'd9167b6a19cd78cd55b42abf62b49ff505def21b97a1d3fa670885ae58b155d4'
'f628755b79753c00a22471a9562f5abcba67702f2156b38aa0e9b83d3644960a')
'd9167b6a19cd78cd55b42abf62b49ff505def21b97a1d3fa670885ae58b155d4')
#Lexie Parsimoniae (ImageMagick code signing key) <lexie.parsimoniae@imagemagick.org>
validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
@@ -69,7 +71,7 @@ apply_patch_with_msg() {
for _patch in "$@"
do
msg2 "Applying $_patch"
patch -Nbp1 -i "${srcdir}/$_patch"
patch -Nbp1 -i "${srcdir}/${_patch}"
done
}
@@ -84,15 +86,15 @@ del_file_exists() {
# =========================================== #
prepare() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
cd ImageMagick-${_basever}${_rc}
del_file_exists \
MagickCore/pathtools.c \
MagickCore/pathtools.h
apply_patch_with_msg \
ImageMagick-7.0.1.3-mingw.patch \
001-7.0.4.1-relocate.patch \
002-7.0.4.1-build-fixes.patch \
003-7.0.1.8-cplusplus-fixes.patch
002-7.0.4.1-build-fixes.patch
autoreconf -fi
}
@@ -102,11 +104,11 @@ build() {
[[ $CARCH = "x86_64" ]] && EXTRAOPTS="" #EXTRAOPTS="--with-gcc-arch=x86-64"
[[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
# We can't use Magic++ portion due to a bug:
# https://github.com/ImageMagick/ImageMagick/issues/188
#--with-lcms2, --with-opencl, --without-ltdl
mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
../ImageMagick-${pkgver%.*}-${pkgver##*.}/configure \
#--with-lcms2, --with-opencl, --without-ltdl
../ImageMagick-${_basever}${_rc}/configure \
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
@@ -159,8 +161,8 @@ package() {
#find . -name "*.xml" -exec sed -i "s/${MINGW_PREFIX}/newWord/g" '{}' \;
install -Dm644 ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
install -Dm644 ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}/NOTICE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/NOTICE"
install -Dm644 ${srcdir}/ImageMagick-${_basever}${_rc}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
install -Dm644 ${srcdir}/ImageMagick-${_basever}${_rc}/NOTICE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/NOTICE"
local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
# fix hard-coded pathes in XML files.