[gentoo-commits] repo/gentoo:master commit in: kde-apps/kfind/files/, kde-apps/kfind/

[Andreas Sturmlechner]

commit:     9271d41df8a7c2753171771f9b7947d635621e0f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 22:35:21 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 00:06:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9271d41d

kde-apps/kfind: Clean up defunct KRegExpEditorInterface code

Incidentally drops an unused dependency we had not listed.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kfind/files/kfind-21.04.3-unused-dep.patch     | 272 +++++++++++++++++++++
 kde-apps/kfind/kfind-21.04.3-r1.ebuild             |  39 +++
 2 files changed, 311 insertions(+)

diff --git a/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
new file mode 100644
index 00000000000..f348bf39b5d
--- /dev/null
+++ b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
@@ -0,0 +1,272 @@
+From b23e8823d7c950b43259b8750f0d14c19fa5f31c Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@×××.de>
+Date: Sat, 22 May 2021 07:15:04 +0200
+Subject: [PATCH] Clean up defunct KRegExpEditorInterface code
+
+This code is deprecated, defunct and partly commented out for years.
+---
+ CMakeLists.txt     |  1 -
+ src/CMakeLists.txt |  1 -
+ src/kftabdlg.cpp   | 48 +---------------------------------------------
+ src/kftabdlg.h     |  4 ----
+ src/kquery.cpp     | 31 +++++++-----------------------
+ src/kquery.h       |  3 +--
+ 6 files changed, 9 insertions(+), 79 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4587dd278..1c867f5b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     FileMetaData
+     I18n
+     KIO
+-    TextWidgets
+     WidgetsAddons
+ )
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 97d81a963..d24b5f4b0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,7 +22,6 @@ KF5::CoreAddons
+ KF5::FileMetaData
+ KF5::I18n
+ KF5::KIOWidgets
+-KF5::TextWidgets
+ KF5::WidgetsAddons
+ KF5::XmlGui
+ )
+diff --git a/src/kftabdlg.cpp b/src/kftabdlg.cpp
+index ddb9c7be0..f2c6cbf7a 100644
+--- a/src/kftabdlg.cpp
++++ b/src/kftabdlg.cpp
+@@ -29,8 +29,6 @@
+ #include <KLineEdit>
+ #include <KLocalizedString>
+ #include <KMessageBox>
+-#include <KRegExpEditorInterface>
+-#include <KServiceTypeTrader>
+ #include <KSharedConfig>
+ #include <KShell>
+ #include <KUrlComboBox>
+@@ -55,7 +53,6 @@ struct MimeTypes
+ 
+ KfindTabWidget::KfindTabWidget(QWidget *parent)
+     : QTabWidget(parent)
+-    , regExpDialog(nullptr)
+ {
+     // This validator will be used for all numeric edit fields
+     //KDigitValidator *digitV = new KDigitValidator(this);
+@@ -307,7 +304,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+ 
+     caseContextCb = new QCheckBox(i18n("Case s&ensitive"), pages[2]);
+     binaryContextCb = new QCheckBox(i18n("Include &binary files"), pages[2]);
+-    regexpContentCb = new QCheckBox(i18n("Regular e&xpression"), pages[2]);
+ 
+     const QString binaryTooltip
+         = i18n("<qt>This lets you search in any type of file, "
+@@ -315,13 +311,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+                "program files and images).</qt>");
+     binaryContextCb->setToolTip(binaryTooltip);
+ 
+-    QPushButton *editRegExp = nullptr;
+-    if (!KServiceTypeTrader::self()->query(QStringLiteral("KRegExpEditor/KRegExpEditor")).isEmpty()) {
+-        // The editor is available, so lets use it.
+-        editRegExp = new QPushButton(i18n("&Edit..."), pages[2]);
+-        editRegExp->setObjectName(QStringLiteral("editRegExp"));
+-    }
+-
+     metainfokeyEdit = new KLineEdit(pages[2]);
+     metainfoEdit = new KLineEdit(pages[2]);
+     QLabel *textMetaInfo = new QLabel(i18nc("as in search for", "fo&r:"), pages[2]);
+@@ -387,15 +376,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+         watcher->deleteLater();
+     });
+ 
+-    if (editRegExp) {
+-        // The editor was available, so lets use it.
+-        connect(regexpContentCb, &QCheckBox::toggled, editRegExp, &QPushButton::setEnabled);
+-        editRegExp->setEnabled(false);
+-        connect(editRegExp, &QPushButton::clicked, this, &KfindTabWidget::slotEditRegExp);
+-    } else {
+-        regexpContentCb->hide();
+-    }
+-
+     // Layout
+     tmp = sizeEdit->fontMetrics().boundingRect(QStringLiteral(" 00000 ")).width();
+     sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
+@@ -405,7 +385,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+     grid2->addWidget(textL, 1, 0);
+     grid2->addWidget(typeBox, 0, 1, 1, 3);
+     grid2->addWidget(textEdit, 1, 1, 1, 3);
+-    grid2->addWidget(regexpContentCb, 2, 2);
+     grid2->addWidget(caseContextCb, 2, 1);
+     grid2->addWidget(binaryContextCb, 3, 1);
+ 
+@@ -416,11 +395,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
+ 
+     metainfokeyEdit->setText(QStringLiteral("*"));
+ 
+-    if (editRegExp) {
+-        // The editor was available, so lets use it.
+-        grid2->addWidget(editRegExp, 2, 3);
+-    }
+-
+     addTab(pages[0], i18n("Name/&Location"));
+     addTab(pages[2], i18nc("tab name: search by contents", "C&ontents"));
+     addTab(pages[1], i18n("&Properties"));
+@@ -532,25 +506,6 @@ void KfindTabWidget::loadHistory()
+     }
+ }
+ 
+-void KfindTabWidget::slotEditRegExp()
+-{
+-#if 0
+-    if (!regExpDialog) {
+-        regExpDialog = KServiceTypeTrader::createInstanceFromQuery<QDialog>(QStringLiteral("KRegExpEditor/KRegExpEditor"), QString(), this);
+-    }
+-
+-    KRegExpEditorInterface *iface = qobject_cast<KRegExpEditorInterface *>(regExpDialog);
+-    if (!iface) {
+-        return;
+-    }
+-
+-    iface->setRegExp(textEdit->text());
+-    if (regExpDialog->exec()) {
+-        textEdit->setText(iface->regExp());
+-    }
+-#endif
+-}
+-
+ void KfindTabWidget::setFocus()
+ {
+     nameBox->setFocus();
+@@ -771,8 +726,7 @@ void KfindTabWidget::setQuery(KQuery *query)
+ 
+     query->setShowHiddenFiles(hiddenFilesCb->isChecked());
+ 
+-    query->setContext(textEdit->text(), caseContextCb->isChecked(),
+-                      binaryContextCb->isChecked(), regexpContentCb->isChecked());
++    query->setContext(textEdit->text(), caseContextCb->isChecked(), binaryContextCb->isChecked());
+ }
+ 
+ void KfindTabWidget::getDirectory()
+diff --git a/src/kftabdlg.h b/src/kftabdlg.h
+index e2a4912d6..336835a06 100644
+--- a/src/kftabdlg.h
++++ b/src/kftabdlg.h
+@@ -23,7 +23,6 @@ class QString;
+ class QDate;
+ class QRegExp;
+ class KDateComboBox;
+-class QDialog;
+ class KComboBox;
+ class QSpinBox;
+ class QLabel;
+@@ -60,7 +59,6 @@ private Q_SLOTS:
+     void getDirectory();
+     void fixLayout();
+     void slotSizeBoxChanged(int);
+-    void slotEditRegExp();
+ 
+ Q_SIGNALS:
+     void startSearch();
+@@ -112,8 +110,6 @@ private:
+     QSpinBox *sizeEdit;
+     QCheckBox *caseContextCb;
+     QCheckBox *binaryContextCb;
+-    QCheckBox *regexpContentCb;
+-    QDialog *regExpDialog;
+ 
+     QUrl m_url;
+ 
+diff --git a/src/kquery.cpp b/src/kquery.cpp
+index 91e45ed07..c6c7327bf 100644
+--- a/src/kquery.cpp
++++ b/src/kquery.cpp
+@@ -35,7 +35,6 @@ KQuery::KQuery(QObject *parent)
+     , m_recursive(false)
+     , m_casesensitive(false)
+     , m_search_binary(false)
+-    , m_regexpForContent(false)
+     , m_useLocate(false)
+     , m_showHiddenFiles(false)
+     , job(nullptr)
+@@ -458,19 +457,11 @@ void KQuery::processQuery(const KFileItem &file)
+                 str.remove(xmlTags);
+             }
+ 
+-            if (m_regexpForContent) {
+-                if (m_regexp.indexIn(str) >= 0) {
+-                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
+-                    found = true;
+-                    break;
+-                }
+-            } else {
+-                if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
+-                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
+-                    found = true;
+-                    break;
+-                }
+-            }
++	if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
++	    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
++	    found = true;
++	    break;
++	}
+             qApp->processEvents();
+         }
+ 
+@@ -484,25 +475,17 @@ void KQuery::processQuery(const KFileItem &file)
+     m_foundFilesList.append(QPair<KFileItem, QString>(file, matchingLine));
+ }
+ 
+-void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp)
++void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary)
+ {
+     m_context = context;
+     m_casesensitive = casesensitive;
+     m_search_binary = search_binary;
+-    m_regexpForContent = useRegexp;
+-    if (!m_regexpForContent) {
+-        m_regexp.setPatternSyntax(QRegExp::Wildcard);
+-    } else {
+-        m_regexp.setPatternSyntax(QRegExp::RegExp);
+-    }
++    m_regexp.setPatternSyntax(QRegExp::Wildcard);
+     if (casesensitive) {
+         m_regexp.setCaseSensitivity(Qt::CaseSensitive);
+     } else {
+         m_regexp.setCaseSensitivity(Qt::CaseInsensitive);
+     }
+-    if (m_regexpForContent) {
+-        m_regexp.setPattern(m_context);
+-    }
+ }
+ 
+ void KQuery::setMetaInfo(const QString &metainfo, const QString &metainfokey)
+diff --git a/src/kquery.h b/src/kquery.h
+index 285b37214..2e581765c 100644
+--- a/src/kquery.h
++++ b/src/kquery.h
+@@ -38,7 +38,7 @@ public:
+     void setPath(const QUrl &url);
+     void setFileType(int filetype);
+     void setMimeType(const QStringList &mimetype);
+-    void setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp);
++    void setContext(const QString &context, bool casesensitive, bool search_binary);
+     void setUsername(const QString &username);
+     void setGroupname(const QString &groupname);
+     void setMetaInfo(const QString &metainfo, const QString &metainfokey);
+@@ -93,7 +93,6 @@ private:
+     QString m_metainfokey;
+     bool m_casesensitive;
+     bool m_search_binary;
+-    bool m_regexpForContent;
+     bool m_useLocate;
+     bool m_showHiddenFiles;
+     QByteArray bufferLocate;
+-- 
+GitLab
+

diff --git a/kde-apps/kfind/kfind-21.04.3-r1.ebuild b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
new file mode 100644
index 00000000000..96d049f4505
--- /dev/null
+++ b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="File finder utility based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kfind/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )