gentoo resync : 16.11.2017

3 files changed, 98 insertions, 2 deletions

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index eded45fb3c1f..2554209dfcf3 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,5 +1,6 @@
+AUX kxstitch-2.0.0-imagemagick-7.patch 3642 SHA256 4e190d213432016cedc07e8f2883353725f8f637326c43b2c8377f46d4cc0bb8 SHA512 f47a5872e2d5da00db3f3f0dd37ce567f7001073b9f273973d4b2ce615e18d8f306dcc4dd38185d65b1b065a569f376bfb3e49e977cc9d72da253268405ec2b8 WHIRLPOOL a4a8774eb1e715f14a340ef9baa69066fa7fe25ed0131afe0ee462c7eaa3627ff1ed8c54811fff6b2de3a0dd2f10ea3e7abb6c2551113364caf48a7eb5d4f01e
 DIST kxstitch-2.0.0.tar.xz 1681648 SHA256 430db19729c907c845d35e2ab3887ace2bc21913ab08ea7471c71c9b84fcc783 SHA512 0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f WHIRLPOOL 1c4965e7b536e2d6a2f98855372798c305840238e068465d95c2e2fccb7db419f049ad19d45461ccad544be8c55fcbd47c6cb02fc3c9dd333cbfca8a446e1e53
-EBUILD kxstitch-2.0.0.ebuild 914 SHA256 a3b8eade8dae65c523da3b013db5bdf1d3a5163d4361da61093c879bfa0516c6 SHA512 77511facc7ef6482b6bd6cff08ae82769849715475c1f5c57b62ea8dface2d416f7ac8b7dabb06d77504899771f4a71b37d49cb40edea787de9f799239512dd3 WHIRLPOOL 5225173272599b9e532c2a3dddb7042bd4e4f5752b913d8100ed64f3d69a6e2a2b2a866eff762ce8fb2e97cb7cf2e1af76f451f8d9f340a2354365cea906d691
+EBUILD kxstitch-2.0.0.ebuild 966 SHA256 1c58e2207320009fb8551c247fbed2a78bb0f73625f381a70e0819d16a59e583 SHA512 cc2c291f040c49c5a15e4cc8c5b057121539940a68f6649fad0d6bc895c3dcef774a16fefa2d806985ea6b723ea39c72471d975e9b09ec02aa58885e4f2fe24e WHIRLPOOL ae377ca789bf671e1cc63faa5b55bf21a24314eb8022e58d6ca7366583933e01db19ced49ed75a280a00edecff5ea5029a7950ffc8572dc96236672751e2be6b
 MISC ChangeLog 3189 SHA256 a4360414bdd97125df9a3657117452254935bce9764e36960b8c8279cce83a6b SHA512 fabb40574a345fedb1342c40e75aa6b1af869832f77358d991992d4e87c147a4736d42b118b965ab28c6eb4102b621ae22cee59e27f101e45a4842be13de6f7f WHIRLPOOL e1ba350a97208a125e5303b0d64ca1a0c14b6fad169d399d1b449d46fab2e5190ee132e5ae2c257848a15c760e2930643dc9f248831ca889d8c36e51d1d4d97a
 MISC ChangeLog-2015 371 SHA256 3d3d83251d5f15f7a60f395a148a54b5827fbd45f0bbf3720daa80ad678ec4ae SHA512 2b1ef332ddc40983242e7d9bb3394587de9f855ac0fb8eaf54ca17ae0928a1f8d2ad066ca8fb29898ad493591f54de9c33ec3921cb47593dcff961bb671ae6ae WHIRLPOOL 4c8701fe96150617e149e63748518671fa5cbd24fe0ef61b830256ef0f3068032736db081ca2848088c908432ec21cc4ce384a91d3971e3daa66cea88863b456
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch b/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
new file mode 100644
index 000000000000..fe53efba3027
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
@@ -0,0 +1,93 @@
+From 295773f44bfda1227d85edf065a8de14dc889159 Mon Sep 17 00:00:00 2001
+From: Steve Allewell <steve.allewell@gmail.com>
+Date: Wed, 25 Oct 2017 20:57:22 +0100
+Subject: Fix for changes to ImageMagick API for importing images
+
+---
+ src/FlossScheme.cpp    |  4 ++--
+ src/ImportImageDlg.cpp |  9 ++++++---
+ src/MainWindow.cpp     | 10 ++++++----
+ 3 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/FlossScheme.cpp b/src/FlossScheme.cpp
+index 4c59973..e4cd117 100644
+--- a/src/FlossScheme.cpp
++++ b/src/FlossScheme.cpp
+@@ -38,8 +38,8 @@ Floss *FlossScheme::convert(const QColor &color)
+     Magick::Image image = Magick::Image(1, 1, "RGB", MagickLib::CharPixel, c);
+ #endif
+     image.map(*m_map);
+-    const Magick::PixelPacket *pixels = image.getConstPixels(0, 0, 1, 1);
+-    const Magick::ColorRGB rgb = Magick::Color(*pixels);
++
++    const Magick::ColorRGB rgb = image.pixelColor(0,0);
+ 
+     return find(QColor((int)(255*rgb.red()), (int)(255*rgb.green()), (int)(255*rgb.blue())));
+ }
+diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp
+index d12ca34..79e8c38 100644
+--- a/src/ImportImageDlg.cpp
++++ b/src/ImportImageDlg.cpp
+@@ -305,9 +305,12 @@ void ImportImageDlg::renderPixmap()
+     QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, pixelCount, this);
+     progress.setWindowModality(Qt::WindowModal);
+ 
++#if MagickLibVersion < 0x700
+     bool hasTransparency = m_convertedImage.matte();
+-    const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, width, height);
+-
++#else
++    bool hasTransparency = m_convertedImage.alpha();
++#endif
++    
+     for (int dy = 0 ; dy < height ; dy++) {
+         QApplication::processEvents();
+         progress.setValue(dy * width);
+@@ -317,7 +320,7 @@ void ImportImageDlg::renderPixmap()
+         }
+ 
+         for (int dx = 0 ; dx < width ; dx++) {
+-            Magick::ColorRGB rgb = Magick::Color(*pixels++);
++            Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy);
+ 
+             if (hasTransparency && (rgb.alpha() == 1)) {
+                 //ignore this pixel as it is transparent
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 9713293..1d22e63 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -543,7 +543,11 @@ void MainWindow::convertImage(const QString &source)
+ 
+         bool useFractionals = importImageDlg->useFractionals();
+ 
++#if MagickLibVersion < 0x700
+         bool hasTransparency = convertedImage.matte();
++#else
++        bool hasTransparency = convertedImage.alpha();
++#endif
+         bool ignoreColor = importImageDlg->ignoreColor();
+         Magick::Color ignoreColorValue = importImageDlg->ignoreColorValue();
+ 
+@@ -564,8 +568,6 @@ void MainWindow::convertImage(const QString &source)
+         QProgressDialog progress(i18n("Converting to stitches"), i18n("Cancel"), 0, pixelCount, this);
+         progress.setWindowModality(Qt::WindowModal);
+ 
+-        const Magick::PixelPacket *pixels = convertedImage.getConstPixels(0, 0, imageWidth, imageHeight);
+-
+         for (int dy = 0 ; dy < imageHeight ; dy++) {
+             progress.setValue(dy * imageWidth);
+             QApplication::processEvents();
+@@ -577,8 +579,8 @@ void MainWindow::convertImage(const QString &source)
+             }
+ 
+             for (int dx = 0 ; dx < imageWidth ; dx++) {
+-                Magick::ColorRGB rgb = Magick::Color(*pixels++);
+-
++                Magick::ColorRGB rgb = convertedImage.pixelColor(dx, dy);
++                
+                 if (hasTransparency && (rgb.alpha() == 1)) {
+                     // ignore this pixel as it is transparent
+                 } else {
+-- 
+cgit v0.11.2
+
diff --git a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
index 32222fe706e3..02fe8204fac4 100644
--- a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,3 +37,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
+
+PATCHES=( "${FILESDIR}/${P}-imagemagick-7.patch" )