* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
@ 2017-11-15 23:28 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-11-15 23:28 UTC (permalink / raw
To: gentoo-commits
commit: 89d6a8e483252a7839cff515f8eed7e32c5aabe8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 22:02:01 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 23:26:57 2017 +0000
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 00000000000..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 <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 32222fe706e..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 the GNU General Public License v2
EAPI=6
@@ -37,3 +37,5 @@ RDEPEND="
DEPEND="${RDEPEND}
sys-devel/gettext
"
+
+PATCHES=( "${FILESDIR}/${P}-imagemagick-7.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
@ 2018-02-11 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-02-11 17:07 UTC (permalink / raw
To: gentoo-commits
commit: e47e256cd55508ca1570a9f4f44c5b84adecfd76
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 22:22:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 17:07:14 2018 +0000
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..00000000000
--- 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 <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
deleted file mode 100644
index 02fe8204fac..00000000000
--- a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 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}/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
-"
-
-PATCHES=( "${FILESDIR}/${P}-imagemagick-7.patch" )
diff --git a/media-gfx/kxstitch/kxstitch-2.1.0.ebuild b/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
deleted file mode 100644
index 3e24a1c98c3..00000000000
--- a/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
+++ /dev/null
@@ -1,41 +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
-"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
@ 2018-08-31 17:58 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-08-31 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 33b1c1ac0d45debe40f797d843574ea7f8aee93a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 17:55:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 17:57:55 2018 +0000
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 00000000000..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 <jr@jriddell.org>
+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 <QIcon>
++
+ #include <KConfigGroup>
+ #include <KHelpClient>
+ #include <KLocalizedString>
+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 <QColorDialog>
++#include <QButtonGroup>
+
+ #include <KHelpClient>
+ #include <KLocalizedString>
+--
+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" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
@ 2019-06-22 14:50 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-22 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 115ef47d90a31b86423d33845023b58fff05ca1e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 13:51:35 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 14:50:34 2019 +0000
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 <asturm <AT> 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..00000000000
--- 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 <steve.allewell@gmail.com>
-Date: Sun, 11 Nov 2018 15:48:50 +0000
-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 &source)
-
- 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 &source)
- }
-
- 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);
-+#endif
-
- if (hasTransparency && (rgb.alpha() == transparent)) {
- // ignore this pixel as it is transparent
---
-cgit v1.1
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
deleted file mode 100644
index 70022fe9c8f..00000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-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 <QIcon>
-+
- #include <KConfigGroup>
- #include <KHelpClient>
- #include <KLocalizedString>
-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 <QColorDialog>
-+#include <QButtonGroup>
-
- #include <KHelpClient>
- #include <KLocalizedString>
---
-cgit v0.11.2
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild
deleted file mode 100644
index 232c67d1a14..00000000000
--- a/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,46 +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"
- "${FILESDIR}/${P}-imagemagick-fix.patch"
-)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
@ 2025-01-13 23:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-01-13 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 93741d1f75002320be29992c53252cb0ab0c876d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 23:04:53 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 23:04:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93741d1f
media-gfx/kxstitch: drop 2.2.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/kxstitch/Manifest | 1 -
.../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 -----
5 files changed, 453 deletions(-)
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 94185b01a5a0..b48dbbf9c7f6 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,2 +1 @@
-DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
DIST kxstitch-3.0.0_pre20250110-073debc5.tar.gz 2407504 BLAKE2B b564193a21094f25356cc2ef90815c90f975d307ef3fed2468ebf5f2a980e1976e5267a8362bb441ca7e67f4f53e3c64e481c285a243d0c0d5a77ee2b7ae0c41 SHA512 e4888f526c113425efad0a7de5705e5e9b28359ef581dc0445be6492754c61ff689233583907d953298532da025769b99ed2e54c3e9b2f4f7c0688c4265e5533
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
deleted file mode 100644
index 805a67ea97c8..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From f97d3eaf4c06b4740fcec63c9c0ca64a5bd56281 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-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 <pino@kde.org>
-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<Qt::KeyboardModifiers>(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 <QStack>
- #include <QWidget>
-
-+#include <KModifierKeyInfo>
-+
- #include "Stitch.h"
-
- #include "configuration.h"
-@@ -337,6 +339,8 @@ private:
- QStack<QPoint> m_cursorStack;
- QMap<int, int> 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 <pino@kde.org>
-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
- include_directories (${ImageMagick_Magick++_INCLUDE_DIR} ${ImageMagick_MagickCore_INCLUDE_DIR})
- include_directories (${ImageMagick_Magick++_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS})
--include_directories (${X11_INCLUDE_DIR})
-
- set (kxstitch_SRCS
- src/BackgroundImage.cpp
-@@ -96,7 +93,6 @@ set (kxstitch_SRCS
- src/Symbol.cpp
- src/SymbolLibrary.cpp
- src/SymbolManager.cpp
-- src/XKeyLock.cpp
-
- src/AlphaSelect.cpp
- src/CalibrateFlossDlg.cpp
-@@ -143,7 +139,6 @@ target_link_libraries (kxstitch
- Qt5::Core
- Qt5::PrintSupport
- Qt5::Widgets
-- Qt5::X11Extras
- KF5::Completion
- KF5::ConfigGui
- KF5::GuiAddons
-@@ -153,7 +148,6 @@ target_link_libraries (kxstitch
- KF5::WidgetsAddons
- KF5::XmlGui
- ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY}
-- ${X11_LIBRARIES}
- )
-
- set (WITH_PROFILING OFF CACHE BOOL "Build with profiling support")
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index 163e88e..4d314e4 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -24,7 +24,6 @@
- #include <QScrollArea>
- #include <QStyleOptionRubberBand>
- #include <QToolTip>
--#include <QX11Info>
-
- #include <KLocalizedString>
- #include <KMessageBox>
---
-GitLab
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
deleted file mode 100644
index bf5d94dae4d6..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 44d231b5604480601bedc623ca2f5204bd4a3ac8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 11 Sep 2022 15:55:44 +0200
-Subject: [PATCH] Enable highdpi scaling and pixmaps
-
----
- src/Main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/Main.cpp b/src/Main.cpp
-index 0af162a..4088d37 100644
---- a/src/Main.cpp
-+++ b/src/Main.cpp
-@@ -85,6 +85,9 @@
- */
- int main(int argc, char *argv[])
- {
-+ QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-+ QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+
- QApplication app(argc, argv);
- KLocalizedString::setApplicationDomain("kxstitch");
-
---
-GitLab
-
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
deleted file mode 100644
index 5b2bc07aa1ed..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From c9e6a03c32fe6e6901fad8439bf2235ddb8c288c Mon Sep 17 00:00:00 2001
-From: Steve Allewell <steve.allewell@gmail.com>
-Date: Sun, 3 Jan 2021 13:43:59 +0000
-Subject: [PATCH] Fix for rendering on scaled painter
-
-Fixes for rendering seletion areas on scaled painter in recent versions
-of Qt which were half a square out.
----
- src/Editor.cpp | 74 ++++++++++++++++++++++++++++----------------------
- 1 file changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index 4d314e4..263df1e 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -1388,11 +1388,12 @@ void Editor::renderRubberBandRectangle(QPainter *painter, const QRect&)
- if (m_rubberBand.isValid()) {
- painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
-
-+ painter->resetTransform();
- QStyleOptionRubberBand opt;
- opt.initFrom(this);
- opt.shape = QRubberBand::Rectangle;
- opt.opaque = false;
-- opt.rect = m_rubberBand.adjusted(0, 0, 1, 1);
-+ opt.rect = rectToContents(m_rubberBand);
-
- style()->drawControl(QStyle::CE_RubberBand, &opt, painter);
- }
-@@ -1408,14 +1409,15 @@ void Editor::renderRubberBandEllipse(QPainter *painter, const QRect&)
- if (m_rubberBand.isValid()) {
- painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
-
-- painter->setPen(Qt::NoPen);
-- painter->setBrush(QColor(200,225,255));
-- painter->setOpacity(0.5);
-- painter->drawEllipse(m_rubberBand);
-+ painter->resetTransform();
-+ QStyleOptionRubberBand opt;
-+ opt.initFrom(this);
-
-- painter->setPen(Qt::darkBlue);
-- painter->setBrush(Qt::NoBrush);
-- painter->drawEllipse(m_rubberBand);
-+ painter->setPen(opt.palette.color(QPalette::WindowText));
-+ painter->setBrush(QBrush(opt.palette.color(QPalette::Highlight), Qt::Dense4Pattern));
-+ painter->setBackground(QBrush(opt.palette.base()));
-+ painter->setBackgroundMode(Qt::TransparentMode);
-+ painter->drawEllipse(rectToContents(m_rubberBand));
- }
-
- painter->restore();
-@@ -1427,7 +1429,10 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
- QPolygonF polyline;
- painter->save();
-
-- painter->setPen(Qt::green); // use green for the first point
-+ QPen pen(Qt::green);
-+ pen.setWidth(0);
-+
-+ painter->setPen(pen); // use green for the first point
- painter->setBrush(Qt::green);
-
- QVector<QPoint>::const_iterator i;
-@@ -1435,7 +1440,8 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
- for (i = m_polygon.constBegin() ; i != m_polygon.constEnd() ; ++i) {
- QPointF cell = QPointF(*i) + QPointF(0.5, 0.5);
- painter->drawEllipse(QRectF(-0.5, -0.5, 1, 1).translated(cell));
-- painter->setPen(Qt::blue); // use blue for subsequent points
-+ pen.setColor(Qt::blue);
-+ painter->setPen(pen); // use blue for subsequent points
- painter->setBrush(Qt::blue);
- polyline.append(cell);
- }
-@@ -1555,9 +1561,9 @@ void Editor::mouseMoveEvent_Draw(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToCell(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_cellEnd = m_cellTracking = contentsToCell(p);
-+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
- update();
- }
-
-@@ -1703,9 +1709,9 @@ void Editor::mouseMoveEvent_Rectangle(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToCell(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_cellEnd = m_cellTracking = contentsToCell(p);
-+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
- update();
- }
-
-@@ -1757,9 +1763,9 @@ void Editor::mouseMoveEvent_FillRectangle(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToCell(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_cellEnd = m_cellTracking = contentsToCell(p);
-+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
- update();
- }
-
-@@ -1793,9 +1799,9 @@ void Editor::mouseMoveEvent_Ellipse(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToCell(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_cellEnd = m_cellTracking = contentsToCell(p);
-+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
- update();
- }
-
-@@ -1848,9 +1854,9 @@ void Editor::mouseMoveEvent_FillEllipse(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToCell(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_cellEnd = m_cellTracking = contentsToCell(p);
-+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
- update();
- }
-
-@@ -1877,7 +1883,7 @@ void Editor::mouseReleaseEvent_FillEllipse(QMouseEvent*)
- painter.setRenderHint(QPainter::Antialiasing, !useFractionals);
- painter.setPen(QPen(Qt::color1));
- painter.setBrush(Qt::color1);
-- painter.drawEllipse(QRect(m_cellStart, m_cellEnd).normalized());
-+ painter.drawEllipse(QRect(m_cellStart, QSize(1,1)).united(QRect(m_cellEnd, QSize(1, 1))));
- painter.end();
-
- QUndoCommand *cmd = new FillEllipseCommand(m_document);
-@@ -1894,6 +1900,7 @@ void Editor::mousePressEvent_FillPolygon(QMouseEvent *e)
- {
- m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
- m_polygon.append(m_cellStart);
-+
- update();
- }
-
-@@ -2001,6 +2008,7 @@ void Editor::mouseReleaseEvent_Alphabet(QMouseEvent *e)
-
- m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
- m_cursorStack.push(m_cellEnd);
-+
- update();
- }
-
-@@ -2023,9 +2031,9 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToCell(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_cellEnd = m_cellTracking = contentsToCell(p);
-+ m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
- update();
-
- QToolTip::showText(QCursor::pos(), QString::fromLatin1("%1,%2 %3 x %4").arg(m_rubberBand.left()).arg(m_rubberBand.top()).arg(m_rubberBand.width()).arg(m_rubberBand.height()));
-@@ -2034,7 +2042,7 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
-
- void Editor::mouseReleaseEvent_Select(QMouseEvent*)
- {
-- m_selectionArea = QRect(m_cellStart, m_cellEnd).normalized();
-+ m_selectionArea = m_rubberBand;
- emit(selectionMade(true));
- }
-
-@@ -2052,9 +2060,9 @@ void Editor::mouseMoveEvent_Backstitch(QMouseEvent *e)
-
- dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
-
-- m_cellTracking = contentsToSnap(p);
-- m_cellEnd = m_cellTracking;
-- m_rubberBand = (snapToCells(m_cellStart).united(snapToCells(m_cellEnd))).normalized();
-+ m_cellEnd = m_cellTracking = contentsToSnap(p);
-+ m_rubberBand = snapToCells(m_cellStart).united(snapToCells(m_cellEnd));
-+
- update();
- }
-
---
-GitLab
-
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
deleted file mode 100644
index 927de1cf02ef..000000000000
--- a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-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=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${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/kguiaddons-${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]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}/${P}-drop-xkeylock.patch"
- "${FILESDIR}/${P}-fix-render-scaled-painter.patch"
- "${FILESDIR}/${P}-fix-hidpi.patch"
-)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-13 23:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-13 23:05 [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-06-22 14:50 Andreas Sturmlechner
2018-08-31 17:58 Andreas Sturmlechner
2018-02-11 17:07 Andreas Sturmlechner
2017-11-15 23:28 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox