commit: 3305ff2be5255bfd9fe7fd9848ceddef9339936e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jul 15 07:46:57 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jul 16 11:23:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3305ff2b
kde-misc/kdiff3: Drop 1.8.5 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/kdiff3/Manifest | 1 - kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch | 112 ------------------------- kde-misc/kdiff3/kdiff3-1.8.5.ebuild | 40 --------- 3 files changed, 153 deletions(-) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 18b9eac6257..7a7b12e9bb0 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1 @@ -DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4 DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8 diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch deleted file mode 100644 index 180009afe0e..00000000000 --- a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 5dcc0673c61cc75122bf5f812a45bbb15b778218 Mon Sep 17 00:00:00 2001 -From: Alexander Volkov <[email protected]> -Date: Mon, 27 Apr 2020 15:52:18 +0300 -Subject: [PATCH] Add HiDPI support - -* Backported to 1.8 branch ---- - src/Overview.cpp | 6 ++++-- - src/directorymergewindow.cpp | 15 +++++++++------ - src/main.cpp | 1 + - src/mergeresultwindow.cpp | 7 +++++-- - 4 files changed, 19 insertions(+), 10 deletions(-) - -diff --git a/src/Overview.cpp b/src/Overview.cpp -index ee1d73f..ac35e7e 100644 ---- a/src/Overview.cpp -+++ b/src/Overview.cpp -@@ -271,7 +271,8 @@ void Overview::paintEvent(QPaintEvent*) - int h = height() - 1; - int w = width(); - -- if(m_pixmap.size() != size()) -+ const auto dpr = devicePixelRatioF(); -+ if(m_pixmap.size() != size() * dpr) - { - if(m_pOptions->m_bWordWrap) - { -@@ -287,7 +288,8 @@ void Overview::paintEvent(QPaintEvent*) - m_nofLines = m_pDiff3LineList->size(); - } - -- m_pixmap = QPixmap(size()); -+ m_pixmap = QPixmap(size() * dpr); -+ m_pixmap.setDevicePixelRatio(dpr); - - QPainter p(&m_pixmap); - p.fillRect(rect(), m_pOptions->m_bgColor); -diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp -index 31dbcaf..1cc62b4 100644 ---- a/src/directorymergewindow.cpp -+++ b/src/directorymergewindow.cpp -@@ -584,7 +584,10 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public QStyledItemDelegate - //QPixmap icon = value.value<QPixmap>(); //pixmap(column); - if(!icon.isNull()) - { -- int yOffset = (sizeHint(option, index).height() - icon.height()) / 2; -+ const auto dpr = thePainter->device()->devicePixelRatioF(); -+ const int w = qRound(icon.width() / dpr); -+ const int h = qRound(icon.height() / dpr); -+ int yOffset = (sizeHint(option, index).height() - h) / 2; - thePainter->drawPixmap(x + 2, y + yOffset, icon); - - int i = index == d->m_selection1Index ? 1 : index == d->m_selection2Index ? 2 : index == d->m_selection3Index ? 3 : 0; -@@ -593,20 +596,20 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public QStyledItemDelegate - Options* pOpts = d->m_pOptions; - QColor c(i == 1 ? pOpts->m_colorA : i == 2 ? pOpts->m_colorB : pOpts->m_colorC); - thePainter->setPen(c); // highlight() ); -- thePainter->drawRect(x + 2, y + yOffset, icon.width(), icon.height()); -+ thePainter->drawRect(x + 2, y + yOffset, w, h); - thePainter->setPen(QPen(c, 0, Qt::DotLine)); -- thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2); -+ thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 2); - thePainter->setPen(Qt::white); - QString s(QChar('A' + i - 1)); - -- thePainter->drawText(x + 2 + (icon.width() - Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2, -- y + yOffset + (icon.height() + thePainter->fontMetrics().ascent()) / 2 - 1, -+ thePainter->drawText(x + 2 + (w - Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2, -+ y + yOffset + (h + thePainter->fontMetrics().ascent()) / 2 - 1, - s); - } - else - { - thePainter->setPen(m_pDMW->palette().window().color()); -- thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2); -+ thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 2); - } - return; - } -diff --git a/src/main.cpp b/src/main.cpp -index df06eab..c62aee3 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -81,6 +81,7 @@ int main(int argc, char* argv[]) - { - const QLatin1String appName("kdiff3"); - -+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); // KAboutData and QCommandLineParser depend on this being setup. - KLocalizedString::setApplicationDomain(appName.data()); - -diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp -index 894bc44..29d16ae 100644 ---- a/src/mergeresultwindow.cpp -+++ b/src/mergeresultwindow.cpp -@@ -1970,8 +1970,11 @@ void MergeResultWindow::paintEvent(QPaintEvent*) - if(!m_bCursorUpdate) // Don't redraw everything for blinking cursor? - { - m_selection.bSelectionContainsData = false; -- if(size() != m_pixmap.size()) -- m_pixmap = QPixmap(size()); -+ const auto dpr = devicePixelRatioF(); -+ if(size() * dpr != m_pixmap.size()) { -+ m_pixmap = QPixmap(size() * dpr); -+ m_pixmap.setDevicePixelRatio(dpr); -+ } - - RLPainter p(&m_pixmap, m_pOptions->m_bRightToLeftLanguage, width(), fontWidth); - p.setFont(font()); --- -2.27.0 - diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild deleted file mode 100644 index c9625b834e8..00000000000 --- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild +++ /dev/null @@ -1,40 +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="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"; -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -RDEPEND="${DEPEND} - sys-apps/diffutils -" - -PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )
