diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-24 01:09:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-24 01:09:44 +0000 |
commit | e33383d972aad8129fd4c1ee2b87f529f6efa8e9 (patch) | |
tree | 6a41fd6c2b9a997737264687637da3a9eee3d9d6 /media-gfx | |
parent | 89aeb05c8da1b0c32fb9d0cd5d202763780d5d5a (diff) |
gentoo auto-resync : 24:11:2022 - 01:09:44
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 38494 -> 38489 bytes | |||
-rw-r--r-- | media-gfx/kxstitch/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch | 180 | ||||
-rw-r--r-- | media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch | 26 | ||||
-rw-r--r-- | media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch | 202 | ||||
-rw-r--r-- | media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild (renamed from media-gfx/kxstitch/kxstitch-2.2.0.ebuild) | 25 |
6 files changed, 425 insertions, 13 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex aacdd3c48587..494eb9f74a48 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest index 04ef3a22d83f..b821a52a8449 100644 --- a/media-gfx/kxstitch/Manifest +++ b/media-gfx/kxstitch/Manifest @@ -1,3 +1,6 @@ +AUX kxstitch-2.2.0-drop-xkeylock.patch 5150 BLAKE2B ebe404416d6c836f2326c31fc9fc76598ef5197a7c1804c1bad80b7bc8606b3884bec11486beeab237c0af875169f89f0af374bbe3a9aa07be6460a28d138f94 SHA512 27dd3d84dfc445cfff4c4927966f413e0b4a5fee462a46fbaec66fa49484a8f4ccb9ed52cc56f43a19f7819fba22f7cf020f754d96d7145da07584609b9eb95f +AUX kxstitch-2.2.0-fix-hidpi.patch 672 BLAKE2B 51f90ea504319a3e558d51c8a5d5eb8166f45880624c3680e3ea5aaad08b43efb6b50c56f6aa1eb95722f3241cafcd57defb9694669efb28fc5a54b24f5467a6 SHA512 e59439e147a57eb7085acf6c7b80cbb891945597add70e517d709f1ca34b8daa45c9f4a73abee825516e090b95ee7ba40ec940d471efad00ee1ae82fc12c6ee5 +AUX kxstitch-2.2.0-fix-render-scaled-painter.patch 7804 BLAKE2B 92d7b6677de47ddda7462e6cdcda96a57460c1540365096a0ab912452c6fc84434bbf2a802dbc881b8392d3222c773e90bfc286b673c9889645c274722d9e965 SHA512 fd1621d2aa789b305bc026a75bed9a0acd64e17e861628673beb4eb4a6f87e56e53a4f28585f056ae8a47d8adbdb3510aa21896d6400af41e1df97f3cc0620f5 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d -EBUILD kxstitch-2.2.0.ebuild 1066 BLAKE2B 8c7ca9a2c6904499d44543bed0c6816a6a7ab6df986d3d5692274dedaff540a2652652c55ad9654d8cb392e6fa5fe173b2e61f510a041401691d46e84f5cef96 SHA512 183b1fe99c50a499f4da78b0444239fd4ce450757951d6aa2efd5c040717317f2b5b73004c504ef6c1d940508f4c6f7a184faf46a54e879481ff57e2c9e46b7d +EBUILD kxstitch-2.2.0-r1.ebuild 1170 BLAKE2B d363e212e1d955dc285b672460fb075d9442f248783e6bd4be3a2c17adce39d29502243dd503edce5c9a4d8d05928ee46b0bab1fc29cbd30c789ab82728c913a SHA512 431b1a42e3919b86c425b0f1b4dbd3d9d37ccd7e3f9fd310a1b6759d6714ec09531e2122ccb3400c8181cf7bdfe0ff1d4170e3f87a605c747837cc8767a352ea MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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 000000000000..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 <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 new file mode 100644 index 000000000000..bf5d94dae4d6 --- /dev/null +++ b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000000..5b2bc07aa1ed --- /dev/null +++ b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch @@ -0,0 +1,202 @@ +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.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild index d2ea26577868..927de1cf02ef 100644 --- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild +++ b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.82.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="Program to create cross stitch patterns" @@ -17,27 +17,28 @@ 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/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] - x11-libs/libX11 -" -RDEPEND="${DEPEND} - !media-gfx/kxstitch:4 " +RDEPEND="${DEPEND}" +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${FILESDIR}/${P}-drop-xkeylock.patch" + "${FILESDIR}/${P}-fix-render-scaled-painter.patch" + "${FILESDIR}/${P}-fix-hidpi.patch" +) |