commit: 8e1738a03dc487b5826c2661fc86234f7c98e78b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 21:47:49 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 21:47:49 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=8e1738a0
kde-misc/krusader: Import 2.4.0_beta3-r2 from before slot 4 removal
Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../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 | 35 +++++++++
kde-misc/krusader/metadata.xml | 5 +-
4 files changed, 138 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000..1760adbc
--- /dev/null
+++ b/kde-misc/krusader/files/krusader-2.4.0_beta3-new-folder.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 00000000..6ea7ad4e
--- /dev/null
+++ b/kde-misc/krusader/files/krusader-2.5.0-hardcode-krarc-mimes.patch
@@ -0,0 +1,88 @@
+commit f57edb20c4fa4e53d6a245dcc81273b62e44f611
+Author: Martin Kostolný <[email protected]>
+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
new file mode 100644
index 00000000..8c81c1f2
--- /dev/null
+++ b/kde-misc/krusader/krusader-2.4.0_beta3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many
extras"
+HOMEPAGE="https://krusader.org/";
+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 6f49eba8..e7dbfde9 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
+ <use>
+ <flag name="bookmarks">Add dependency on bookmark
package.</flag>
+ </use>
</pkgmetadata>
