[neon/extras/kxstitch/Neon/stable] debian/patches: remove patches in branch
Jonathan Esk-Riddell
null at kde.org
Thu Sep 8 16:50:15 BST 2022
Git commit f369b35976e3d3af0319da5034c6ba56c09f7861 by Jonathan Esk-Riddell.
Committed on 08/09/2022 at 15:50.
Pushed by jriddell into branch 'Neon/stable'.
remove patches in branch
D +0 -3 debian/patches/series
D +0 -202 debian/patches/upstream_Fix-for-rendering-on-scaled-painter.patch
D +0 -36 debian/patches/upstream_Improve-appdata.patch
D +0 -55 debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
https://invent.kde.org/neon/extras/kxstitch/commit/f369b35976e3d3af0319da5034c6ba56c09f7861
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c6a78b2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream_Improve-appdata.patch
-upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
-upstream_Fix-for-rendering-on-scaled-painter.patch
diff --git a/debian/patches/upstream_Fix-for-rendering-on-scaled-painter.patch b/debian/patches/upstream_Fix-for-rendering-on-scaled-painter.patch
deleted file mode 100644
index 47ec687..0000000
--- a/debian/patches/upstream_Fix-for-rendering-on-scaled-painter.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From c9e6a03c32fe6e6901fad8439bf2235ddb8c288c Mon Sep 17 00:00:00 2001
-From: Steve Allewell <steve.allewell at 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();
- }
-
---
-2.30.0
-
diff --git a/debian/patches/upstream_Improve-appdata.patch b/debian/patches/upstream_Improve-appdata.patch
deleted file mode 100644
index 81340da..0000000
--- a/debian/patches/upstream_Improve-appdata.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 19b641c68c8a9ce11fdabb86f3cec6ddec59dfbc Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Fri, 3 Jul 2020 07:02:55 +0200
-Subject: [PATCH] Improve appdata
-
-- remove ".desktop" suffix from <id>, as it is not needed (it is
- already type="desktop")
-- use canonical docs.kde.org help location
----
- org.kde.kxstitch.appdata.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/org.kde.kxstitch.appdata.xml b/org.kde.kxstitch.appdata.xml
-index 5b5b53d..339a87c 100644
---- a/org.kde.kxstitch.appdata.xml
-+++ b/org.kde.kxstitch.appdata.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <component type="desktop">
-- <id>org.kde.kxstitch.desktop</id>
-+ <id>org.kde.kxstitch</id>
- <metadata_license>GFDL-1.2-without-invariant</metadata_license>
- <name>KXStitch</name>
- <name xml:lang="ast">KXStitch</name>
-@@ -306,7 +306,7 @@
- </description>
- <url type="homepage">https://userbase.kde.org/Special:myLanguage/KXStitch</url>
- <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kxstitch</url>
-- <url type="help">http://docs.kde.org/development/en/extragear-graphics/kxstitch/index.html</url>
-+ <url type="help">https://docs.kde.org/?application=kxstitch</url>
- <screenshots>
- <screenshot type="default">
- <image>https://cdn.kde.org/screenshots/kxstitch/Importedimage.png</image>
---
-2.30.0
-
diff --git a/debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch b/debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
deleted file mode 100644
index 8287e61..0000000
--- a/debian/patches/upstream_Update-kxstitch-appdata-to-pass-flathub-validation.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 11f715597e64e6901428de81f7fa1944026c8eca Mon Sep 17 00:00:00 2001
-From: Nick Richards <nick at nedrichards.com>
-Date: Mon, 13 Apr 2020 08:56:51 +0100
-Subject: [PATCH] Update kxstitch appdata to pass flathub validation
-
-Summary:
-The latest kxstitch release couldn't be distributed on flathub because it didn't pass the appstream validator. This diff fixes those errors:
-* choose a valid SPDX licence from https://spdx.org/licenses/
-* add an OARS tag https://hughsie.github.io/oars/
-* add release tags
-
-Test Plan:
-flatpak install flathub org.freedesktop.appstream-glib
-flatpak run org.freedesktop.appstream-glib validate org.kde.kxstitch.appdata.xml
-
-Reviewers: yurchor, sallewell
-
-Reviewed By: yurchor
-
-Tags: #flatpak
-
-Differential Revision: https://phabricator.kde.org/D28772
-
-(cherry picked from commit 48677343b338e4e90ea404a1882c810221f8a680)
----
- org.kde.kxstitch.appdata.xml | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/org.kde.kxstitch.appdata.xml b/org.kde.kxstitch.appdata.xml
-index 339a87c..133d733 100644
---- a/org.kde.kxstitch.appdata.xml
-+++ b/org.kde.kxstitch.appdata.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <component type="desktop">
- <id>org.kde.kxstitch</id>
-- <metadata_license>GFDL-1.2-without-invariant</metadata_license>
-+ <metadata_license>GFDL-1.2-only</metadata_license>
- <name>KXStitch</name>
- <name xml:lang="ast">KXStitch</name>
- <name xml:lang="ca">KXStitch</name>
-@@ -304,6 +304,10 @@
- <li xml:lang="zh-CN">打印图案和线键</li>
- </ul>
- </description>
-+ <releases>
-+ <release date="2019-06-07" version="2.2.0"/>
-+ </releases>
-+ <content_rating type="oars-1.1" />
- <url type="homepage">https://userbase.kde.org/Special:myLanguage/KXStitch</url>
- <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kxstitch</url>
- <url type="help">https://docs.kde.org/?application=kxstitch</url>
---
-2.30.0
-
More information about the Neon-commits
mailing list