From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92CEC1582EF for ; Tue, 04 Mar 2025 22:32:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 79232343182 for ; Tue, 04 Mar 2025 22:32:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B98CF1103D5; Tue, 04 Mar 2025 22:32:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AEA5C1103D5 for ; Tue, 04 Mar 2025 22:32:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3880B343152 for ; Tue, 04 Mar 2025 22:32:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B9212875 for ; Tue, 04 Mar 2025 22:32:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1741127498.53ffb10434148cbbeda0aa8cc17eec150499e2b2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/whatsie/files/, profiles/, net-im/whatsie/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/whatsie/Manifest net-im/whatsie/files/whatsie-4.16.3-qt6.patch net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch net-im/whatsie/metadata.xml net-im/whatsie/whatsie-4.16.3-r1.ebuild profiles/package.mask X-VCS-Directories: net-im/whatsie/files/ net-im/whatsie/ profiles/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 53ffb10434148cbbeda0aa8cc17eec150499e2b2 X-VCS-Branch: master Date: Tue, 04 Mar 2025 22:32:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5dd10d27-6176-4604-a482-c999455c0642 X-Archives-Hash: 4668b33675c5ad9c02870a320d57d3ba commit: 53ffb10434148cbbeda0aa8cc17eec150499e2b2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 4 22:14:12 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 4 22:31:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ffb104 net-im/whatsie: treeclean Signed-off-by: Andreas Sturmlechner gentoo.org> net-im/whatsie/Manifest | 1 - net-im/whatsie/files/whatsie-4.16.3-qt6.patch | 500 --------------------- .../files/whatsie-4.16.3-respect-user-flags.patch | 27 -- net-im/whatsie/metadata.xml | 11 - net-im/whatsie/whatsie-4.16.3-r1.ebuild | 49 -- profiles/package.mask | 6 - 6 files changed, 594 deletions(-) diff --git a/net-im/whatsie/Manifest b/net-im/whatsie/Manifest deleted file mode 100644 index bc53dd6a4cd4..000000000000 --- a/net-im/whatsie/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST whatsie-4.16.3.tar.gz 21405138 BLAKE2B d9038e74b221b8f9caa62eb527bb4ea3b0328d89a79dd2d876aa19e876e192c9df266349d73e673bee9c71c22f1a46aa57273474dcba461b7ae0926ae36e923e SHA512 db14995718b639e1e3aba7b965958bb17cf5244eb1a81ea628b6c10a5cf751b38731a8861fcaf3a50bb5ca64e50e4e58869e5a91279ec2d2bff88debe1e64fa1 diff --git a/net-im/whatsie/files/whatsie-4.16.3-qt6.patch b/net-im/whatsie/files/whatsie-4.16.3-qt6.patch deleted file mode 100644 index d441418823c7..000000000000 --- a/net-im/whatsie/files/whatsie-4.16.3-qt6.patch +++ /dev/null @@ -1,500 +0,0 @@ -https://github.com/keshavbhatt/whatsie/pull/209 -diff --git a/WhatsApp.pro b/WhatsApp.pro -index 881963a..5d5ed16 100644 ---- a/WhatsApp.pro -+++ b/WhatsApp.pro -@@ -23,7 +23,9 @@ equals(QMAKE_HOST.arch, aarch64) { - # Uncomment if you need specific linker flags as well - #QMAKE_LFLAGS += $$QMAKE_LDFLAGS - --QT += core gui webengine webenginewidgets positioning -+QT += core gui webenginewidgets positioning -+ -+lessThan(QT_MAJOR_VERSION, 6): QT += webengine - - CONFIG += c++17 - -diff --git a/automatictheme.cpp b/automatictheme.cpp -index 9b1f3e7..a4d9fc5 100644 ---- a/automatictheme.cpp -+++ b/automatictheme.cpp -@@ -47,7 +47,11 @@ AutomaticTheme::AutomaticTheme(QWidget *parent) - ui->refresh->setEnabled(false); - } - }); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ connect(m_gPosInfoSrc, &QGeoPositionInfoSource::errorOccurred, this, [=]() { -+#else - connect(m_gPosInfoSrc, &QGeoPositionInfoSource::updateTimeout, this, [=]() { -+#endif - if (!SettingsManager::instance().settings().value("sunrise").isValid() || - !SettingsManager::instance().settings().value("sunset").isValid()) { - if (ui->refresh->isEnabled()) -@@ -77,9 +81,9 @@ void AutomaticTheme::on_refresh_clicked() { - if (geoCor.isValid()) { - Sunclock sun(this->m_latitube, this->m_longitude, this->m_hourOffset); - m_sunrise.setSecsSinceEpoch( -- sun.sunrise(QDateTime::currentDateTimeUtc().toTime_t())); -+ sun.sunrise(QDateTime::currentDateTimeUtc().toSecsSinceEpoch())); - m_sunset.setSecsSinceEpoch( -- sun.sunset(QDateTime::currentDateTimeUtc().toTime_t())); -+ sun.sunset(QDateTime::currentDateTimeUtc().toSecsSinceEpoch())); - - ui->sunrise->setTime(m_sunrise.time()); - ui->sunset->setTime(m_sunset.time()); -diff --git a/downloadmanagerwidget.h b/downloadmanagerwidget.h -index 8367041..b5b88cb 100644 ---- a/downloadmanagerwidget.h -+++ b/downloadmanagerwidget.h -@@ -57,12 +57,14 @@ - - #include - #include --#include - #include - --QT_BEGIN_NAMESPACE --class QWebEngineDownloadItem; --QT_END_NAMESPACE -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+#include -+using QWebEngineDownloadItem = QWebEngineDownloadRequest; -+#else -+#include -+#endif - - class DownloadWidget; - -diff --git a/downloadwidget.cpp b/downloadwidget.cpp -index bdc974d..82e555a 100644 ---- a/downloadwidget.cpp -+++ b/downloadwidget.cpp -@@ -4,7 +4,6 @@ - #include - #include - #include --#include - - DownloadWidget::DownloadWidget(QWebEngineDownloadItem *download, - QWidget *parent) -@@ -38,8 +37,15 @@ DownloadWidget::DownloadWidget(QWebEngineDownloadItem *download, - emit removeClicked(this); - }); - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ connect(m_download, &QWebEngineDownloadItem::receivedBytesChanged, this, -+ &DownloadWidget::updateWidget); -+ connect(m_download, &QWebEngineDownloadItem::totalBytesChanged, this, -+ &DownloadWidget::updateWidget); -+#else - connect(m_download, &QWebEngineDownloadItem::downloadProgress, this, - &DownloadWidget::updateWidget); -+#endif - - connect(m_download, &QWebEngineDownloadItem::stateChanged, this, - &DownloadWidget::updateWidget); -diff --git a/downloadwidget.h b/downloadwidget.h -index 4417cb4..9607fac 100644 ---- a/downloadwidget.h -+++ b/downloadwidget.h -@@ -58,9 +58,12 @@ - #include - #include - --QT_BEGIN_NAMESPACE --class QWebEngineDownloadItem; --QT_END_NAMESPACE -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+#include -+using QWebEngineDownloadItem = QWebEngineDownloadRequest; -+#else -+#include -+#endif - - // Displays one ongoing or finished download (QWebEngineDownloadItem). - class DownloadWidget final : public QFrame, public Ui::DownloadWidget { -diff --git a/main.cpp b/main.cpp -index 1d5efe9..65bfd7d 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -2,9 +2,14 @@ - #include - #include - #include --#include - #include - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+#include -+#else -+#include -+#endif -+ - #include "common.h" - #include "def.h" - #include "mainwindow.h" -@@ -13,7 +18,9 @@ - - int main(int argc, char *argv[]) { - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -+#endif - - #ifdef QT_DEBUG - qputenv("QTWEBENGINE_CHROMIUM_FLAGS", -@@ -136,12 +143,10 @@ int main(int argc, char *argv[]) { - return 0; - } - -- QWebEngineSettings::defaultSettings()->setAttribute( -- QWebEngineSettings::DnsPrefetchEnabled, true); -- QWebEngineSettings::defaultSettings()->setAttribute( -- QWebEngineSettings::FullScreenSupportEnabled, true); -- QWebEngineSettings::defaultSettings()->setAttribute( -- QWebEngineSettings::JavascriptCanAccessClipboard, true); -+ QWebEngineSettings *websettings = QWebEngineProfile::defaultProfile()->settings(); -+ websettings->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true); -+ websettings->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true); -+ websettings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, true); - - MainWindow whatsie; - -@@ -153,7 +158,7 @@ int main(int argc, char *argv[]) { - qInfo().noquote() << "Another instance with PID: " + - QString::number(instanceId) + - ", sent argument: " + message; -- QString messageStr = QTextCodec::codecForMib(106)->toUnicode(message); -+ QString messageStr = QString::fromUtf8(message); - - QCommandLineParser p; - p.addOptions(secondaryInstanceCLIOptions); -diff --git a/mainwindow.cpp b/mainwindow.cpp -index 94dc414..ba66fcd 100644 ---- a/mainwindow.cpp -+++ b/mainwindow.cpp -@@ -43,7 +43,7 @@ void MainWindow::restoreMainWindow() { - SettingsManager::instance().settings().value("geometry").toByteArray()); - QPoint pos = QCursor::pos(); - auto localScreens = QGuiApplication::screens(); -- for (auto screen : qAsConst(localScreens)) { -+ for (auto screen : std::as_const(localScreens)) { - QRect screenRect = screen->geometry(); - if (screenRect.contains(pos)) { - this->move(screenRect.center() - this->rect().center()); -@@ -244,7 +244,7 @@ void MainWindow::tryLogOut() { - } - - void MainWindow::initSettingWidget() { -- int screenNumber = qApp->desktop()->screenNumber(this); -+ int screenNumber = qApp->screens().indexOf(screen()); - if (m_settingsWidget == nullptr) { - m_settingsWidget = new SettingsWidget( - this, screenNumber, m_webEngine->page()->profile()->cachePath(), -@@ -451,8 +451,7 @@ void MainWindow::showSettings(bool isAskedByCLI) { - if (!m_settingsWidget->isVisible()) { - this->updateSettingsUserAgentWidget(); - m_settingsWidget->refresh(); -- int screenNumber = qApp->desktop()->screenNumber(this); -- QRect screenRect = QGuiApplication::screens().at(screenNumber)->geometry(); -+ QRect screenRect = screen()->geometry(); - if (!screenRect.contains(m_settingsWidget->pos())) { - m_settingsWidget->move(screenRect.center() - - m_settingsWidget->rect().center()); -@@ -579,7 +578,7 @@ void MainWindow::notificationClicked() { - void MainWindow::createActions() { - - m_openUrlAction = new QAction("New Chat", this); -- m_openUrlAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_N)); -+ m_openUrlAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_N)); - connect(m_openUrlAction, &QAction::triggered, this, &MainWindow::newChat); - addAction(m_openUrlAction); - -@@ -594,7 +593,7 @@ void MainWindow::createActions() { - addAction(m_minimizeAction); - - QShortcut *minimizeShortcut = new QShortcut( -- QKeySequence(Qt::Modifier::CTRL + Qt::Key_W), this, SLOT(hide())); -+ QKeySequence(Qt::Modifier::CTRL | Qt::Key_W), this, SLOT(hide())); - minimizeShortcut->setAutoRepeat(false); - - m_restoreAction = new QAction(tr("&Restore"), this); -@@ -608,19 +607,19 @@ void MainWindow::createActions() { - addAction(m_reloadAction); - - m_lockAction = new QAction(tr("Loc&k"), this); -- m_lockAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_L)); -+ m_lockAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_L)); - connect(m_lockAction, &QAction::triggered, this, &MainWindow::lockApp); - addAction(m_lockAction); - - m_settingsAction = new QAction(tr("&Settings"), this); -- m_settingsAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_P)); -+ m_settingsAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_P)); - connect(m_settingsAction, &QAction::triggered, this, - &MainWindow::showSettings); - addAction(m_settingsAction); - - m_toggleThemeAction = new QAction(tr("&Toggle theme"), this); - m_toggleThemeAction->setShortcut( -- QKeySequence(Qt::Modifier::CTRL + Qt::Key_T)); -+ QKeySequence(Qt::Modifier::CTRL | Qt::Key_T)); - connect(m_toggleThemeAction, &QAction::triggered, this, - &MainWindow::toggleTheme); - addAction(m_toggleThemeAction); -@@ -629,7 +628,7 @@ void MainWindow::createActions() { - connect(m_aboutAction, &QAction::triggered, this, &MainWindow::showAbout); - - m_quitAction = new QAction(tr("&Quit"), this); -- m_quitAction->setShortcut(QKeySequence(Qt::Modifier::CTRL + Qt::Key_Q)); -+ m_quitAction->setShortcut(QKeySequence(Qt::Modifier::CTRL | Qt::Key_Q)); - connect(m_quitAction, &QAction::triggered, this, &MainWindow::quitApp); - addAction(m_quitAction); - } -diff --git a/mainwindow.h b/mainwindow.h -index 7be6372..0603890 100644 ---- a/mainwindow.h -+++ b/mainwindow.h -@@ -15,7 +15,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/notificationpopup.h b/notificationpopup.h -index dc1277b..c9b2a54 100644 ---- a/notificationpopup.h -+++ b/notificationpopup.h -@@ -6,14 +6,12 @@ - - #include - #include --#include - #include - #include - #include - #include - #include - #include --#include - #include - #include - #include -@@ -131,13 +129,11 @@ protected slots: - } - - void onClosed() { -- auto x = this->pos().x(); -- auto y = this->pos().y(); -+ auto pos = mapToGlobal(QPoint(0, 0)); - QPropertyAnimation *a = new QPropertyAnimation(this, "pos"); - a->setDuration(150); -- a->setStartValue(QApplication::desktop()->mapToGlobal(QPoint(x, y))); -- a->setEndValue(QApplication::desktop()->mapToGlobal( -- QPoint(x, -(this->height() + 20)))); -+ a->setStartValue(pos); -+ a->setEndValue(QPoint(pos.x(), -(this->height() + 20))); - a->setEasingCurve(QEasingCurve::Linear); - - connect(a, &QPropertyAnimation::finished, this, [=]() { -diff --git a/utils.cpp b/utils.cpp -index a2ebc00..e1b39f4 100644 ---- a/utils.cpp -+++ b/utils.cpp -@@ -134,7 +134,7 @@ QString Utils::convertSectoDay(qint64 secs) { - QString - Utils::returnPath(QString pathname, - QString standardLocation = QStandardPaths::writableLocation( -- QStandardPaths::DataLocation)) { -+ QStandardPaths::AppLocalDataLocation)) { - QChar sepe = QDir::separator(); - QDir d(standardLocation + sepe + pathname); - d.mkpath(standardLocation + sepe + pathname); -diff --git a/webenginepage.cpp b/webenginepage.cpp -index daa33f3..fca21f8 100644 ---- a/webenginepage.cpp -+++ b/webenginepage.cpp -@@ -26,6 +26,11 @@ WebEnginePage::WebEnginePage(QWebEngineProfile *profile, QObject *parent) - connect(this, &QWebEnginePage::selectClientCertificate, this, - &WebEnginePage::handleSelectClientCertificate); - #endif -+ -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ connect(this, &QWebEnginePage::certificateError, this, -+ &WebEnginePage::handleCertificateError); -+#endif - } - - bool WebEnginePage::acceptNavigationRequest(const QUrl &url, -@@ -196,7 +201,13 @@ QStringList WebEnginePage::chooseFiles(QWebEnginePage::FileSelectionMode mode, - return selectedFiles; - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+void WebEnginePage::handleCertificateError(const QWebEngineCertificateError &error) { -+ QString description = error.description(); -+#else - bool WebEnginePage::certificateError(const QWebEngineCertificateError &error) { -+ QString description = error.errorDescription(); -+#endif - QWidget *mainWindow = view()->window(); - if (error.isOverridable()) { - QDialog dialog(mainWindow); -@@ -209,14 +220,26 @@ bool WebEnginePage::certificateError(const QWebEngineCertificateError &error) { - QIcon icon(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxWarning, - nullptr, mainWindow)); - certificateDialog.m_iconLabel->setPixmap(icon.pixmap(32, 32)); -- certificateDialog.m_errorLabel->setText(error.errorDescription()); -+ certificateDialog.m_errorLabel->setText(description); - dialog.setWindowTitle(tr("Certificate Error")); -- return dialog.exec() == QDialog::Accepted; -+ bool accepted = dialog.exec() == QDialog::Accepted; -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ auto handler = const_cast(error); -+ if (accepted) -+ handler.acceptCertificate(); -+ else -+ handler.rejectCertificate(); -+#else -+ return accepted; -+#endif - } - - QMessageBox::critical(mainWindow, tr("Certificate Error"), -- error.errorDescription()); -+ description); -+ -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - return false; -+#endif - } - - void WebEnginePage::handleAuthenticationRequired(const QUrl &requestUrl, -diff --git a/webenginepage.h b/webenginepage.h -index f9d8324..92eb8df 100644 ---- a/webenginepage.h -+++ b/webenginepage.h -@@ -16,6 +16,10 @@ - #include - #include - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+#include -+#endif -+ - #include "settingsmanager.h" - - #include "ui_certificateerrordialog.h" -@@ -32,10 +36,21 @@ class WebEnginePage : public QWebEnginePage { - QWebEnginePage::NavigationType type, - bool isMainFrame) override; - QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) override; -- bool certificateError(const QWebEngineCertificateError &error) override; - QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, - const QStringList &acceptedMimeTypes) override; - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ void handleCertificateError(const QWebEngineCertificateError &error); -+#else -+ bool certificateError(const QWebEngineCertificateError &error) override; -+#endif -+ -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ inline QWidget *view() { -+ return QWebEngineView::forPage(this); -+ } -+#endif -+ - public slots: - void handleFeaturePermissionRequested(const QUrl &securityOrigin, - QWebEnginePage::Feature feature); -diff --git a/webview.cpp b/webview.cpp -index 035fb4b..07e0605 100644 ---- a/webview.cpp -+++ b/webview.cpp -@@ -2,10 +2,16 @@ - - #include - #include --#include - #include - #include - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+#include -+using QWebEngineContextMenuData = QWebEngineContextMenuRequest; -+#else -+#include -+#endif -+ - WebView::WebView(QWidget *parent, QStringList dictionaries) - : QWebEngineView(parent), m_dictionaries(dictionaries) { - -@@ -63,8 +69,11 @@ void WebView::wheelEvent(QWheelEvent *event) { - } - - void WebView::contextMenuEvent(QContextMenuEvent *event) { -- -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ auto menu = createStandardContextMenu(); -+#else - auto menu = page()->createStandardContextMenu(); -+#endif - menu->setAttribute(Qt::WA_DeleteOnClose, true); - // hide reload, back, forward, savepage, copyimagelink menus - foreach (auto *action, menu->actions()) { -@@ -77,8 +86,12 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) { - } - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ const QWebEngineContextMenuRequest &data = *lastContextMenuRequest(); -+#else - const QWebEngineContextMenuData &data = page()->contextMenuData(); - Q_ASSERT(data.isValid()); -+#endif - - // allow context menu on image - if (data.mediaType() == QWebEngineContextMenuData::MediaTypeImage) { -@@ -107,7 +120,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) { - - if (pageWebengineProfile->isSpellCheckEnabled()) { - auto subMenu = menu->addMenu(tr("Select Language")); -- for (const QString &dict : qAsConst(m_dictionaries)) { -+ for (const QString &dict : std::as_const(m_dictionaries)) { - auto action = subMenu->addAction(dict); - action->setCheckable(true); - action->setChecked(languages.contains(dict)); -diff --git a/widgets/MoreApps/moreapps.cpp b/widgets/MoreApps/moreapps.cpp -index c333751..a32ae9e 100644 ---- a/widgets/MoreApps/moreapps.cpp -+++ b/widgets/MoreApps/moreapps.cpp -@@ -104,7 +104,7 @@ QList MoreApps::prepareAppsToShow(const QByteArray &bytes) { - } - - QJsonArray jsonArray = jsonResponse.object().value("results").toArray(); -- foreach (const QJsonValue &val, jsonArray) { -+ for (const QJsonValue &val : jsonArray) { - QJsonObject object = val.toObject(); - - // publisher -@@ -127,7 +127,7 @@ QList MoreApps::prepareAppsToShow(const QByteArray &bytes) { - QJsonArray mediaArr = - object.value("snap").toObject().value("media").toArray(); - QString iconUrl; -- foreach (const QJsonValue &mediaItem, mediaArr) { -+ for (const QJsonValue &mediaItem : mediaArr) { - if (mediaItem.toObject().value("type") == "icon") - iconUrl = mediaItem.toObject().value("url").toString(); - } -@@ -252,7 +252,7 @@ void MoreApps::showApps() { - if (mRemoteIconPreCaching) { - // cache fallback icon - setRemoteIcon(fallbackIconUrl, nullptr); -- foreach (auto a, mAppList) { -+ for (auto &a : mAppList) { - auto iconUrl = a.getIconUrl(); - // qDebug() << "pre-caching icon for" << a.getName(); - setRemoteIcon(iconUrl, nullptr); diff --git a/net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch b/net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch deleted file mode 100644 index e1d91caee946..000000000000 --- a/net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/WhatsApp.pro b/WhatsApp.pro -index 38995b7..fbc572a 100644 ---- a/WhatsApp.pro -+++ b/WhatsApp.pro -@@ -4,22 +4,6 @@ - # - #------------------------------------------------- - --# Common security flags for all architectures --QMAKE_CFLAGS += -fstack-protector-strong -fstack-clash-protection -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS --QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -- --# Optimization flags --QMAKE_CFLAGS_RELEASE += -O2 --QMAKE_CXXFLAGS_RELEASE += -O2 -- --QMAKE_CFLAGS_DEBUG += -O1 --QMAKE_CXXFLAGS_DEBUG += -O1 -- --# Architecture-specific flags --equals(QMAKE_HOST.arch, aarch64) { -- QMAKE_CFLAGS += -mbranch-protection=standard --} -- - # Uncomment if you need specific linker flags as well - #QMAKE_LFLAGS += $$QMAKE_LDFLAGS - diff --git a/net-im/whatsie/metadata.xml b/net-im/whatsie/metadata.xml deleted file mode 100644 index a6ce8682bda0..000000000000 --- a/net-im/whatsie/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - nowa@gentoo.org - Nowa Ammerlaan - - - keshavbhatt/whatsie - - diff --git a/net-im/whatsie/whatsie-4.16.3-r1.ebuild b/net-im/whatsie/whatsie-4.16.3-r1.ebuild deleted file mode 100644 index 2c47de94791b..000000000000 --- a/net-im/whatsie/whatsie-4.16.3-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2019-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edos2unix qmake-utils xdg - -DESCRIPTION="Qt Based WhatsApp Client" -HOMEPAGE="https://github.com/keshavbhatt/whatsie" -SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -QT_MIN="6.0.0" - -DEPEND=" - x11-libs/libX11 - x11-libs/libxcb:= - >=dev-qt/qtbase-${QT_MIN}:6[gui,network,widgets] - >=dev-qt/qtpositioning-${QT_MIN}:6 - >=dev-qt/qtwebengine-${QT_MIN}:6[widgets] -" - -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.16.3-qt6.patch" - "${FILESDIR}/${PN}-4.16.3-respect-user-flags.patch" -) - -src_prepare() { - edos2unix downloadmanagerwidget.h downloadwidget.cpp downloadwidget.h - default -} - -src_configure() { - eqmake6 - # IDK if there is a better way to do this, qt6 puts this in a different dir - sed -e 's/bin\/qwebengine_convert_dict/libexec\/qwebengine_convert_dict/g' \ - -i Makefile || die -} - -src_install() { - einstalldocs - INSTALL_ROOT="${ED}" emake install -} diff --git a/profiles/package.mask b/profiles/package.mask index e9a5ca50f0a6..601e8008fc8b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -313,12 +313,6 @@ dev-qt/qtwebview:5 >=dev-libs/intel-compute-runtime-24.52.32224.5 >=dev-util/intel-graphics-compiler-2.5.7 -# Nowa Ammerlaan (2025-01-03) -# Contains a serious bug that can cause deletion of the users home dir. -# See-also: https://github.com/keshavbhatt/whatsie/issues/230 -# Removal on 2025-03-03 unless upstream fixes the issue -net-im/whatsie - # Michał Górny (2024-12-05) # 6.12.2 does not boot for me. =sys-kernel/gentoo-kernel-6.12.2