[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/files/, media-gfx/kxstitch/

2022-11-23 Thread Andreas Sturmlechner 
commit: a6962353882cd9bb16f7e7f98040e3bc9d6c1eeb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 23 20:12:59 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 23 20:19:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6962353

media-gfx/kxstitch: Backport various upstream fixes, update EAPI 7 -> 8

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kxstitch-2.2.0-drop-xkeylock.patch   | 180 ++
 .../kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch  |  26 +++
 .../kxstitch-2.2.0-fix-render-scaled-painter.patch | 202 +
 media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild|  44 +
 4 files changed, 452 insertions(+)

diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch 
b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
new file mode 100644
index ..805a67ea97c8
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
@@ -0,0 +1,180 @@
+From f97d3eaf4c06b4740fcec63c9c0ca64a5bd56281 Mon Sep 17 00:00:00 2001
+From: Pino Toscano 
+Date: Sun, 28 Jun 2020 12:01:49 +0200
+Subject: [PATCH] cmake: require KGuiAddons
+
+It will be used soon.
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36e3169..7ccf7f0 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -32,6 +32,7 @@ find_package (KF5 REQUIRED COMPONENTS
+ Config
+ ConfigWidgets
+ Completion
++GuiAddons
+ I18n
+ KIO
+ TextWidgets
+@@ -145,6 +146,7 @@ target_link_libraries (kxstitch
+ Qt5::X11Extras
+ KF5::Completion
+ KF5::ConfigGui
++KF5::GuiAddons
+ KF5::KIOFileWidgets
+ KF5::I18n
+ KF5::TextWidgets
+-- 
+GitLab
+
+From 817be56369a25de4dd12f2548f97e4ebcfb73571 Mon Sep 17 00:00:00 2001
+From: Pino Toscano 
+Date: Sun, 28 Jun 2020 12:02:34 +0200
+Subject: [PATCH] Switch from XKeyLock to KModifierKeyInfo
+
+Use KModifierKeyInfo from the KGuiAddons framework to get the status
+of keys. In particular, use it to get the status of the Caps Lock key
+instead of the local XKeyLock implementation.
+
+The KModifierKeyInfo object is kept as class member to avoid recreating
+it at each key press in Alphabet mode.
+---
+ src/Editor.cpp | 4 +---
+ src/Editor.h   | 4 
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/Editor.cpp b/src/Editor.cpp
+index bba0760..163e88e 100644
+--- a/src/Editor.cpp
 b/src/Editor.cpp
+@@ -46,7 +46,6 @@
+ #include "Scale.h"
+ #include "SchemeManager.h"
+ #include "TextToolDlg.h"
+-#include "XKeyLock.h"
+ 
+ 
+ const Editor::keyPressCallPointer Editor::keyPressCallPointers[] = {
+@@ -858,10 +857,9 @@ void Editor::keyPressText(QKeyEvent *e)
+ 
+ void Editor::keyPressAlphabet(QKeyEvent *e)
+ {
+-XKeyLock keylock(QX11Info::display());
+ Qt::KeyboardModifiers modifiers = e->modifiers();
+ 
+-if (keylock.getCapsLock() && Configuration::alphabet_UseCapsLock()) {
++if (m_keyInfo.isKeyPressed(Qt::Key_CapsLock) && 
Configuration::alphabet_UseCapsLock()) {
+ modifiers = static_cast(modifiers ^ 
Qt::ShiftModifier);
+ }
+ 
+diff --git a/src/Editor.h b/src/Editor.h
+index 3189249..8345a38 100644
+--- a/src/Editor.h
 b/src/Editor.h
+@@ -16,6 +16,8 @@
+ #include 
+ #include 
+ 
++#include 
++
+ #include "Stitch.h"
+ 
+ #include "configuration.h"
+@@ -337,6 +339,8 @@ private:
+ QStack  m_cursorStack;
+ QMap  m_cursorCommands;
+ 
++KModifierKeyInfo m_keyInfo;
++
+ typedef void (Editor::*keyPressCallPointer)(QKeyEvent*);
+ typedef void (Editor::*toolInitCallPointer)();
+ typedef void (Editor::*toolCleanupCallPointer)();
+-- 
+GitLab
+
+From 17d6a17830ce190cd21f266dd319e36e4865e30a Mon Sep 17 00:00:00 2001
+From: Pino Toscano 
+Date: Sun, 28 Jun 2020 12:13:37 +0200
+Subject: [PATCH] Drop XKeyLock & X11 leftovers
+
+XKeyLock is not used anymore, so it can be dropped together with the
+X11 and QX11Extras requirements.
+---
+ CMakeLists.txt   |   6 --
+ src/Editor.cpp   |   1 -
+ src/XKeyLock.cpp | 202 ---
+ src/XKeyLock.h   |  70 
+ 4 files changed, 279 deletions(-)
+ delete mode 100644 src/XKeyLock.cpp
+ delete mode 100644 src/XKeyLock.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ccf7f0..c225859 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -23,7 +23,6 @@ find_package (Qt5 CONFIG REQUIRED
+ Core
+ PrintSupport
+ Widgets
+-X11Extras
+ )
+ 
+ find_package (KF5DocTools)
+@@ -41,7 +40,6 @@ find_package (KF5 REQUIRED COMPONENTS
+ )
+ 
+ find_package (ImageMagick COMPONENTS MagickCore Magick++ REQUIRED)
+-find_package (X11 REQUIRED)
+ find_package (Doxygen)
+ find_package (SharedMimeInfo)
+ 
+@@ -57,7 +55,6 @@ include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR} 
${CMAKE_CURRENT_SOURCE_D
+ # only in older cmake versions, while the latter only in newer ones
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2022-11-23 Thread Andreas Sturmlechner 
commit: de49c42eaad9730b367211be7123d694ff3f6e68
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 23 20:19:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 23 20:19:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de49c42e

media-gfx/kxstitch: drop 2.2.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/kxstitch-2.2.0.ebuild | 43 
 1 file changed, 43 deletions(-)

diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild 
b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
deleted file mode 100644
index d2ea26577868..
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="
-   sys-devel/gettext
-"
-DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/imagemagick[cxx]
-   x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-   !media-gfx/kxstitch:4
-"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2020-01-12 Thread Andreas Sturmlechner 
commit: 761824f2a33b5296c2a83592be92685f92bb5ae8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 12 10:14:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 12 10:18:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761824f2

media-gfx/kxstitch: Update HOMEPAGE

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/kxstitch-2.2.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild 
b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
index 0a57e6a1f92..3d7812d60aa 100644
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
@@ -9,7 +9,8 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://userbase.kde.org/KXStitch;
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.kxstitch
+https://userbase.kde.org/KXStitch;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2020-01-12 Thread Andreas Sturmlechner 
commit: 527117b9b91fcd1a4877aa5bec53eb8ec604e558
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 12 09:37:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 12 09:41:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527117b9

media-gfx/kxstitch: Port to ecm.eclass and kde.org.eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/kxstitch-2.2.0.ebuild | 36 +---
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild 
b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
index 94faf7f2268..0a57e6a1f92 100644
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Program to create cross stitch patterns"
 HOMEPAGE="https://userbase.kde.org/KXStitch;
@@ -19,20 +21,20 @@ BDEPEND="
sys-devel/gettext
 "
 DEPEND="
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
media-gfx/imagemagick[cxx]
x11-libs/libX11
 "

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/

2019-06-22 Thread Andreas Sturmlechner 
commit: 115ef47d90a31b86423d33845023b58fff05ca1e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 22 13:51:35 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 22 14:50:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115ef47d

media-gfx/kxstitch: Drop 2.1.1-r2

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/Manifest|  1 -
 .../files/kxstitch-2.1.1-imagemagick-fix.patch | 99 --
 .../kxstitch/files/kxstitch-2.1.1-qt-5.11.patch| 37 
 media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild| 46 --
 4 files changed, 183 deletions(-)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 269543effbc..756774fdacc 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,2 +1 @@
-DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 
47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36
 SHA512 
d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 
6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150
 SHA512 
bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d

diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch 
b/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch
deleted file mode 100644
index bf8c5e14096..000
--- a/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 75a129d3c2f21914a47b970df822e485aca625ac Mon Sep 17 00:00:00 2001
-From: Steve Allewell 
-Date: Sun, 11 Nov 2018 15:48:50 +
-Subject: Fix for importing images for V6 of ImageMagick
-
-The getPixelColor in V6 of ImageMagick does not appear to return the
-same information as in V7, consequently importing images has resulted in
-a black image when using V6 of ImageMagick.  This fix reverts the change
-made in commit 295773f44bfda1227d85edf065a8de14dc889159 when using V6.
-
-Big thanks to Sean Enck for reporting and helping diagnose the problem.

- src/ImportImageDlg.cpp | 16 
- src/MainWindow.cpp | 17 +
- 2 files changed, 33 insertions(+)
-
-diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp
-index e6396c6..340ff1d 100644
 a/src/ImportImageDlg.cpp
-+++ b/src/ImportImageDlg.cpp
-@@ -391,9 +391,21 @@ void ImportImageDlg::renderPixmap()
- QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, 
pixelCount, this);
- progress.setWindowModality(Qt::WindowModal);
- 
-+/*
-+ * ImageMagick prior to V7 used matte (opacity) to determine if an image has 
transparency.
-+ * 0.0 for transparent to 1.0 for opaque
-+ * 
-+ * ImageMagick V7 now uses alpha (transparency).
-+ * 1.0 for transparent to 0.0 for opaque
-+ * 
-+ * Access to pixels has changed too, V7 can use pixelColor to access the 
color of a particular
-+ * pixel, but although this was available in V6, it doesn't appear to produce 
the same result
-+ * and has resulted in black images when importing.
-+ */
- #if MagickLibVersion < 0x700
- bool hasTransparency = m_convertedImage.matte();
- double transparent = 1.0;
-+const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, 
width, height);
- #else
- bool hasTransparency = m_convertedImage.alpha();
- double transparent = 0.0;
-@@ -408,7 +420,11 @@ void ImportImageDlg::renderPixmap()
- }
- 
- for (int dx = 0 ; dx < width ; dx++) {
-+#if MagickLibVersion < 0x700
-+Magick::ColorRGB rgb = Magick::Color(*pixels++);
-+#else
- Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy);
-+#endif
- 
- if (hasTransparency && (rgb.alpha() == transparent)) {
- //ignore this pixel as it is transparent
-diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
-index 1f12f5b..ecf552a 100644
 a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -541,13 +541,26 @@ void MainWindow::convertImage(const QString )
- 
- bool useFractionals = importImageDlg->useFractionals();
- 
-+/*
-+ * ImageMagick prior to V7 used matte (opacity) to determine if an image has 
transparency.
-+ * 0.0 for transparent to 1.0 for opaque
-+ * 
-+ * ImageMagick V7 now uses alpha (transparency).
-+ * 1.0 for transparent to 0.0 for opaque
-+ * 
-+ * Access to pixels has changed too, V7 can use pixelColor to access the 
color of a particular
-+ * pixel, but although this was available in V6, it doesn't appear to produce 
the same result
-+ * and has resulted in black images when importing.
-+ */
- #if MagickLibVersion < 0x700
- bool

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2019-06-08 Thread Andreas Sturmlechner 
commit: 218a77609488e4a9730d986e34f73dcc78efb04f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  8 09:02:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  8 19:28:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218a7760

media-gfx/kxstitch: 2.2.0 version bump

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/Manifest  |  1 +
 media-gfx/kxstitch/kxstitch-2.2.0.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 9c20eaecff7..269543effbc 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1 +1,2 @@
 DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 
47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36
 SHA512 
d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
+DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 
6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150
 SHA512 
bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d

diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild 
b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
new file mode 100644
index 000..94faf7f2268
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+   sys-devel/gettext
+"
+DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   media-gfx/imagemagick[cxx]
+   x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+   !media-gfx/kxstitch:4
+"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2019-05-08 Thread Andreas Sturmlechner 
commit: 667b6b2d5a307438ca0779232eab1c3ea0717dc7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  5 21:11:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May  8 17:03:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667b6b2d

media-gfx/kxstitch: Drop 2.1.1-r1

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild | 43 -
 1 file changed, 43 deletions(-)

diff --git a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild 
b/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
deleted file mode 100644
index bf995e2e238..000
--- a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://userbase.kde.org/KXStitch;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="
-   sys-devel/gettext
-"
-DEPEND="
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   media-gfx/imagemagick[cxx]
-   x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-   !media-gfx/kxstitch:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/files/, media-gfx/kxstitch/

2019-05-08 Thread Andreas Sturmlechner 
commit: 68d2bc286976cef43b53bf84573e6d15a75404e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  5 21:01:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May  8 17:03:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d2bc28

media-gfx/kxstitch: Fix for importing images for V6 of ImageMagick

See also: https://mail.kde.org/pipermail/kxstitch/2018-October/06.html

Reported-by: Dave Armstrong
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kxstitch-2.1.1-imagemagick-fix.patch | 99 ++
 media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild| 46 ++
 2 files changed, 145 insertions(+)

diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch 
b/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch
new file mode 100644
index 000..bf8c5e14096
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch
@@ -0,0 +1,99 @@
+From 75a129d3c2f21914a47b970df822e485aca625ac Mon Sep 17 00:00:00 2001
+From: Steve Allewell 
+Date: Sun, 11 Nov 2018 15:48:50 +
+Subject: Fix for importing images for V6 of ImageMagick
+
+The getPixelColor in V6 of ImageMagick does not appear to return the
+same information as in V7, consequently importing images has resulted in
+a black image when using V6 of ImageMagick.  This fix reverts the change
+made in commit 295773f44bfda1227d85edf065a8de14dc889159 when using V6.
+
+Big thanks to Sean Enck for reporting and helping diagnose the problem.
+---
+ src/ImportImageDlg.cpp | 16 
+ src/MainWindow.cpp | 17 +
+ 2 files changed, 33 insertions(+)
+
+diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp
+index e6396c6..340ff1d 100644
+--- a/src/ImportImageDlg.cpp
 b/src/ImportImageDlg.cpp
+@@ -391,9 +391,21 @@ void ImportImageDlg::renderPixmap()
+ QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, 
pixelCount, this);
+ progress.setWindowModality(Qt::WindowModal);
+ 
++/*
++ * ImageMagick prior to V7 used matte (opacity) to determine if an image has 
transparency.
++ * 0.0 for transparent to 1.0 for opaque
++ * 
++ * ImageMagick V7 now uses alpha (transparency).
++ * 1.0 for transparent to 0.0 for opaque
++ * 
++ * Access to pixels has changed too, V7 can use pixelColor to access the 
color of a particular
++ * pixel, but although this was available in V6, it doesn't appear to produce 
the same result
++ * and has resulted in black images when importing.
++ */
+ #if MagickLibVersion < 0x700
+ bool hasTransparency = m_convertedImage.matte();
+ double transparent = 1.0;
++const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, 
width, height);
+ #else
+ bool hasTransparency = m_convertedImage.alpha();
+ double transparent = 0.0;
+@@ -408,7 +420,11 @@ void ImportImageDlg::renderPixmap()
+ }
+ 
+ for (int dx = 0 ; dx < width ; dx++) {
++#if MagickLibVersion < 0x700
++Magick::ColorRGB rgb = Magick::Color(*pixels++);
++#else
+ Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy);
++#endif
+ 
+ if (hasTransparency && (rgb.alpha() == transparent)) {
+ //ignore this pixel as it is transparent
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 1f12f5b..ecf552a 100644
+--- a/src/MainWindow.cpp
 b/src/MainWindow.cpp
+@@ -541,13 +541,26 @@ void MainWindow::convertImage(const QString )
+ 
+ bool useFractionals = importImageDlg->useFractionals();
+ 
++/*
++ * ImageMagick prior to V7 used matte (opacity) to determine if an image has 
transparency.
++ * 0.0 for transparent to 1.0 for opaque
++ * 
++ * ImageMagick V7 now uses alpha (transparency).
++ * 1.0 for transparent to 0.0 for opaque
++ * 
++ * Access to pixels has changed too, V7 can use pixelColor to access the 
color of a particular
++ * pixel, but although this was available in V6, it doesn't appear to produce 
the same result
++ * and has resulted in black images when importing.
++ */
+ #if MagickLibVersion < 0x700
+ bool hasTransparency = convertedImage.matte();
+ double transparent = 1.0;
++const Magick::PixelPacket *pixels = convertedImage.getConstPixels(0, 
0, imageWidth, imageHeight);
+ #else
+ bool hasTransparency = convertedImage.alpha();
+ double transparent = 0.0;
+ #endif
++
+ bool ignoreColor = importImageDlg->ignoreColor();
+ Magick::Color ignoreColorValue = importImageDlg->ignoreColorValue();
+ 
+@@ -579,7 +592,11 @@ void MainWindow::convertImage(const QString )
+ }
+ 
+ for (int dx = 0 ; dx < imageWidth ; dx++) {
++#if MagickLibVersion < 0x700
++Magick::ColorRGB rgb = Magick::Color(*pixels++); // is this a 
memory leak
++#else
+ Magick::ColorRGB rgb = convertedImage.pixelColor(dx, dy);

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2019-03-24 Thread Andreas Sturmlechner 
commit: 2ffc69a2e7cd27e98a62bd6900d598ef07adaf64
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 24 14:43:59 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 24 15:54:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffc69a2

media-gfx/kxstitch: EAPI-7 bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild | 43 +
 1 file changed, 43 insertions(+)

diff --git a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild 
b/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
new file mode 100644
index 000..bf995e2e238
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+   sys-devel/gettext
+"
+DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   media-gfx/imagemagick[cxx]
+   x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+   !media-gfx/kxstitch:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2019-03-24 Thread Andreas Sturmlechner 
commit: 2f81dc6d06d1bdcb0d9c3c20c67cceb227c6b12d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 24 14:44:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 24 15:54:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f81dc6d

media-gfx/kxstitch: Drop 2.1.1 (r0)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kxstitch/kxstitch-2.1.1.ebuild | 43 
 1 file changed, 43 deletions(-)

diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild 
b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
deleted file mode 100644
index e9ec0691e3f..000
--- a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://userbase.kde.org/KXStitch;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   media-gfx/imagemagick[cxx]
-   x11-libs/libX11
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   !media-gfx/kxstitch:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/

2018-08-31 Thread Andreas Sturmlechner 
commit: 33b1c1ac0d45debe40f797d843574ea7f8aee93a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 31 17:55:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 31 17:57:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b1c1ac

media-gfx/kxstitch: Fix build with Qt 5.11

Closes: https://bugs.gentoo.org/664974
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../kxstitch/files/kxstitch-2.1.1-qt-5.11.patch| 37 ++
 media-gfx/kxstitch/kxstitch-2.1.1.ebuild   |  2 ++
 2 files changed, 39 insertions(+)

diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch 
b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
new file mode 100644
index 000..70022fe9c8f
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
@@ -0,0 +1,37 @@
+From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell 
+Date: Wed, 27 Jun 2018 16:45:16 +0100
+Subject: fix build with Qt 5.11
+
+---
+ src/LibraryPatternPropertiesDlg.cpp | 2 ++
+ src/TextElementDlg.cpp  | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/LibraryPatternPropertiesDlg.cpp 
b/src/LibraryPatternPropertiesDlg.cpp
+index 8d2e24c..c10da3f 100644
+--- a/src/LibraryPatternPropertiesDlg.cpp
 b/src/LibraryPatternPropertiesDlg.cpp
+@@ -11,6 +11,8 @@
+ 
+ #include "LibraryPatternPropertiesDlg.h"
+ 
++#include 
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/TextElementDlg.cpp b/src/TextElementDlg.cpp
+index 4d88b1e..fb545d1 100644
+--- a/src/TextElementDlg.cpp
 b/src/TextElementDlg.cpp
+@@ -16,6 +16,7 @@
+ #include "TextElementDlg.h"
+ 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+-- 
+cgit v0.11.2

diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild 
b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
index 3e24a1c98c3..e9ec0691e3f 100644
--- a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
@@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
!media-gfx/kxstitch:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/

2018-02-11 Thread Andreas Sturmlechner 
commit: e47e256cd55508ca1570a9f4f44c5b84adecfd76
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 10 22:22:48 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 11 17:07:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47e256c

media-gfx/kxstitch: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/kxstitch/Manifest|  2 -
 .../files/kxstitch-2.0.0-imagemagick-7.patch   | 93 --
 media-gfx/kxstitch/kxstitch-2.0.0.ebuild   | 41 --
 media-gfx/kxstitch/kxstitch-2.1.0.ebuild   | 41 --
 4 files changed, 177 deletions(-)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 5f57d7200fa..9c20eaecff7 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,3 +1 @@
-DIST kxstitch-2.0.0.tar.xz 1681648 BLAKE2B 
669eda3060244636b4ad8bb6e7e7899eb183d7a0f3b264bc40c3bda7146be2a6e10b165165889b7d0043dc5921ff8153775dfa5436546e3cd7be99a4cc144434
 SHA512 
0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
-DIST kxstitch-2.1.0.tar.xz 1727616 BLAKE2B 
34e362b37ef94ed9657254fc4887eb77b0937c4ebdc2b76b09ae9ebbbe6dc490fdafa4c189a87177c26bc1d24fa0b150436a547c3b82dbf74b269fd87f674928
 SHA512 
c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608
 DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 
47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36
 SHA512 
d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3

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
deleted file mode 100644
index fe53efba302..000
--- a/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 295773f44bfda1227d85edf065a8de14dc889159 Mon Sep 17 00:00:00 2001
-From: Steve Allewell 
-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 )
- 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 )
- 
- 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 )
- QProgressDialog progress(i18n("Converting to stitches"),

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2018-02-03 Thread Andreas Sturmlechner 
commit: a7c3f344ee2b7cd74ee7c5287a547e040c2c9b7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  3 23:06:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  3 23:19:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c3f344

media-gfx/kxstitch: 2.1.1 version bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/kxstitch/Manifest  |  1 +
 media-gfx/kxstitch/kxstitch-2.1.1.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 49c9a4f600c..5f57d7200fa 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,2 +1,3 @@
 DIST kxstitch-2.0.0.tar.xz 1681648 BLAKE2B 
669eda3060244636b4ad8bb6e7e7899eb183d7a0f3b264bc40c3bda7146be2a6e10b165165889b7d0043dc5921ff8153775dfa5436546e3cd7be99a4cc144434
 SHA512 
0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
 DIST kxstitch-2.1.0.tar.xz 1727616 BLAKE2B 
34e362b37ef94ed9657254fc4887eb77b0937c4ebdc2b76b09ae9ebbbe6dc490fdafa4c189a87177c26bc1d24fa0b150436a547c3b82dbf74b269fd87f674928
 SHA512 
c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608
+DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 
47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36
 SHA512 
d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3

diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild 
b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
new file mode 100644
index 000..3e24a1c98c3
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   media-gfx/imagemagick[cxx]
+   x11-libs/libX11
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   !media-gfx/kxstitch:4
+"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2018-01-16 Thread Andreas Sturmlechner 
commit: 94b857ec56264b2b2e7cd69a4e78fa85c50dd8ee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 14:48:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 15:12:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b857ec

media-gfx/kxstitch: 2.1.0 version bump

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/kxstitch/Manifest  |  1 +
 media-gfx/kxstitch/kxstitch-2.1.0.ebuild | 41 
 2 files changed, 42 insertions(+)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 7617e16b95f..49c9a4f600c 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1 +1,2 @@
 DIST kxstitch-2.0.0.tar.xz 1681648 BLAKE2B 
669eda3060244636b4ad8bb6e7e7899eb183d7a0f3b264bc40c3bda7146be2a6e10b165165889b7d0043dc5921ff8153775dfa5436546e3cd7be99a4cc144434
 SHA512 
0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
+DIST kxstitch-2.1.0.tar.xz 1727616 BLAKE2B 
34e362b37ef94ed9657254fc4887eb77b0937c4ebdc2b76b09ae9ebbbe6dc490fdafa4c189a87177c26bc1d24fa0b150436a547c3b82dbf74b269fd87f674928
 SHA512 
c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608

diff --git a/media-gfx/kxstitch/kxstitch-2.1.0.ebuild 
b/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
new file mode 100644
index 000..3e24a1c98c3
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   media-gfx/imagemagick[cxx]
+   x11-libs/libX11
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   !media-gfx/kxstitch:4
+"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/

2017-11-15 Thread Andreas Sturmlechner 
commit: 89d6a8e483252a7839cff515f8eed7e32c5aabe8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 15 22:02:01 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 15 23:26:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d6a8e4

media-gfx/kxstitch: Fix build w/ >=ImageMagick-7

Closes: https://bugs.gentoo.org/636998
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../files/kxstitch-2.0.0-imagemagick-7.patch   | 93 ++
 media-gfx/kxstitch/kxstitch-2.0.0.ebuild   |  4 +-
 2 files changed, 96 insertions(+), 1 deletion(-)

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 000..fe53efba302
--- /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 
+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 )
+ 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 )
+ 
+ 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 )
+ 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 )
+ }
+ 
+ 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 3fe706e..02fe8204fac 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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2016-12-06 Thread Johannes Huber 
commit: 7e952cc7558c5ea2eef604b93a98bc341b7a2bd0
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Dec  6 13:48:40 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Dec  6 13:48:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e952cc7

media-gfx/kxstitch: Drop slot 4

Package-Manager: portage-2.3.3

 media-gfx/kxstitch/Manifest  |  1 -
 media-gfx/kxstitch/kxstitch-1.3.0.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 481e60e..9fac523 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,2 +1 @@
-DIST kxstitch-1.3.0.tar.bz2 1982487 SHA256 
675fdcf0d7c171c8b41c8156143530a981a707c705e45663e70946ca4e707f16 SHA512 
f1a422b9f5e6850e1864b1c54c2af732d53af07d5b310241446e7cae810cfc0f97cfe99792ae3fb9e7ddf9efd5203fc8bede132a2a9c8b3be5057b4d338d4cda
 WHIRLPOOL 
75f6b9ab6638bf9e7960d55ca291d28c6bf814fb799b345f4c08b6072c702f6ed3889c0d4c53889493b5c5c29b6efa5253bf8d7089e33b6cf56f0dc13becf0a4
 DIST kxstitch-2.0.0.tar.xz 1681648 SHA256 
430db19729c907c845d35e2ab3887ace2bc21913ab08ea7471c71c9b84fcc783 SHA512 
0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
 WHIRLPOOL 
1c4965e7b536e2d6a2f98855372798c305840238e068465d95c2e2fccb7db419f049ad19d45461ccad544be8c55fcbd47c6cb02fc3c9dd333cbfca8a446e1e53

diff --git a/media-gfx/kxstitch/kxstitch-1.3.0.ebuild 
b/media-gfx/kxstitch/kxstitch-1.3.0.ebuild
deleted file mode 100644
index e09091c..
--- a/media-gfx/kxstitch/kxstitch-1.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_DOC_DIRS="doc-translations/%lingua_${PN}"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="bs ca ca@valencia cs da de en_GB es et fr hu it ja lt nl pl pt 
pt_BR sk sv tr uk"
-inherit kde4-base
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://userbase.kde.org/KXStitch;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
-   media-gfx/imagemagick[cxx]
-   x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2016-12-04 Thread Michael Palimaka 
commit: 7fa8d18f4521e5f2d46e8c0a2a26d92930a85d41
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Dec  4 17:06:21 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Dec  4 17:06:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa8d18f

media-gfx/kxstitch: version bump to 2.0.0

Package-Manager: portage-2.3.2

 media-gfx/kxstitch/Manifest  |  1 +
 media-gfx/kxstitch/kxstitch-2.0.0.ebuild | 40 
 2 files changed, 41 insertions(+)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 4941013..481e60e 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1 +1,2 @@
 DIST kxstitch-1.3.0.tar.bz2 1982487 SHA256 
675fdcf0d7c171c8b41c8156143530a981a707c705e45663e70946ca4e707f16 SHA512 
f1a422b9f5e6850e1864b1c54c2af732d53af07d5b310241446e7cae810cfc0f97cfe99792ae3fb9e7ddf9efd5203fc8bede132a2a9c8b3be5057b4d338d4cda
 WHIRLPOOL 
75f6b9ab6638bf9e7960d55ca291d28c6bf814fb799b345f4c08b6072c702f6ed3889c0d4c53889493b5c5c29b6efa5253bf8d7089e33b6cf56f0dc13becf0a4
+DIST kxstitch-2.0.0.tar.xz 1681648 SHA256 
430db19729c907c845d35e2ab3887ace2bc21913ab08ea7471c71c9b84fcc783 SHA512 
0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
 WHIRLPOOL 
1c4965e7b536e2d6a2f98855372798c305840238e068465d95c2e2fccb7db419f049ad19d45461ccad544be8c55fcbd47c6cb02fc3c9dd333cbfca8a446e1e53

diff --git a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild 
b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
new file mode 100644
index ..972e2c0
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   media-gfx/imagemagick[cxx]
+   x11-libs/libX11
+   !media-gfx/kxstitch:4
+"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2016-07-20 Thread Michael Palimaka 
commit: 9ee92bafdd897142505b90ae4498320842b218b7
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jul 20 19:45:41 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 20 19:45:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee92baf

media-gfx/kxstitch: remove old

Package-Manager: portage-2.3.0

 media-gfx/kxstitch/Manifest  |  1 -
 media-gfx/kxstitch/kxstitch-1.2.0.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index cca96b3..4941013 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,2 +1 @@
-DIST kxstitch-1.2.0.tar.bz2 1995295 SHA256 
12946cdba1278bc68d3ca11c0db1963dbe3363d0f6aa814cb9e8d6e49f5132da SHA512 
bd1bf32cb1cf188e03c17ddc3f3aa9e19e5551f0f3c58afa7951975b9a149f164b6d19f6c9011770c8d40724b9056c8d42202a4bd8712dda995439159c84c5f5
 WHIRLPOOL 
b19a595f4a1fe08707d8ce122beae169ed8607ca81286d0d63359ff79aef10f446f3b23a3fb9f40dfaa455f879011f78138c516704e961c3901c76eb88b56992
 DIST kxstitch-1.3.0.tar.bz2 1982487 SHA256 
675fdcf0d7c171c8b41c8156143530a981a707c705e45663e70946ca4e707f16 SHA512 
f1a422b9f5e6850e1864b1c54c2af732d53af07d5b310241446e7cae810cfc0f97cfe99792ae3fb9e7ddf9efd5203fc8bede132a2a9c8b3be5057b4d338d4cda
 WHIRLPOOL 
75f6b9ab6638bf9e7960d55ca291d28c6bf814fb799b345f4c08b6072c702f6ed3889c0d4c53889493b5c5c29b6efa5253bf8d7089e33b6cf56f0dc13becf0a4

diff --git a/media-gfx/kxstitch/kxstitch-1.2.0.ebuild 
b/media-gfx/kxstitch/kxstitch-1.2.0.ebuild
deleted file mode 100644
index 805840b..000
--- a/media-gfx/kxstitch/kxstitch-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_DOC_DIRS="doc-translations/%lingua_${PN}"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="ca cs da de en_GB es et fr hu it lt nl pl pt pt_BR sk sv uk"
-inherit kde4-base
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://userbase.kde.org/KXStitch;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
-   media-gfx/imagemagick[cxx]
-   x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/

2016-01-17 Thread Michael Palimaka 
commit: 25db6c62f87aa3ff6d488b4611e2babd23089ed5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jan 17 08:59:48 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jan 17 09:06:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25db6c62

media-gfx/kxstitch: version bump

Package-Manager: portage-2.2.26

 media-gfx/kxstitch/Manifest  |  1 +
 media-gfx/kxstitch/kxstitch-1.3.0.ebuild | 27 +++
 2 files changed, 28 insertions(+)

diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 0c19aef..cca96b3 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1 +1,2 @@
 DIST kxstitch-1.2.0.tar.bz2 1995295 SHA256 
12946cdba1278bc68d3ca11c0db1963dbe3363d0f6aa814cb9e8d6e49f5132da SHA512 
bd1bf32cb1cf188e03c17ddc3f3aa9e19e5551f0f3c58afa7951975b9a149f164b6d19f6c9011770c8d40724b9056c8d42202a4bd8712dda995439159c84c5f5
 WHIRLPOOL 
b19a595f4a1fe08707d8ce122beae169ed8607ca81286d0d63359ff79aef10f446f3b23a3fb9f40dfaa455f879011f78138c516704e961c3901c76eb88b56992
+DIST kxstitch-1.3.0.tar.bz2 1982487 SHA256 
675fdcf0d7c171c8b41c8156143530a981a707c705e45663e70946ca4e707f16 SHA512 
f1a422b9f5e6850e1864b1c54c2af732d53af07d5b310241446e7cae810cfc0f97cfe99792ae3fb9e7ddf9efd5203fc8bede132a2a9c8b3be5057b4d338d4cda
 WHIRLPOOL 
75f6b9ab6638bf9e7960d55ca291d28c6bf814fb799b345f4c08b6072c702f6ed3889c0d4c53889493b5c5c29b6efa5253bf8d7089e33b6cf56f0dc13becf0a4

diff --git a/media-gfx/kxstitch/kxstitch-1.3.0.ebuild 
b/media-gfx/kxstitch/kxstitch-1.3.0.ebuild
new file mode 100644
index 000..e09091c
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-1.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOC_DIRS="doc-translations/%lingua_${PN}"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="bs ca ca@valencia cs da de en_GB es et fr hu it ja lt nl pl pt 
pt_BR sk sv tr uk"
+inherit kde4-base
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+   media-gfx/imagemagick[cxx]
+   x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+"