summaryrefslogtreecommitdiff
path: root/kde-misc/kdiff3
diff options
context:
space:
mode:
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/Manifest5
-rw-r--r--kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch112
-rw-r--r--kde-misc/kdiff3/kdiff3-1.8.5.ebuild40
-rw-r--r--kde-misc/kdiff3/kdiff3-1.9.2.ebuild3
4 files changed, 3 insertions, 157 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 49600c41b09c..152ac34a1c4d 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,7 +1,4 @@
-AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
AUX kdiff3-1.9.0-gcc11.patch 559 BLAKE2B 6596e7f41fb5dfaeac08cfe3871f67ade513a0d89ec6801af4b688107e18e6bacb5d94199187f8be9a732e6ecb4f6fe81ff8b4124a205654714da303fe5a1786 SHA512 25e88b616e706d4a6a19849647650bd4763684ca7dc518ace7aa8aebeafb49477182f1b78143ae1554e823f547a4caacb6ba08e8c4f367a7de63b518a3c84309
-DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8
-EBUILD kdiff3-1.8.5.ebuild 1060 BLAKE2B 90af39a2d93a2b80970e8375688b367bcfe4f1e7b9f01c8f1dd7fcc2c65f8d45a874d87bf8d5149536c2f59d50b74a123736ee47173b18d8d9e7bd01b86be3bf SHA512 c4e4f500c6016a456e89a3b2656267d56b6839ace4e4804d68af26cce6ca3a01ef88775ed1f23c7805e9fdd70414ef0afe9c7777376ac220122e757181af5c84
-EBUILD kdiff3-1.9.2.ebuild 1096 BLAKE2B f7a72ffdf88b1db717603f9d42dcd9eef7a25fd27a9bef981cb65939626ce9c7e003187a81f5557d1759a09a7bacbebf0b13d42e4cd1868eb6aa2f3f68652539 SHA512 953b23ddb8dc374a8a0cb9de36b4ec9546b0a6feb51ddb854d23268f527526804592d000dd6540ed0ab4488fe33fae46043d6b9c9fbeef0dcda3cf8ea2f430e9
+EBUILD kdiff3-1.9.2.ebuild 1119 BLAKE2B a527ffa09c821a31331814eed29199eede95e7e63d9792edf8ea728e894627ab15b16b7c580b0f50672691a209b502f54aa53ac312c510dd3383100707c7bf06 SHA512 47c7266b9be2ebeb45e0b7ca39da2617846a1fc0713f2b34efe1a872b10378df5875f0b6c28531ab744496d68b66dc5828119208bbeefb09ad78d768f685f5ae
MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
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 180009afe0e7..000000000000
--- 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 <avolkov@astralinux.ru>
-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 c9625b834e80..000000000000
--- 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" )
diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
index a05eeb463c6a..82515f73d04b 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
ECM_HANDBOOK="optional"
KFMIN=5.74.0
QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
@@ -14,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE=""
COMMON_DEPEND="
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 12:21:07 +0000