* [gentoo-commits] repo/gentoo:master commit in: kde-misc/krusader/files/, kde-misc/krusader/
@ 2017-01-23 8:04 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2017-01-23 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 284b5c56b5ade28c379d24181a6dc9545dfe527c
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 08:02:33 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 08:02:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284b5c56
kde-misc/krusader: Drop slot 4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-misc/krusader/Manifest | 1 -
.../files/krusader-2.4.0_beta3-new-folder.patch | 11 ---
.../krusader-2.5.0-hardcode-krarc-mimes.patch | 88 ----------------------
kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild | 38 ----------
kde-misc/krusader/metadata.xml | 3 -
5 files changed, 141 deletions(-)
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 5ce6940..0f334cf 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,2 +1 @@
-DIST krusader-2.4.0-beta3.tar.bz2 4305463 SHA256 ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae SHA512 a0288b0a5d37ade197120f6d96054b5eb9da9bae746969b041f6692a1377e6732a46cf3a672d2a24a5b1eb514ec74ba98695255af39057c4dabe1d935a6f720a WHIRLPOOL 08184cb69dd66ab6738bded5d2c7b470d2659110cb406a9779b61a0dbc28d41b334f86525e6d1a5570c82e751b9bfe3a135d0c35943837a814a3e6746464a4dd
DIST krusader-2.5.0.tar.xz 2704584 SHA256 fb9f4b237378fd5d86d5c0202b9d714f3d8dfe549ba9e7926f6f9de60b5088d7 SHA512 e647b1ca2f3a61d74ceea892053465ec860642745a879f05d04d40e277ece7508a75672eaf4031dc8b6568bd67464182d6ea9d194db13907784350f364c99fec WHIRLPOOL c6cff096c55a2eda7c1a1c1805ed04ccf44eb82e7f97ec6ee37795297bf2de75bde67d8c6b12a441ea72a28ad181af2d7fc3bb616c5c8a391aacf4f591eccf98
diff --git a/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch b/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch
deleted file mode 100644
index 1760adb..00000000
--- a/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/krusader/Panel/panelfunc.cpp
-+++ b/krusader/Panel/panelfunc.cpp
-@@ -100,7 +100,7 @@
- {
- public:
- virtual State validate(QString &input, int &pos) const {
-- return input.isEmpty() ? Invalid : Acceptable;
-+ return input.isEmpty() ? Intermediate : Acceptable;
- }
- };
-
diff --git a/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch b/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch
deleted file mode 100644
index 6ea7ad4..00000000
--- a/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-commit f57edb20c4fa4e53d6a245dcc81273b62e44f611
-Author: Martin Kostolný <clearmartin@zoho.com>
-Date: Mon Dec 5 00:43:53 2016 +0100
-
- Hard-code krarc.protocol mimetypes that were recently removed from protocol
-
- Differential Revision: https://phabricator.kde.org/D3566
-
-diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp
-index 86bc0cf..b286066 100644
---- a/krusader/krservices.cpp
-+++ b/krusader/krservices.cpp
-@@ -30,14 +30,49 @@
- #include "defaults.h"
-
- QMap<QString, QString>* KrServices::slaveMap = 0;
-+QSet<QString> KrServices::krarcArchiveMimetypes = KrServices::generateKrarcArchiveMimetypes();
- #ifdef KRARC_QUERY_ENABLED
--QSet<QString> KrServices::krarcArchiveMimetypes = QSet<QString>::fromList(KProtocolInfo::archiveMimetypes("krarc"));
- QSet<QString> KrServices::isoArchiveMimetypes = QSet<QString>::fromList(KProtocolInfo::archiveMimetypes("iso"));
- #else
--QSet<QString> KrServices::krarcArchiveMimetypes;
- QSet<QString> KrServices::isoArchiveMimetypes;
- #endif
-
-+QSet<QString> KrServices::generateKrarcArchiveMimetypes()
-+{
-+ // Hard-code these proven mimetypes openable by krarc protocol.
-+ // They cannot be listed in krarc.protocol itself
-+ // because it would baffle other file managers (like Dolphin).
-+ QSet<QString> mimes;
-+ mimes += QString("application/x-deb");
-+ mimes += QString("application/x-debian-package");
-+ mimes += QString("application/vnd.debian.binary-package");
-+ mimes += QString("application/x-java-archive");
-+ mimes += QString("application/x-rpm");
-+ mimes += QString("application/x-source-rpm");
-+ mimes += QString("application/vnd.oasis.opendocument.chart");
-+ mimes += QString("application/vnd.oasis.opendocument.database");
-+ mimes += QString("application/vnd.oasis.opendocument.formula");
-+ mimes += QString("application/vnd.oasis.opendocument.graphics");
-+ mimes += QString("application/vnd.oasis.opendocument.presentation");
-+ mimes += QString("application/vnd.oasis.opendocument.spreadsheet");
-+ mimes += QString("application/vnd.oasis.opendocument.text");
-+ mimes += QString("application/vnd.openxmlformats-officedocument.presentationml.presentation");
-+ mimes += QString("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-+ mimes += QString("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
-+ mimes += QString("application/x-cbz");
-+ mimes += QString("application/x-cbr");
-+ mimes += QString("application/epub+zip");
-+ mimes += QString("application/x-webarchive");
-+ mimes += QString("application/x-plasma");
-+ mimes += QString("application/vnd.rar");
-+
-+ #ifdef KRARC_QUERY_ENABLED
-+ mimes += QSet<QString>::fromList(KProtocolInfo::archiveMimetypes("krarc"));
-+ #endif
-+
-+ return mimes;
-+}
-+
- bool KrServices::cmdExist(QString cmdName)
- {
- KConfigGroup group(krConfig, "Dependencies");
-diff --git a/krusader/krservices.h b/krusader/krservices.h
-index e9e805c..e54a0a6 100644
---- a/krusader/krservices.h
-+++ b/krusader/krservices.h
-@@ -32,9 +32,6 @@ class QFile;
- class KrServices
- {
- public:
-- KrServices() {}
-- ~KrServices() {}
--
- static bool cmdExist(QString cmdName);
- static QString chooseFullPathName(QStringList names, QString confName);
- static QString fullPathName(QString name, QString confName = QString());
-@@ -57,6 +54,9 @@ protected:
- static QString escape(QString name);
-
- private:
-+ KrServices() {}
-+ ~KrServices() {}
-+ static QSet<QString> generateKrarcArchiveMimetypes();
- static QMap<QString, QString>* slaveMap;
- static QSet<QString> krarcArchiveMimetypes;
- static QSet<QString> isoArchiveMimetypes;
diff --git a/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild
deleted file mode 100644
index 2806bc4..00000000
--- a/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga
-gl hr hu it ja ko lt mai nb nds nl pa pl pt pt_BR ro ru sk sl sr
-sr@ijekavian sr@ijekavianlatin sr@latin sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras"
-HOMEPAGE="https://quickgit.kde.org/?p=krusader.git"
-SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="+bookmarks debug"
-
-COMMON_DEPEND="
- $(add_kdeapps_dep libkonq)
- sys-libs/zlib
- bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
-"
-RDEPEND="${COMMON_DEPEND}
- $(add_kdeapps_dep kdebase-kioslaves)
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-new-folder.patch" )
-
-S="${WORKDIR}/${MY_P}"
diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml
index 636e170..13bd40c 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -5,9 +5,6 @@
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <use>
- <flag name="bookmarks">Add dependency on bookmark package.</flag>
- </use>
<upstream>
<remote-id type="sourceforge">krusader</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/krusader/files/, kde-misc/krusader/
@ 2023-12-21 10:15 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-12-21 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 8313cbf7011acb581fd5a9d9f9bb542345f4b874
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 09:47:01 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 10:15:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8313cbf7
kde-misc/krusader: Backport various upstream fixes
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../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 ++++++++++++++++++++++
4 files changed, 222 insertions(+)
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 <fqcgithub@palant.de>
+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 <xapienz@phystech.edu>
+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 <xapienz@phystech.edu>
+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 <hkarel@yandex.ru>
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/krusader/files/, kde-misc/krusader/
@ 2024-04-22 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-04-22 17:07 UTC (permalink / raw
To: gentoo-commits
commit: e69dd3818d755066fa50b7622a53588982b36ed7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 17:05:57 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 17:07:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69dd381
kde-misc/krusader: drop 2.8.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/krusader/Manifest | 1 -
.../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 | 84 ----------------------
5 files changed, 224 deletions(-)
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 86a99b4bb509..8525887b5808 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,2 +1 @@
-DIST krusader-2.8.0.tar.xz 3029352 BLAKE2B 08f8def0f2a2904cb80820b80005289d596d1cc2777fa122777fafe47f11ebfc0f5742b64d26be5ff9f3f393437d533c3ce91eb1442d1e90d9768ca4f40e71b7 SHA512 40a8736e91756153c649defaaef956f4d65664b4a86e64f861f34744980cdebb2da8d31f596fdc53ea911a7b7ea1a4f1875b8e564976770558bf64e77ff25583
DIST krusader-2.8.1.tar.xz 3104068 BLAKE2B 7bb3c27a67b1ac8c1875039d6b3f10d1515cd6f65f9a82c195b8e794cfaa3d8b152ec82bae4e25fb13d50ebee6afab889932e4d3787cdf2b78063724f3cd355e SHA512 36a0b1ea3f2c00fd9093ae45e8a3cf196eeb51ac3cc5a006c611f6eee4209ec8fd10f6c9590bb22f381e68e7457ea8f62b0296338271b826d2071add126cb7bb
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
deleted file mode 100644
index e0bf516bbdfb..000000000000
--- a/kde-misc/krusader/files/krusader-2.8.0-icon-dimming-w-hidpi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7ea9f1f0dbdd07cd5c5baae56bb672a7be519932 Mon Sep 17 00:00:00 2001
-From: Wladimir Palant <fqcgithub@palant.de>
-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
deleted file mode 100644
index b56bc567a2ce..000000000000
--- a/kde-misc/krusader/files/krusader-2.8.0-icon-render-w-app-scaling.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2bd5cd0db362db944bdea639bf0be33f6f439268 Mon Sep 17 00:00:00 2001
-From: Evgeny Brazgin <xapienz@phystech.edu>
-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 <xapienz@phystech.edu>
-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
deleted file mode 100644
index ac53d8772270..000000000000
--- a/kde-misc/krusader/files/krusader-2.8.0-segfault.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 2938db287f95a772792420f887dec2d88413409b Mon Sep 17 00:00:00 2001
-From: Pavel Karelin <hkarel@yandex.ru>
-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
deleted file mode 100644
index 2761dc096e83..000000000000
--- a/kde-misc/krusader/krusader-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 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 "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5"
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-22 17:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-22 17:07 [gentoo-commits] repo/gentoo:master commit in: kde-misc/krusader/files/, kde-misc/krusader/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 10:15 Andreas Sturmlechner
2017-01-23 8:04 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox