commit: 815f660b810183ee5b5d8bfdc47a2aaa9e785f0e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 26 16:35:33 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 26 23:03:00 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815f660b
dev-util/qdevicemonitor: drop 1.0.1-r3, 9999 Current snapshot is equivalent to 9999. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/45527 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/qdevicemonitor/Manifest | 1 - ...cemonitor-1.0.1-crash-after-fresh-install.patch | 27 -- ...vicemonitor-1.0.1-disable-pedantic-errors.patch | 31 -- ...emonitor-1.0.1-disable-warnings-as-errors.patch | 31 -- .../qdevicemonitor-1.0.1-endl-is-deprecated.patch | 27 -- .../files/qdevicemonitor-1.0.1-qt-5.11.patch | 25 -- .../files/qdevicemonitor-1.0.1-qt-6.patch | 454 --------------------- ...nitor-1.0.1-screen-geometry-is-deprecated.patch | 39 -- .../qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild | 55 --- dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild | 45 -- 10 files changed, 735 deletions(-) diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest index 4420afa40c01..42f5432bcf00 100644 --- a/dev-util/qdevicemonitor/Manifest +++ b/dev-util/qdevicemonitor/Manifest @@ -1,2 +1 @@ DIST qdevicemonitor-1.0.1-4d90f45d.tar.gz 939092 BLAKE2B 855abe8ba4a9041298a1c1bf25d14ef2266fd823b0982ff11e18c51b25da36139a50a69e7fbf01c428ac4c2a165b589afec467213b4377d3989f0403a19c35e0 SHA512 bc0bca545650a9d258315348b9ac8b6ffa302c08e6666a256b9e7fdd11698ef09d4ca3abf95a5a954dd41bda9dce9388f3fd2f92fcb0ca081b267d364fb40cf8 -DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55 diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch deleted file mode 100644 index e01dbf97ba2a..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 079bc4cf3a59a98c429b1db21fcf3f88c19d2bb5 Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Fri, 13 Jul 2018 18:37:42 +0300 -Subject: [PATCH] fix crash that happens after fresh installation - -Signed-off-by: Alexander Lopatin <[email protected]> ---- - qdevicemonitor/devices/DeviceFacade.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qdevicemonitor/devices/DeviceFacade.cpp b/qdevicemonitor/devices/DeviceFacade.cpp -index ced04b3..6df67eb 100644 ---- a/qdevicemonitor/devices/DeviceFacade.cpp -+++ b/qdevicemonitor/devices/DeviceFacade.cpp -@@ -151,8 +151,8 @@ void DeviceFacade::loadSettings(const QSettings& s) - if (darkTheme.isValid()) - { - m_darkTheme = darkTheme.toBool(); -- m_colorTheme = ColorTheme::create(m_darkTheme); - } -+ m_colorTheme = ColorTheme::create(m_darkTheme); - - const QVariant clearAndroidLog = s.value("clearAndroidLog"); - if (clearAndroidLog.isValid()) --- -2.16.4 - diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-disable-pedantic-errors.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-disable-pedantic-errors.patch deleted file mode 100644 index 61e16be45360..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-disable-pedantic-errors.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5b2a6cbc4d64d5ee48d6fae1cf2a8f17335be634 Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Wed, 13 Dec 2023 19:16:54 +0800 -Subject: [PATCH] Disable pedantic errors - -https://bugs.gentoo.org/919714 ---- - qdevicemonitor/qdevicemonitor.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qdevicemonitor/qdevicemonitor.pro b/qdevicemonitor/qdevicemonitor.pro -index 6aa2ecf..5327af0 100644 ---- a/qdevicemonitor/qdevicemonitor.pro -+++ b/qdevicemonitor/qdevicemonitor.pro -@@ -61,11 +61,11 @@ FORMS += \ - - CONFIG += c++11 link_pkgconfig - --QMAKE_CXXFLAGS += -pedantic-errors -pedantic -Wextra -Wall -+QMAKE_CXXFLAGS += -Wextra -Wall - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O3 - --QMAKE_CFLAGS += -pedantic-errors -pedantic -Wextra -Wall -std=c11 -+QMAKE_CFLAGS += -Wextra -Wall -std=c11 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O3 - --- -2.41.0 - diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-disable-warnings-as-errors.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-disable-warnings-as-errors.patch deleted file mode 100644 index f614d4532324..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-disable-warnings-as-errors.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 06c05271298c5cc76d6bc65747928928f202dd9d Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Fri, 4 Feb 2022 02:59:59 +0300 -Subject: [PATCH] Disable warnings as errors https://bugs.gentoo.org/751349 - https://bugs.gentoo.org/831575 - ---- - qdevicemonitor/qdevicemonitor.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qdevicemonitor/qdevicemonitor.pro b/qdevicemonitor/qdevicemonitor.pro -index e76d266..6aa2ecf 100644 ---- a/qdevicemonitor/qdevicemonitor.pro -+++ b/qdevicemonitor/qdevicemonitor.pro -@@ -61,11 +61,11 @@ FORMS += \ - - CONFIG += c++11 link_pkgconfig - --QMAKE_CXXFLAGS += -Werror -Wfatal-errors -pedantic-errors -pedantic -Wextra -Wall -+QMAKE_CXXFLAGS += -pedantic-errors -pedantic -Wextra -Wall - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O3 - --QMAKE_CFLAGS += -Werror -Wfatal-errors -pedantic-errors -pedantic -Wextra -Wall -std=c11 -+QMAKE_CFLAGS += -pedantic-errors -pedantic -Wextra -Wall -std=c11 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O3 - --- -2.34.1 - diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-endl-is-deprecated.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-endl-is-deprecated.patch deleted file mode 100644 index 27acb5d8ffba..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-endl-is-deprecated.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9808ae3279e5816dcc85cf8f21158ecf842dc185 Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Sat, 11 Jul 2020 03:18:14 +0300 -Subject: [PATCH] Fix "dev-util/qdevicemonitor-1.0.1-r2 : main.cpp: error: - QTextStream& QTextStreamFunctions::endl(QTextStream&) is deprecated: Use - Qt::endl [-Werror=deprecated-declarations]" https://bugs.gentoo.org/732088 - ---- - qdevicemonitor/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qdevicemonitor/main.cpp b/qdevicemonitor/main.cpp -index 46f80a5..9d3fe73 100644 ---- a/qdevicemonitor/main.cpp -+++ b/qdevicemonitor/main.cpp -@@ -43,7 +43,7 @@ void logOutput(QtMsgType type, const QMessageLogContext& context, const QString& - << ")"; - } - -- out << endl; -+ out << Qt::endl; - } - - int main(int argc, char* argv[]) --- -2.26.2 - diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch deleted file mode 100644 index fb3df7689d27..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5da5c11ff84cc293b5db3a0d7ba09c62b3db94a8 Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Fri, 13 Jul 2018 18:30:21 +0300 -Subject: [PATCH] fix Qt 5.11 specific issue https://bugs.gentoo.org/660932 - -Signed-off-by: Alexander Lopatin <[email protected]> ---- - qdevicemonitor/ui/MainWindow.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp -index c1bf263..fc22b4d 100644 ---- a/qdevicemonitor/ui/MainWindow.cpp -+++ b/qdevicemonitor/ui/MainWindow.cpp -@@ -31,6 +31,7 @@ - #include <QProcess> - #include <QSettings> - #include <QStringList> -+#include <QTabBar> - #include <QtCore/QStringBuilder> - - #if defined(Q_OS_WIN32) --- -2.16.4 - diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch deleted file mode 100644 index fe182b7e2f31..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch +++ /dev/null @@ -1,454 +0,0 @@ -From 4d90f45d6c204ad87b2198791fe522be092bed98 Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Tue, 14 Jan 2025 23:52:00 +0800 -Subject: [PATCH] Port to Qt 6 - -https://bugs.gentoo.org/948065 ---- - qdevicemonitor/StringRingBuffer.h | 1 + - qdevicemonitor/devices/AndroidDevice.cpp | 24 +++++++++++-------- - qdevicemonitor/devices/AndroidDevice.h | 8 +++---- - qdevicemonitor/devices/BaseDevice.cpp | 10 +++++--- - qdevicemonitor/devices/BaseDevice.h | 5 ++-- - qdevicemonitor/devices/IOSDevice.cpp | 24 ++++++++++++------- - qdevicemonitor/devices/IOSDevice.h | 2 +- - qdevicemonitor/devices/TextFileDevice.cpp | 16 +++++++------ - qdevicemonitor/devices/TextFileDevice.h | 2 +- - .../trackers/AndroidDevicesTracker.cpp | 4 ++++ - .../devices/trackers/IOSDevicesTracker.cpp | 4 ++++ - qdevicemonitor/ui/DeviceWidget.cpp | 10 +++++--- - qdevicemonitor/ui/DeviceWidget.h | 4 ++-- - qdevicemonitor/ui/MainWindow.cpp | 3 +-- - 14 files changed, 73 insertions(+), 44 deletions(-) - -diff --git a/qdevicemonitor/StringRingBuffer.h b/qdevicemonitor/StringRingBuffer.h -index 5c6537b..76dee9d 100644 ---- a/qdevicemonitor/StringRingBuffer.h -+++ b/qdevicemonitor/StringRingBuffer.h -@@ -18,6 +18,7 @@ - #ifndef RINGBUFFER_H - #define RINGBUFFER_H - -+#include <QObject> - #include <QPointer> - #include <QString> - #include <QVector> -diff --git a/qdevicemonitor/devices/AndroidDevice.cpp b/qdevicemonitor/devices/AndroidDevice.cpp -index e0785e9..a11e79f 100644 ---- a/qdevicemonitor/devices/AndroidDevice.cpp -+++ b/qdevicemonitor/devices/AndroidDevice.cpp -@@ -146,7 +146,11 @@ void AndroidDevice::startLogger() - m_logFile.setFileName(currentLogAbsFileName); - m_logFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate); - m_logFileStream = QSharedPointer<QTextStream>::create(&m_logFile); -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_logFileStream->setCodec("UTF-8"); -+#else -+ m_logFileStream->setEncoding(QStringConverter::Utf8); -+#endif - - startLogProcess(); - -@@ -230,13 +234,13 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line) - const QRegularExpressionMatch match = re.match(line); - if (match.hasMatch()) - { -- const QStringRef date = match.capturedRef("date"); -- const QStringRef time = match.capturedRef("time"); -- const QStringRef pid = match.capturedRef("pid"); -- const QStringRef tid = match.capturedRef("tid"); -- const QStringRef verbosity = match.capturedRef("verbosity"); -- const QStringRef tag = match.capturedRef("tag").trimmed(); -- const QStringRef text = line.midRef(match.capturedEnd("tag") + 1); -+ const QStringView date = match.captured("date"); -+ const QStringView time = match.captured("time"); -+ const QStringView pid = match.captured("pid"); -+ const QStringView tid = match.captured("tid"); -+ const QStringView verbosity = match.captured("verbosity"); -+ const QStringView tag = match.captured("tag").trimmed(); -+ const QStringView text = line.mid(match.capturedEnd("tag") + 1); - - const auto verbosityLevel = static_cast<VerbosityEnum>(Utils::verbosityCharacterToInt(verbosity.at(0).toLatin1())); - -@@ -261,7 +265,7 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line) - checkFilters(filtersMatch, m_filtersValid); - if (filtersMatch) - { -- m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line)); -+ m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line)); - m_deviceWidget->flushText(); - } - } -@@ -269,7 +273,7 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line) - m_deviceWidget->highlightFilterLineEdit(!m_filtersValid); - } - --void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const VerbosityEnum verbosityLevel, const QStringRef& pid, const QStringRef& tid, const QStringRef& tag, const QStringRef& text) -+void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const VerbosityEnum verbosityLevel, const QStringView pid, const QStringView tid, const QStringView tag, const QStringView text) - { - filtersMatch = verbosityLevel <= m_deviceWidget->getVerbosityLevel(); - -@@ -283,7 +287,7 @@ void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const V - - for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it) - { -- const QStringRef filter(&(*it)); -+ const QStringView filter(*it); - bool columnFound = false; - if (!columnMatches("pid:", filter, pid, filtersValid, columnFound) || - !columnMatches("tid:", filter, tid, filtersValid, columnFound) || -diff --git a/qdevicemonitor/devices/AndroidDevice.h b/qdevicemonitor/devices/AndroidDevice.h -index 1012c43..f908d07 100644 ---- a/qdevicemonitor/devices/AndroidDevice.h -+++ b/qdevicemonitor/devices/AndroidDevice.h -@@ -77,10 +77,10 @@ private: - void checkFilters(bool& filtersMatch, - bool& filtersValid, - const VerbosityEnum verbosityLevel = Verbose, -- const QStringRef& pid = QStringRef(), -- const QStringRef& tid = QStringRef(), -- const QStringRef& tag = QStringRef(), -- const QStringRef& text = QStringRef()); -+ const QStringView pid = QStringView(), -+ const QStringView tid = QStringView(), -+ const QStringView tag = QStringView(), -+ const QStringView text = QStringView()); - }; - - #endif // ANDROIDDEVICE_H -diff --git a/qdevicemonitor/devices/BaseDevice.cpp b/qdevicemonitor/devices/BaseDevice.cpp -index 21ee82c..628d7a4 100644 ---- a/qdevicemonitor/devices/BaseDevice.cpp -+++ b/qdevicemonitor/devices/BaseDevice.cpp -@@ -47,7 +47,11 @@ BaseDevice::BaseDevice( - { - qDebug() << "new BaseDevice; type" << type << "; id" << id; - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_tempStream.setCodec("UTF-8"); -+#else -+ m_tempStream.setEncoding(QStringConverter::Utf8); -+#endif - m_tempStream.setString(&m_tempBuffer, QIODevice::ReadWrite | QIODevice::Text); - - updateLogBufferSpace(); -@@ -195,12 +199,12 @@ void BaseDevice::filterAndAddFromLogBufferToTextEdit() - } - } - --bool BaseDevice::columnMatches(const QString& column, const QStringRef& filter, const QStringRef& originalValue, bool& filtersValid, bool& columnFound) -+bool BaseDevice::columnMatches(const QString& column, const QStringView filter, const QStringView originalValue, bool& filtersValid, bool& columnFound) - { - if (filter.startsWith(column)) - { - columnFound = true; -- const QStringRef value = filter.mid(column.length()); -+ const QStringView value = filter.mid(column.length()); - if (value.isEmpty()) - { - filtersValid = false; -@@ -213,7 +217,7 @@ bool BaseDevice::columnMatches(const QString& column, const QStringRef& filter, - return true; - } - --bool BaseDevice::columnTextMatches(const QStringRef& filter, const QString& text) -+bool BaseDevice::columnTextMatches(const QStringView filter, const QString& text) - { - if (filter.isEmpty() || text.contains(filter)) - { -diff --git a/qdevicemonitor/devices/BaseDevice.h b/qdevicemonitor/devices/BaseDevice.h -index 504b78d..2990b02 100644 ---- a/qdevicemonitor/devices/BaseDevice.h -+++ b/qdevicemonitor/devices/BaseDevice.h -@@ -28,7 +28,6 @@ - #include <QRegularExpression> - #include <QSharedPointer> - #include <QString> --#include <QStringRef> - #include <QTabWidget> - #include <QTextStream> - #include <QTimer> -@@ -93,8 +92,8 @@ public: - - void updateLogBufferSpace(); - void filterAndAddFromLogBufferToTextEdit(); -- bool columnMatches(const QString& column, const QStringRef& filter, const QStringRef& originalValue, bool& filtersValid, bool& columnFound); -- bool columnTextMatches(const QStringRef& filter, const QString& text); -+ bool columnMatches(const QString& column, const QStringView filter, const QStringView originalValue, bool& filtersValid, bool& columnFound); -+ bool columnTextMatches(const QStringView filter, const QString& text); - - void scheduleLogReady(); - void stopLogReadyTimer(); -diff --git a/qdevicemonitor/devices/IOSDevice.cpp b/qdevicemonitor/devices/IOSDevice.cpp -index 98fca1c..d47d200 100644 ---- a/qdevicemonitor/devices/IOSDevice.cpp -+++ b/qdevicemonitor/devices/IOSDevice.cpp -@@ -38,7 +38,11 @@ IOSDevice::IOSDevice( - { - qDebug() << "IOSDevice::IOSDevice"; - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_tempErrorsStream.setCodec("UTF-8"); -+#else -+ m_tempErrorsStream.setEncoding(QStringConverter::Utf8); -+#endif - m_tempErrorsStream.setString(&m_tempErrorsBuffer, QIODevice::ReadWrite | QIODevice::Text); - - m_deviceWidget->getFilterLineEdit().setToolTip(tr("Search for messages. Accepts<ul><li>Plain Text</li><li>Prefix <b>text:</b> with Plain Text</li><li>Regular Expressions</li></ul>")); -@@ -160,7 +164,11 @@ void IOSDevice::startLogger() - m_logFile.setFileName(currentLogAbsFileName); - m_logFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate); - m_logFileStream = QSharedPointer<QTextStream>::create(&m_logFile); -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_logFileStream->setCodec("UTF-8"); -+#else -+ m_logFileStream->setEncoding(QStringConverter::Utf8); -+#endif - - startLogProcess(); - -@@ -193,14 +201,14 @@ void IOSDevice::onUpdateFilter(const QString& filter) - maybeAddCompletionAfterDelay(filter); - } - --void IOSDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text) -+void IOSDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text) - { - QString textString; - bool textStringInitialized = false; - - for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it) - { -- const QStringRef filter(&(*it)); -+ const QStringView filter(*it); - bool columnFound = false; - if (!columnMatches("text:", filter, text, filtersValid, columnFound)) - { -@@ -242,9 +250,9 @@ void IOSDevice::filterAndAddToTextEdit(const QString& line) - const QRegularExpressionMatch match = re.match(line); - if (match.hasMatch()) - { -- const QStringRef prefix = match.capturedRef("prefix"); -- const QStringRef deviceName = match.capturedRef("deviceName"); -- const QStringRef text = line.midRef(match.capturedEnd("deviceName") + 1); -+ const QStringView prefix = match.captured("prefix"); -+ const QStringView deviceName = match.captured("deviceName"); -+ const QStringView text = QStringView(line).mid(match.capturedEnd("deviceName") + 1); - - checkFilters(filtersMatch, m_filtersValid, text); - -@@ -258,11 +266,11 @@ void IOSDevice::filterAndAddToTextEdit(const QString& line) - } - else - { -- checkFilters(filtersMatch, m_filtersValid, QStringRef(&line)); -+ checkFilters(filtersMatch, m_filtersValid, QStringView(line)); - - if (filtersMatch) - { -- m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line)); -+ m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line)); - m_deviceWidget->flushText(); - } - } -@@ -323,7 +331,7 @@ void IOSDevice::maybeReadErrorsPart() - if (m_tempErrorsStream.readLineInto(&line)) - #endif - { -- m_deviceWidget->addText(ColorTheme::VerbosityAssert, QStringRef(&line)); -+ m_deviceWidget->addText(ColorTheme::VerbosityAssert, QStringView(line)); - m_deviceWidget->flushText(); - } - } -diff --git a/qdevicemonitor/devices/IOSDevice.h b/qdevicemonitor/devices/IOSDevice.h -index e9ba086..cca3a15 100644 ---- a/qdevicemonitor/devices/IOSDevice.h -+++ b/qdevicemonitor/devices/IOSDevice.h -@@ -62,7 +62,7 @@ private: - void stopInfoProcess(); - void startLogger(); - void stopLogger(); -- void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text); -+ void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text); - - void maybeReadErrorsPart(); - void maybeReadLogPart(); -diff --git a/qdevicemonitor/devices/TextFileDevice.cpp b/qdevicemonitor/devices/TextFileDevice.cpp -index 353d162..bd11b45 100644 ---- a/qdevicemonitor/devices/TextFileDevice.cpp -+++ b/qdevicemonitor/devices/TextFileDevice.cpp -@@ -90,7 +90,7 @@ void TextFileDevice::onUpdateFilter(const QString& filter) - maybeAddCompletionAfterDelay(filter); - } - --void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text) -+void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text) - { - filtersValid = true; - -@@ -98,7 +98,7 @@ void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const - - for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it) - { -- const QStringRef filter(&(*it)); -+ const QStringView filter(*it); - if (!columnTextMatches(filter, textString)) - { - filtersMatch = false; -@@ -113,14 +113,16 @@ void TextFileDevice::filterAndAddToTextEdit(const QString& line) - "(?<prefix>[A-Za-z]{3} +[\\d]{1,2} [\\d:]{8}) (?<hostname>.+) ", - QRegularExpression::InvertedGreedinessOption | QRegularExpression::DotMatchesEverythingOption - ); -+ static const QString prefixPattern("prefix"); -+ static const QString hostnamePattern("hostname"); - - bool filtersMatch = true; - const QRegularExpressionMatch match = re.match(line); - if (match.hasMatch()) - { -- const QStringRef prefix = match.capturedRef("prefix"); -- const QStringRef hostname = match.capturedRef("hostname"); -- const QStringRef text = line.midRef(match.capturedEnd("hostname") + 1); -+ const QStringView prefix = match.capturedView(QStringView(prefixPattern)); -+ const QStringView hostname = match.capturedView(QStringView(hostnamePattern)); -+ const QStringView text = QStringView(line).mid(match.capturedEnd("hostname") + 1); - - checkFilters(filtersMatch, m_filtersValid, text); - -@@ -134,10 +136,10 @@ void TextFileDevice::filterAndAddToTextEdit(const QString& line) - } - else - { -- checkFilters(filtersMatch, m_filtersValid, QStringRef(&line)); -+ checkFilters(filtersMatch, m_filtersValid, QStringView(line)); - if (filtersMatch) - { -- m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line)); -+ m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line)); - m_deviceWidget->flushText(); - } - } -diff --git a/qdevicemonitor/devices/TextFileDevice.h b/qdevicemonitor/devices/TextFileDevice.h -index b943ff2..23622d7 100644 ---- a/qdevicemonitor/devices/TextFileDevice.h -+++ b/qdevicemonitor/devices/TextFileDevice.h -@@ -51,7 +51,7 @@ private: - void startLogger(); - void stopLogger(); - -- void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text); -+ void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text); - - private slots: - void onLogReady() override; -diff --git a/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp b/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp -index e83d598..713805b 100644 ---- a/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp -+++ b/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp -@@ -21,7 +21,11 @@ - - AndroidDevicesTracker::AndroidDevicesTracker() - { -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_codecStream.setCodec("UTF-8"); -+#else -+ m_codecStream.setEncoding(QStringConverter::Utf8); -+#endif - m_codecStream.setString(&m_buffer, QIODevice::ReadWrite | QIODevice::Text); - } - -diff --git a/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp b/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp -index e66a21d..da64678 100644 ---- a/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp -+++ b/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp -@@ -21,7 +21,11 @@ - - IOSDevicesTracker::IOSDevicesTracker() - { -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_codecStream.setCodec("UTF-8"); -+#else -+ m_codecStream.setEncoding(QStringConverter::Utf8); -+#endif - m_codecStream.setString(&m_buffer, QIODevice::ReadWrite | QIODevice::Text); - } - -diff --git a/qdevicemonitor/ui/DeviceWidget.cpp b/qdevicemonitor/ui/DeviceWidget.cpp -index a665ab2..e317434 100644 ---- a/qdevicemonitor/ui/DeviceWidget.cpp -+++ b/qdevicemonitor/ui/DeviceWidget.cpp -@@ -39,7 +39,11 @@ DeviceWidget::DeviceWidget(QPointer<QWidget> parent, QPointer<DeviceFacade> devi - m_redPalette = QPalette(Qt::red); - m_redPalette.setColor(QPalette::Highlight, Qt::red); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - m_textStream.setCodec("UTF-8"); -+#else -+ m_textStream.setEncoding(QStringConverter::Utf8); -+#endif - m_textStream.setString(&m_stringStream, QIODevice::ReadWrite | QIODevice::Text); - - //ui->textEdit->setFontFamily(m_deviceFacade->getFont()); -@@ -97,12 +101,12 @@ void DeviceWidget::maybeScrollTextEditToEnd() - } - } - --void DeviceWidget::addText(const ColorTheme::ColorType color, const QStringRef& text) -+void DeviceWidget::addText(const ColorTheme::ColorType color, const QStringView text) - { - addText(m_deviceFacade->getThemeColor(color), text); - } - --void DeviceWidget::addText(const QColor& color, const QStringRef& text) -+void DeviceWidget::addText(const QColor& color, const QStringView text) - { - m_textStream - << "<font style=\"font-family: " << m_deviceFacade->getFont() -@@ -187,7 +191,7 @@ void DeviceWidget::focusFilterInput() - - void DeviceWidget::on_markLogButton_clicked() - { -- addText(ColorTheme::VerbosityVerbose, QStringRef(&MARK_LINE)); -+ addText(ColorTheme::VerbosityVerbose, QStringView(MARK_LINE)); - m_deviceFacade->writeToLogFile(m_id, MARK_LINE); - flushText(); - } -diff --git a/qdevicemonitor/ui/DeviceWidget.h b/qdevicemonitor/ui/DeviceWidget.h -index 9dcd608..9dcd7b4 100644 ---- a/qdevicemonitor/ui/DeviceWidget.h -+++ b/qdevicemonitor/ui/DeviceWidget.h -@@ -55,8 +55,8 @@ public: - inline int getVerbosityLevel() const { return m_ui->verbositySlider->value(); } - void highlightFilterLineEdit(bool red); - void maybeScrollTextEditToEnd(); -- void addText(const ColorTheme::ColorType color, const QStringRef& text); -- void addText(const QColor& color, const QStringRef& text); -+ void addText(const ColorTheme::ColorType color, const QStringView text); -+ void addText(const QColor& color, const QStringView text); - void flushText(); - void clearTextEdit(); - void onLogFileNameChanged(const QString& logFileName); -diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp -index 69d4433..56ffb40 100644 ---- a/qdevicemonitor/ui/MainWindow.cpp -+++ b/qdevicemonitor/ui/MainWindow.cpp -@@ -23,7 +23,6 @@ - #include <cstdlib> - #include <QApplication> - #include <QDebug> --#include <QDesktopWidget> - #include <QDir> - #include <QFileDialog> - #include <QFileInfo> -@@ -162,7 +161,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) - - void MainWindow::mouseReleaseEvent(QMouseEvent* event) - { -- if (event->button() == Qt::MidButton) -+ if (event->button() == Qt::MiddleButton) - { - const QTabBar& tabBar = *(m_ui->tabWidget->tabBar()); - const QPoint mousePos = tabBar.mapFrom(this, event->pos()); --- -2.45.2 - diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch deleted file mode 100644 index 9b9b46320fe7..000000000000 --- a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 08985f03236a70b35b03b2749cabbd45398e968b Mon Sep 17 00:00:00 2001 -From: Alexander Lopatin <[email protected]> -Date: Thu, 16 Jan 2020 11:26:38 +0300 -Subject: [PATCH] Fix "error: const QRect QDesktopWidget::screenGeometry(int) - const is deprecated: Use QGuiApplication::screens() - [-Werror=deprecated-declarations]" https://bugs.gentoo.org/705438 - -Signed-off-by: Alexander Lopatin <[email protected]> ---- - qdevicemonitor/ui/MainWindow.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp -index 4266de6..69d4433 100644 ---- a/qdevicemonitor/ui/MainWindow.cpp -+++ b/qdevicemonitor/ui/MainWindow.cpp -@@ -29,6 +29,7 @@ - #include <QFileInfo> - #include <QMessageBox> - #include <QProcess> -+#include <QScreen> - #include <QSettings> - #include <QStringList> - #include <QTabBar> -@@ -181,9 +182,9 @@ void MainWindow::loadSettings() - { - setGeometry(geom.toRect()); - } -- else -+ else if (!qApp->screens().isEmpty()) - { -- QRect geom = qApp->desktop()->screenGeometry(); -+ QRect geom = qApp->screens()[0]->availableVirtualGeometry(); - const int screenWidth = geom.width(); - const int screenHeight = geom.height(); - geom.setWidth(int(screenWidth * 0.7f)); --- -2.21.0 - diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild deleted file mode 100644 index 4021c398400d..000000000000 --- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils - -DESCRIPTION="Crossplatform log viewer for Android, iOS and text files" -HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"; - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/alopatindev/${PN}"; -else - SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -RDEPEND=" - app-pda/usbmuxd - dev-qt/qtbase:6[gui,widgets] - dev-util/android-tools" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-qt-5.11.patch - "${FILESDIR}"/${P}-crash-after-fresh-install.patch - "${FILESDIR}"/${P}-screen-geometry-is-deprecated.patch - "${FILESDIR}"/${P}-endl-is-deprecated.patch - "${FILESDIR}"/${P}-disable-warnings-as-errors.patch - "${FILESDIR}"/${P}-disable-pedantic-errors.patch - "${FILESDIR}"/${P}-qt-6.patch -) - -src_configure() { - cd "${PN}" || die - export VERSION_WITH_BUILD_NUMBER="${PV}" - eqmake6 -} - -src_compile() { - cd "${PN}" || die - emake -} - -src_install() { - dobin "${PN}/${PN}" - dodoc README.md - newicon -s scalable "icons/app_icon.svg" "${PN}.svg" - domenu "icons/${PN}.desktop" -} diff --git a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild deleted file mode 100644 index 7eaed85fcca5..000000000000 --- a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils - -DESCRIPTION="Crossplatform log viewer for Android, iOS and text files" -HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"; - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/alopatindev/${PN}"; -else - SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -RDEPEND=" - app-pda/usbmuxd - dev-qt/qtbase:6[gui,widgets] - dev-util/android-tools" -DEPEND="${RDEPEND}" - -src_configure() { - cd "${PN}" || die - export VERSION_WITH_BUILD_NUMBER="${PV}" - eqmake6 -} - -src_compile() { - cd "${PN}" || die - emake -} - -src_install() { - dobin "${PN}/${PN}" - dodoc README.md - newicon -s scalable "icons/app_icon.svg" "${PN}.svg" - domenu "icons/${PN}.desktop" -}
