gentoo auto-resync : 18:12:2022 - 15:59:06

5 files changed, 110 insertions, 55 deletions

diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 4c509d40f49e..ee9e941f5f5b 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,5 +1,5 @@
-DIST neochat-22.06.tar.xz 336432 BLAKE2B ad77e83bb64137bb3f4597999ed2db0f47a83a0e253150b7a27903acebfd28f58062b8dcb8c393312d11f830df6e6b208d07daa016e99b4c75c16f3da1aa85ce SHA512 d7f3776620592f509f9db42c5b8118c7c5d6f11ad152502a36bd49c8aa56bf3b6c0056ec1dfc4268002b6c035926aee6e9e835de271e27ebbfc2bacda218d13e
+AUX neochat-22.11-fix-crash-notification-settings.patch 2971 BLAKE2B 641da45f1ce637ef0dd57a0bda3cd0b9b979c603799435c177e30f7f12fdcd90fc380450fa693f784e911f20a00c72bbda759148ba9dfe35a24b8f8c860d5f9a SHA512 a25490fd20b96d4c4857885f152a7f109a9d78fef06504eb61d777479d2e137323a26d68e2306fc08b792d033bd9aac0579e7ea9eca61c48ef40329b8f1b675f
+AUX neochat-22.11-hide-dev-settings-loading.patch 1633 BLAKE2B 493e404e21b4275cd1babf950fe1f1d2d54dd0cb4a54d2cb39b313b8fdec422e3f4a9969e75f3f3c214100ad96e50ff4fc726f0454576034b165b27d983a7cb3 SHA512 cc8446c1cb7c0dc60be0950c682ecaecb3954e6a792ebf9ef2da39480dd6b4754bcef99d19a53b6de9bb203fe0ac32ce1a540e8758dc6cb2b1fe131b58520748
 DIST neochat-22.11.tar.xz 465660 BLAKE2B bbd391a97cf4ea886042f3983798b766b4bd4fcf75513e4adf808227cc03ae6b533426b0f3ab000dc22593ce0be1ea7d284fac654db5bf66844633001300babd SHA512 7e10d2512dd60b76340a84b2daab1e020d75c0ec9d79c87d5f96ce2c394bf93e557b9c96606abe643a787db1136861c25826f9dc7680d3a43d218654ef864519
-EBUILD neochat-22.06.ebuild 1434 BLAKE2B e2d73ebb6cdc5eef95783f4dd2f12feac66c1851578234495ca819195f24b4129c00d7120cf5c4e8492cabf8c26774eea21b8831d2fccc2de300a57bab2817ee SHA512 856b2ef287a50ce52e8892faee387b2afc880f86e34b96624b77158f7197ca2e5b2ac2aab6f9af3ad16004d2346068a738be8e298e11e4bed35c3ff60993c2e7
-EBUILD neochat-22.11.ebuild 1540 BLAKE2B a7083d25f75ac403007c34fb6ff016ca665848e3ca518d44c1d192c108e88693823777f26969c278af35e5a2d8311b3ca350cff403776b4eb6ca53cef259444f SHA512 1c31ef5b3f30cb32355af739566352ec77fe2c7faab79e00d8f58388656c404fdc30a0dd9735e2dcac3b6946fb4e9eb096664dbfb104341a332a0a17c08e8ca8
+EBUILD neochat-22.11-r1.ebuild 1699 BLAKE2B 00e87827230f50de3b14d8d04bbae5924c9d21041f4dff1195d188832d82702732a4e456659976ee2a34d08deb9b8df13df24e4fed3cee51fe29d4da6e914c28 SHA512 0505e63f721f52a1586e0ffcf2e433aea090feb3d3999b678bd80e4d2f6a8a892c4ec0e3ca60d83e7610a14386dca8131148f7186d1fb954477c0b909ede6b56
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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
new file mode 100644
index 000000000000..48c65a368fd3
--- /dev/null
+++ b/net-im/neochat/files/neochat-22.11-fix-crash-notification-settings.patch
@@ -0,0 +1,61 @@
+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
new file mode 100644
index 000000000000..c19e54683839
--- /dev/null
+++ b/net-im/neochat/files/neochat-22.11-hide-dev-settings-loading.patch
@@ -0,0 +1,41 @@
+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.06.ebuild b/net-im/neochat/neochat-22.06.ebuild
deleted file mode 100644
index e4fc3548c1b3..000000000000
--- a/net-im/neochat/neochat-22.06.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY=network
-KFMIN=5.96.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"
-SLOT="0"
-
-DEPEND="
-	app-text/cmark:=
-	dev-libs/qcoro5
-	dev-libs/qtkeychain:=
-	>=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/knotifications-${KFMIN}:5[qml]
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	media-libs/kquickimageeditor:5
-	>=net-libs/libquotient-0.6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5[qml]
-"
-BDEPEND="virtual/pkgconfig"
diff --git a/net-im/neochat/neochat-22.11.ebuild b/net-im/neochat/neochat-22.11-r1.ebuild
index f918277b3087..b722512985b7 100644
--- a/net-im/neochat/neochat-22.11.ebuild
+++ b/net-im/neochat/neochat-22.11-r1.ebuild
@@ -53,3 +53,8 @@ RDEPEND="${DEPEND}
 	>=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
+)