[gentoo-commits] repo/gentoo:master commit in: net-im/neochat/, net-im/neochat/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     0fd003f29fd587864c21be2d39f5adb99418e5f4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 13:39:47 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 13:47:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd003f2

net-im/neochat: drop 22.11-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-im/neochat/Manifest                            |  1 -
 ...hat-22.11-fix-crash-notification-settings.patch | 61 ----------------------
 .../neochat-22.11-hide-dev-settings-loading.patch  | 41 ---------------
 net-im/neochat/neochat-22.11-r2.ebuild             | 60 ---------------------
 4 files changed, 163 deletions(-)

diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 145d910d1707..11fde7426bb8 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,2 +1 @@
-DIST neochat-22.11.tar.xz 465660 BLAKE2B bbd391a97cf4ea886042f3983798b766b4bd4fcf75513e4adf808227cc03ae6b533426b0f3ab000dc22593ce0be1ea7d284fac654db5bf66844633001300babd SHA512 7e10d2512dd60b76340a84b2daab1e020d75c0ec9d79c87d5f96ce2c394bf93e557b9c96606abe643a787db1136861c25826f9dc7680d3a43d218654ef864519
 DIST neochat-23.04.0.tar.xz 565520 BLAKE2B 3ad908f916c5db5326486e2267b26a99dee58348be7f247a27590e8d20cbe3ef3c93c9506416c182215ba0e13ea29d50afe1a445f3fc31def5ad136c250eeae0 SHA512 a4098ef9cdf1a59ab8ee6abfeaf3d5533cdf668a43c081d3cd228249530bcdd77a386c2215106c5e3a8efbbd68b7ec3e8b04f34219d6511a9d654ef0c1bb0be4

diff --git a/net-im/neochat/files/neochat-22.11-fix-crash-notification-settings.patch b/net-im/neochat/files/neochat-22.11-fix-crash-notification-settings.patch
deleted file mode 100644
index 48c65a368fd3..000000000000
--- a/net-im/neochat/files/neochat-22.11-fix-crash-notification-settings.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6b3f44e9232bd1bf49752934a896a9aa3afe5a65 Mon Sep 17 00:00:00 2001
-From: James Graham <james.h.graham@protonmail.com>
-Date: Sun, 11 Dec 2022 11:53:21 +0000
-Subject: [PATCH] Fix crash when opening notification settings with no account
- by making sure that the keyword model doesn't try to update the noficiation
- settings when there is no active connection. Also make sure that ability to
- add a keyword or change the global notiifcaiton state is disabled without an
- active connection as these will cause the same crash.
-
----
- src/keywordnotificationrulemodel.cpp         | 4 +++-
- src/qml/Settings/GlobalNotificationsPage.qml | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/keywordnotificationrulemodel.cpp b/src/keywordnotificationrulemodel.cpp
-index a15f4aa0..e9ac6145 100644
---- a/src/keywordnotificationrulemodel.cpp
-+++ b/src/keywordnotificationrulemodel.cpp
-@@ -15,7 +15,9 @@
- KeywordNotificationRuleModel::KeywordNotificationRuleModel(QObject *parent)
-     : QAbstractListModel(parent)
- {
--    controllerConnectionChanged();
-+    if (Controller::instance().activeConnection()) {
-+        controllerConnectionChanged();
-+    }
-     connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &KeywordNotificationRuleModel::controllerConnectionChanged);
- }
- 
-diff --git a/src/qml/Settings/GlobalNotificationsPage.qml b/src/qml/Settings/GlobalNotificationsPage.qml
-index f81b1a65..ab6bdc3f 100644
---- a/src/qml/Settings/GlobalNotificationsPage.qml
-+++ b/src/qml/Settings/GlobalNotificationsPage.qml
-@@ -23,7 +23,7 @@ Kirigami.ScrollablePage {
-             contentItem: MobileForm.FormCheckDelegate {
-                 text: i18n("Enable notifications for this account")
-                 checked: Config.showNotifications
--                enabled: !Config.isShowNotificationsImmutable
-+                enabled: !Config.isShowNotificationsImmutable && Controller.activeConnection
-                 onToggled: {
-                     Config.showNotifications = checked
-                     Config.save()
-@@ -225,6 +225,7 @@ Kirigami.ScrollablePage {
-                             Layout.fillWidth: true
- 
-                             placeholderText: i18n("Keyword…")
-+                            enabled: NotificationsManager.keywordNotificationAction !== PushNotificationAction.Unknown
- 
-                             rightActions: Kirigami.Action {
-                                 icon.name: "edit-clear"
-@@ -246,6 +247,7 @@ Kirigami.ScrollablePage {
-                             Accessible.name: text
-                             icon.name: "list-add"
-                             display: QQC2.AbstractButton.IconOnly
-+                            enabled: NotificationsManager.keywordNotificationAction !== PushNotificationAction.Unknown
- 
-                             onClicked: {
-                                 keywordNotificationRuleModel.addKeyword(keywordAddField.text, PushNotificationAction.On)
--- 
-GitLab
-

diff --git a/net-im/neochat/files/neochat-22.11-hide-dev-settings-loading.patch b/net-im/neochat/files/neochat-22.11-hide-dev-settings-loading.patch
deleted file mode 100644
index c19e54683839..000000000000
--- a/net-im/neochat/files/neochat-22.11-hide-dev-settings-loading.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 25c7b7b780d2913c323b8c048e8999ea9f72997f Mon Sep 17 00:00:00 2001
-From: James Graham <james.h.graham@protonmail.com>
-Date: Sun, 11 Dec 2022 16:47:16 +0000
-Subject: [PATCH] Hide loading item and show info message when on the devices
- page and not logged in.
-
----
- src/qml/Settings/DevicesPage.qml | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/qml/Settings/DevicesPage.qml b/src/qml/Settings/DevicesPage.qml
-index dd3f2eab..71a9d950 100644
---- a/src/qml/Settings/DevicesPage.qml
-+++ b/src/qml/Settings/DevicesPage.qml
-@@ -27,7 +27,7 @@ Kirigami.ScrollablePage {
-                 }
-                 MobileForm.AbstractFormDelegate {
-                     Layout.fillWidth: true
--                    visible: deviceRepeater.count === 0 // We can assume 0 means loading since there is at least one device
-+                    visible: Controller.activeConnection && deviceRepeater.count === 0 // We can assume 0 means loading since there is at least one device
-                     contentItem: Kirigami.LoadingPlaceholder { }
-                 }
-                 Repeater {
-@@ -160,6 +160,14 @@ Kirigami.ScrollablePage {
-                 }
-             }
-         }
-+        Kirigami.InlineMessage {
-+            Layout.fillWidth: true
-+            Layout.maximumWidth: Kirigami.Units.gridUnit * 30
-+            Layout.alignment: Qt.AlignHCenter
-+            text: i18n("Please login to view the signed-in devices for your account.")
-+            type: Kirigami.MessageType.Information
-+            visible: !Controller.activeConnection
-+        }
-     }
- 
-     Kirigami.OverlaySheet {
--- 
-GitLab
-

diff --git a/net-im/neochat/neochat-22.11-r2.ebuild b/net-im/neochat/neochat-22.11-r2.ebuild
deleted file mode 100644
index 9b51d5a366fa..000000000000
--- a/net-im/neochat/neochat-22.11-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK=optional
-ECM_TEST=true
-KDE_ORG_CATEGORY=network
-KFMIN=5.99.0
-QTMIN=5.15.5
-inherit ecm plasma-mobile.kde.org
-
-DESCRIPTION="Client for Matrix, the decentralized communication protocol"
-HOMEPAGE="https://apps.kde.org/neochat/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
-SLOT="0"
-
-DEPEND="
-	app-text/cmark:=
-	>=dev-libs/kirigami-addons-0.6:5
-	dev-libs/qcoro5
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/knotifications-${KFMIN}:5[qml]
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5[qml]
-	media-libs/kquickimageeditor:5
-	>=net-libs/libquotient-0.6:=
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-notification-settings.patch" # KDE-bug #462853
-	"${FILESDIR}/${P}-hide-dev-settings-loading.patch" # KDE-bug #462900
-)