summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/Manifest.gzbin8591 -> 8423 bytes
-rw-r--r--net-im/synapse/Manifest2
-rw-r--r--net-im/synapse/synapse-1.123.0.ebuild2
-rw-r--r--net-im/whatsie/Manifest5
-rw-r--r--net-im/whatsie/files/whatsie-4.16.3-qt6.patch500
-rw-r--r--net-im/whatsie/files/whatsie-4.16.3-respect-user-flags.patch27
-rw-r--r--net-im/whatsie/metadata.xml11
-rw-r--r--net-im/whatsie/whatsie-4.16.3-r1.ebuild49
8 files changed, 2 insertions, 594 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index f1610285bfe1..8b2f85700a27 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
Binary files differ
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 4fe7a05e2969..8f262e16e482 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -106,7 +106,7 @@ DIST wit-bindgen-rt-0.33.0.crate 3357 BLAKE2B 7c5227e835eb405b681ba36a2472fb3330
DIST zerocopy-0.8.17.crate 230971 BLAKE2B a79faf2a2f94bffe640bcceaec3eb7656c5514627831509d53889c90998b5e3a19062db0f4940d5ee84556e94aad069ff2acff6308869d95ba2d87a3e8bb04e5 SHA512 5a7f55bd47bbcbf903d704f985e15ec1c57c2166351eddbb93df2dd869b5392f2984516e05b9dd1c3036d4d5db89bf04abafb21c1521eaf8304b796c05c01070
DIST zerocopy-derive-0.8.17.crate 81373 BLAKE2B 572d2b938c3dc98dc0f28684b71e6424eb850e1f99f863e92055b61198def468e232f4fad99e75562b68dde780fc68090a760b5ef0a016a1bbbacf1b4140172d SHA512 903726fb5434b654a0385983f644a44d45451dc22b3b974bfa07f9597aa95c5116372ab85c44d4b3f8e8af1b0918f728613e5a8c4f41afd79b4ab051e0f82dbd
EBUILD synapse-1.122.0.ebuild 5963 BLAKE2B ed29a5489ab284429c262cb5b9ef4ba89670ba9679378a3e63d49e9b818537d0c7eb2d039e232ccd6c0120f36132deb00d1bafdb7293631bbbfd69349aac3a98 SHA512 6eb09906825de3941ec9886ea877ad233df808a84544485353b94d99efc79cb62601c8e665806a28774b9082639164f9e6c053bdc4b262b8056df374b7df3dca
-EBUILD synapse-1.123.0.ebuild 5948 BLAKE2B 9d62a31c3fb9af313eb4840a8672789b0b0855a2d61b872a3814fff75b916fa0b5e7aab7806fc7f3e0411935e59bf7d801babb8cab1736bf708e34113ea8e483 SHA512 83e083a35e781f2ca609b8756db95f50e27e81170dd4945d472669c4dbccfee6b1f7b8369ab9b15d254d25f2945a91a1c9128535817faf59c2fe2abd33b45ec2
+EBUILD synapse-1.123.0.ebuild 5947 BLAKE2B 8af44b5ad350768da554f6ad78e0e6a1211a3d6cd88ff99ebca2b1090916f24e0ae1fc1dd667b02064dd9b75e725dfc15ee98e3990a19fb15304812a4a36dc41 SHA512 20da5a1e413cca7aa9516318614df23e2df3e66b9333e65171197931107296c6b7e1ec06a0d608d6c4b877b296e17d7c62b6df73407321216cc5fde9337475b8
EBUILD synapse-1.124.0.ebuild 5957 BLAKE2B a8266874570936e122e4d7e458fc87780168a3cd31a0b5e46544c0a44d531fc0542889cd4bf351cc40f7f181e680a2f13f57c7b679f97bdb97c2733e77e76d4a SHA512 a85b2b77f6fcbedb85fe2e6be62c3cd1d9cc88975314b0ad6dc77f0276d7c7f1a5445bde12d8003a6a313ecf7475fcac743222f200caa5537b98930f400d1e22
EBUILD synapse-1.125.0.ebuild 6276 BLAKE2B 5752332a48a475aef7f94ed3f88e0953b1c653d50b9b8159612e0bf237153d1ede0e5f11bf35806f835d06f38cfa68f9a388a3c8e156b6ca194c06cc3428d479 SHA512 d34b50fc41610eaa180f5f1fa73b112cdec2a9112ca5d4d58630478932a02e27953ca2206593a2deefbd4b1e09553e1c10620abdf266cdfbc8501c88bdf35eb0
MISC metadata.xml 381 BLAKE2B 8bf85af089213456d20c9d66a4d9788ff209983f8fd98c9fb6cf03e03ab5c12c9d5518ff4d86f5d4fb2a9a1080516f1febfedf5b06b0cb8e101cdc035bb139f4 SHA512 e88fd7f735bc9ca0aced01f49ca539134b297a5c9c5ee633fe3de64626d6f4b4eb547326288abea9c161f2647852c23658dba17265e64254335870450f644307
diff --git a/net-im/synapse/synapse-1.123.0.ebuild b/net-im/synapse/synapse-1.123.0.ebuild
index cb829fb751ca..743372f96178 100644
--- a/net-im/synapse/synapse-1.123.0.ebuild
+++ b/net-im/synapse/synapse-1.123.0.ebuild
@@ -100,7 +100,7 @@ LICENSE+="
|| ( Apache-2.0 Boost-1.0 )
"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
IUSE="postgres systemd test"
RESTRICT="!test? ( test )"
diff --git a/net-im/whatsie/Manifest b/net-im/whatsie/Manifest
deleted file mode 100644
index b55be8440849..000000000000
--- a/net-im/whatsie/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX whatsie-4.16.3-qt6.patch 18650 BLAKE2B a4ee93a3aa4806902b0ae98623741699a862defb712d233fa5b08a5286de995435de7cade57595e1bfffb3e4417551da62dad2161d34017eda38f2ca11c35648 SHA512 b7b099759131d99a579922a60a1810619541013e6e034725844b7d77d8c7f96545ecf8d4f5b8142b4a7881cfa1e20aaf35b126e921463adbdbf3bcf8699d2ae9
-AUX whatsie-4.16.3-respect-user-flags.patch 729 BLAKE2B c743549b109e0af65393674e7af2342fe6d468731804189503c1f0580435d731942aac77138892975c8c54d045d6277f25308315473bde4696cc25d8b15a1978 SHA512 522758bdc32f1945a4cfa532178c822b367158c267052cc61e8f1436122e26d41401d23c101ec0a23aefa8e68b2231fc9ebbbe2d1bacba5e1590d155f2574acb
-DIST whatsie-4.16.3.tar.gz 21405138 BLAKE2B d9038e74b221b8f9caa62eb527bb4ea3b0328d89a79dd2d876aa19e876e192c9df266349d73e673bee9c71c22f1a46aa57273474dcba461b7ae0926ae36e923e SHA512 db14995718b639e1e3aba7b965958bb17cf5244eb1a81ea628b6c10a5cf751b38731a8861fcaf3a50bb5ca64e50e4e58869e5a91279ec2d2bff88debe1e64fa1
-EBUILD whatsie-4.16.3-r1.ebuild 1091 BLAKE2B 7cbc2558651fa20f8ea410abda9acf3b34d466a59a991d90e07724f96e7dbe97b16f45802c599bac2bc0be417999b5357e02add467ea9bc3a971e79544f720d0 SHA512 0d10a461e8d46ed1ef12bd8d0a1cfe30996e4ed3b39bc2ea6719ba190f1d0e9540cfd75768dc9cd47235283bc1f2f5085e0abd11add21d71e731e3bc4dac021b
-MISC metadata.xml 330 BLAKE2B 5f85994945f3f1df6c2bafcc06e616ab0f6c901ff966cde895d07cb00f72fb552c85931a5a4730f7ce9e4630783d3974a9e909437f81f55088fbee523d7dbf19 SHA512 2ad99337544ace5c84199c95d88297c94a857e995e6f26c4ae98d80bac89fc0af790e6513d6bf6b8dc471bc772462628a98cbf3f3983154446dfb843729e34ad
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 <QFileDialog>
- #include <QStandardPaths>
--#include <QWebEngineDownloadItem>
- #include <QWidget>
-
--QT_BEGIN_NAMESPACE
--class QWebEngineDownloadItem;
--QT_END_NAMESPACE
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-+#include <QWebEngineDownloadRequest>
-+using QWebEngineDownloadItem = QWebEngineDownloadRequest;
-+#else
-+#include <QWebEngineDownloadItem>
-+#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 <QDesktopServices>
- #include <QFileInfo>
- #include <QUrl>
--#include <QWebEngineDownloadItem>
-
- 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 <QFrame>
- #include <QTime>
-
--QT_BEGIN_NAMESPACE
--class QWebEngineDownloadItem;
--QT_END_NAMESPACE
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-+#include <QWebEngineDownloadRequest>
-+using QWebEngineDownloadItem = QWebEngineDownloadRequest;
-+#else
-+#include <QWebEngineDownloadItem>
-+#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 <QDebug>
- #include <QWebEngineProfile>
- #include <QWebEngineSettings>
--#include <QtWebEngine>
- #include <QtWidgets>
-
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-+#include <QtWebEngineCore>
-+#else
-+#include <QtWebEngine>
-+#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 <QStyle>
- #include <QStyleFactory>
- #include <QSystemTrayIcon>
--#include <QWebEngineContextMenuData>
- #include <QWebEngineCookieStore>
- #include <QWebEngineFullScreenRequest>
- #include <QWebEngineProfile>
-diff --git a/notificationpopup.h b/notificationpopup.h
-index dc1277b..c9b2a54 100644
---- a/notificationpopup.h
-+++ b/notificationpopup.h
-@@ -6,14 +6,12 @@
-
- #include <QApplication>
- #include <QDebug>
--#include <QDesktopWidget>
- #include <QHBoxLayout>
- #include <QLabel>
- #include <QMouseEvent>
- #include <QPropertyAnimation>
- #include <QPushButton>
- #include <QScreen>
--#include <QScreen>
- #include <QSpacerItem>
- #include <QTimer>
- #include <QVBoxLayout>
-@@ -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<QWebEngineCertificateError&>(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 <QWebEngineRegisterProtocolHandlerRequest>
- #include <QWebEngineSettings>
-
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-+#include <QWebEngineView>
-+#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 <QContextMenuEvent>
- #include <QMenu>
--#include <QWebEngineContextMenuData>
- #include <QWebEngineProfile>
- #include <mainwindow.h>
-
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-+#include <QWebEngineContextMenuRequest>
-+using QWebEngineContextMenuData = QWebEngineContextMenuRequest;
-+#else
-+#include <QWebEngineContextMenuData>
-+#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<AppItem> 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<AppItem> 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>nowa@gentoo.org</email>
- <name>Nowa Ammerlaan</name>
- </maintainer>
- <upstream>
- <remote-id type="github">keshavbhatt/whatsie</remote-id>
- </upstream>
-</pkgmetadata>
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
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 23:27:02 +0000