From d8e7aaf1b90b28ec354e7854abea07d53644e754 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Dec 2023 13:58:21 +0000 Subject: gentoo auto-resync : 21:12:2023 - 13:58:21 --- kde-misc/krusader/Manifest | 4 ++ .../krusader-2.8.0-icon-dimming-w-hidpi.patch | 26 +++++++ .../krusader-2.8.0-icon-render-w-app-scaling.patch | 50 +++++++++++++ .../krusader/files/krusader-2.8.0-segfault.patch | 63 ++++++++++++++++ kde-misc/krusader/krusader-2.8.0-r1.ebuild | 83 ++++++++++++++++++++++ 5 files changed, 226 insertions(+) create mode 100644 kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch create mode 100644 kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch create mode 100644 kde-misc/krusader/files/krusader-2.8.0-segfault.patch create mode 100644 kde-misc/krusader/krusader-2.8.0-r1.ebuild (limited to 'kde-misc/krusader') diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest index 93ac12a2dfb0..6c1c79487470 100644 --- a/kde-misc/krusader/Manifest +++ b/kde-misc/krusader/Manifest @@ -1,3 +1,7 @@ +AUX krusader-2.8.0-icon-dimming-w-hidpi.patch 1120 BLAKE2B fefa9fdc1928bb63c8bc94de8c529ce800737c5c3eec8773ebb3c46eddd38e3baead885ffeb6787e3bc7eb5e4c0480d9032f06481c285f5f3a88ebde42d77419 SHA512 380c7c74469245b5226d1eb81165c8b7a93aa81c108493562db4a862e614dc233861807edd53141d3a94b9a5af7d6b9ff259e9fb249917929e7663171ce60453 +AUX krusader-2.8.0-icon-render-w-app-scaling.patch 1763 BLAKE2B e7a44bb25d3c497befde5f4ff5c858b15e1f7492ee5aa8af949a8b68666324f7ec59a07f6e27f9303251b6aed076aa142eb901fa947287e74f9c8b336e85b6b2 SHA512 dd24dd9e89ac0cd02d91f4bb5a7d30cb2e8be9ae56b7ea2c3986a7c268d3ed330ffc0f3a133df8b27bb79e4b4e1d07f1ba1c825b75689689ca93f08898108faa +AUX krusader-2.8.0-segfault.patch 2969 BLAKE2B 2f9c38973db261c54ce29b56c9056c00de8ef3e6ab0b7aab0ccfacfa20f50cf201e8420ab07d43b49e5d2891b34e2a8305b3c7af4a04ef6e20a9a09864d0dc50 SHA512 4ca3c831cdf550f3af50d5c93d9207156b2f3417a0082a2c8a67e7e7da33ce3ed45f1a429f9a38babb1fcbd5731fcc7f8e5c2cdcdef6a3889be2a378ecc08382 DIST krusader-2.8.0.tar.xz 3029352 BLAKE2B 08f8def0f2a2904cb80820b80005289d596d1cc2777fa122777fafe47f11ebfc0f5742b64d26be5ff9f3f393437d533c3ce91eb1442d1e90d9768ca4f40e71b7 SHA512 40a8736e91756153c649defaaef956f4d65664b4a86e64f861f34744980cdebb2da8d31f596fdc53ea911a7b7ea1a4f1875b8e564976770558bf64e77ff25583 +EBUILD krusader-2.8.0-r1.ebuild 2311 BLAKE2B 0c34b060d0a9cccc1d106ba638ad8c71a224709d5ad9ba2bd9b358af67d6090fc67c5b3bdddd6f0bbd442aaf492b20f07e625ba5d4d41ec6fc6a79cc5320b4a0 SHA512 8c16dc0e139e0fafe231305038f9cda146ba2e535f39532ddfcfaf87c456585499f91e8ec009bb67132bc0854d70d009bf2e80e6ad1eec601705b977570412a3 EBUILD krusader-2.8.0.ebuild 2161 BLAKE2B aa35df79e1034ea997b83dfd84f1f051b72e623c8300401c0dc0acaf28cb34fc8ec48e2c2b51c78eb56d120fd6304a22a441ebacc69a7fc7141cb0eeefc70baf SHA512 e4413d7ccc4bd8b67608568304881cfb9f04041e9817fdd700793cc8bbc1dc4ec41766db4ee3a5723b070dd3e12f8c61abdd638f501f0a68fe88e13ddc3e55d5 MISC metadata.xml 379 BLAKE2B ea6ee33414408211eae71089b6357632a6350577ec06f7d18f60fd6d2a9352117ea77e50262a53b7ed7f6578edfe5e3d929647095b49504bec564d6e47e94885 SHA512 4426cb4d691670ca22cca9dc59d6fe3ce765c7923e545ca8488355e00a4b57b6c127deaecf4f8c0bb4b1880e939b8bef65954e3667f116af97e6893c40702f89 diff --git a/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch b/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch new file mode 100644 index 000000000000..e0bf516bbdfb --- /dev/null +++ b/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch @@ -0,0 +1,26 @@ +From 7ea9f1f0dbdd07cd5c5baae56bb672a7be519932 Mon Sep 17 00:00:00 2001 +From: Wladimir Palant +Date: Wed, 8 Mar 2023 17:07:15 +0100 +Subject: [PATCH] Fixed dimming of file icons in HiDPI environments + +Discussion: https://invent.kde.org/utilities/krusader/-/merge_requests/119 +--- + app/Panel/PanelView/krview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/Panel/PanelView/krview.cpp b/app/Panel/PanelView/krview.cpp +index a974b1ad2..a5b1b3872 100644 +--- a/app/Panel/PanelView/krview.cpp ++++ b/app/Panel/PanelView/krview.cpp +@@ -297,7 +297,7 @@ QPixmap KrView::processIcon(const QPixmap &icon, bool dim, const QColor & dimCol + p.fillRect(0, 0, icon.width(), icon.height(), dimColor); + p.setCompositionMode(QPainter::CompositionMode_SourceOver); + p.setOpacity((qreal)dimFactor / (qreal)100); +- p.drawPixmap(0, 0, icon.width(), icon.height(), pixmap); ++ p.drawPixmap(0, 0, pixmap); + + return QPixmap::fromImage(dimmed, Qt::ColorOnly | Qt::ThresholdDither | + Qt::ThresholdAlphaDither | Qt::NoOpaqueDetection ); +-- +GitLab + diff --git a/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch b/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch new file mode 100644 index 000000000000..b56bc567a2ce --- /dev/null +++ b/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch @@ -0,0 +1,50 @@ +From 2bd5cd0db362db944bdea639bf0be33f6f439268 Mon Sep 17 00:00:00 2001 +From: Evgeny Brazgin +Date: Sun, 5 Mar 2023 22:48:27 -0800 +Subject: [PATCH 1/2] Add workaround for icon size in HiDPI environment + +--- + app/Panel/PanelView/listmodel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/Panel/PanelView/listmodel.cpp b/app/Panel/PanelView/listmodel.cpp +index d6ad6c5f8..7731e8951 100644 +--- a/app/Panel/PanelView/listmodel.cpp ++++ b/app/Panel/PanelView/listmodel.cpp +@@ -177,7 +177,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const + if (properties()->displayIcons) { + if (_justForSizeHint) + return QPixmap(_view->fileIconSize(), _view->fileIconSize()); +- return _view->getIcon(fileitem); ++ return QIcon(_view->getIcon(fileitem)); + } + break; + } +-- +GitLab + + +From f447f96f14fdb4f86ccc1286692accbec535ecb0 Mon Sep 17 00:00:00 2001 +From: Evgeny Brazgin +Date: Sun, 12 Mar 2023 21:35:27 -0700 +Subject: [PATCH 2/2] Don't set QStyle::State_None for brief view + +--- + app/Panel/PanelView/krinterbriefview.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/app/Panel/PanelView/krinterbriefview.cpp b/app/Panel/PanelView/krinterbriefview.cpp +index 69496f890..4042c163c 100644 +--- a/app/Panel/PanelView/krinterbriefview.cpp ++++ b/app/Panel/PanelView/krinterbriefview.cpp +@@ -401,7 +401,6 @@ void KrInterBriefView::paintEvent(QPaintEvent *e) + intersectionSet(area, intersectVector); + + foreach(const QModelIndex &mndx, intersectVector) { +- option.state = QStyle::State_None; + option.rect = visualRect(mndx); + painter.save(); + +-- +GitLab + diff --git a/kde-misc/krusader/files/krusader-2.8.0-segfault.patch b/kde-misc/krusader/files/krusader-2.8.0-segfault.patch new file mode 100644 index 000000000000..ac53d8772270 --- /dev/null +++ b/kde-misc/krusader/files/krusader-2.8.0-segfault.patch @@ -0,0 +1,63 @@ +From 2938db287f95a772792420f887dec2d88413409b Mon Sep 17 00:00:00 2001 +From: Pavel Karelin +Date: Fri, 25 Nov 2022 22:02:00 +0300 +Subject: [PATCH] Fixed segmentation fault when using CTRL+Left/Right on a + panel with invalid path + +FIXED: [ 462086 ] Segmentation fault when using CTRL+Left/Right on a panel with invalid path +BUG: 462086 + +Discussion: https://invent.kde.org/utilities/krusader/-/merge_requests/117 +--- + app/Panel/listpanel.cpp | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/app/Panel/listpanel.cpp b/app/Panel/listpanel.cpp +index dde22a257..be785a49f 100644 +--- a/app/Panel/listpanel.cpp ++++ b/app/Panel/listpanel.cpp +@@ -913,26 +913,26 @@ void ListPanel::keyPressEvent(QKeyEvent *e) + // user pressed CTRL+Right/Left - refresh other panel to the selected path if it's a + // directory otherwise as this one + if ((isLeft() && e->key() == Qt::Key_Right) || (!isLeft() && e->key() == Qt::Key_Left)) { +- QUrl newPath; +- KrViewItem *it = view->getCurrentKrViewItem(); +- +- if (it->name() == "..") { +- newPath = KIO::upUrl(virtualPath()); +- } else { +- FileItem *v = func->getFileItem(it); +- // If it's a directory different from ".." +- if (v && v->isDir() && v->getName() != "..") { +- newPath = v->getUrl(); ++ if (KrViewItem *it = view->getCurrentKrViewItem()) { ++ QUrl newPath; ++ if (it->name() == "..") { ++ newPath = KIO::upUrl(virtualPath()); + } else { +- // If it's a supported compressed file +- if (v && KrArcHandler::arcSupported(v->getMime())) { +- newPath = func->browsableArchivePath(v->getUrl().fileName()); ++ FileItem *v = func->getFileItem(it); ++ // If it's a directory different from ".." ++ if (v && v->isDir() && v->getName() != "..") { ++ newPath = v->getUrl(); + } else { +- newPath = virtualPath(); ++ // If it's a supported compressed file ++ if (v && KrArcHandler::arcSupported(v->getMime())) { ++ newPath = func->browsableArchivePath(v->getUrl().fileName()); ++ } else { ++ newPath = virtualPath(); ++ } + } + } ++ otherPanel()->func->openUrl(newPath); + } +- otherPanel()->func->openUrl(newPath); + } else { + func->openUrl(otherPanel()->virtualPath()); + } +-- +GitLab + diff --git a/kde-misc/krusader/krusader-2.8.0-r1.ebuild b/kde-misc/krusader/krusader-2.8.0-r1.ebuild new file mode 100644 index 000000000000..23da7d3ff242 --- /dev/null +++ b/kde-misc/krusader/krusader-2.8.0-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org optfeature + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras" +HOMEPAGE="https://krusader.org/" + +LICENSE="GPL-2+" +SLOT="5" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}: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/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + sys-apps/acl + sys-libs/zlib +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) +" + +PATCHES=( + "${FILESDIR}/${P}-icon-dimming-w-hidpi.patch" + "${FILESDIR}/${P}-icon-render-w-app-scaling.patch" + "${FILESDIR}/${P}-segfault.patch" +) + +src_prepare() { + ecm_src_prepare + use handbook || cmake_comment_add_subdirectory doc/handbook +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}" + optfeature "PDF/PS and RAW image thumbnails" "kde-apps/thumbnailers:${SLOT}" + optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}" + optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}" + fi + ecm_pkg_postinst +} -- cgit v1.2.3