diff --git a/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
new file mode 100644
index 00000000000..947e3541860
--- /dev/null
+++ b/srcpkgs/neochat/patches/delegatesizehelpertest_fix.patch
@@ -0,0 +1,38 @@
+From 6305359b3c515e030c2bfd35b6ee62ad36ebe497 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Sun, 27 Aug 2023 01:46:50 +0200
+Subject: [PATCH] Use round instead of ceil in delegatesizehelper
+
+Fixes #592
+---
+ src/delegatesizehelper.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/delegatesizehelper.cpp b/src/delegatesizehelper.cpp
+index 7c4d6dec0..aae61fa06 100644
+--- a/src/delegatesizehelper.cpp
++++ b/src/delegatesizehelper.cpp
+@@ -124,7 +124,7 @@ int DelegateSizeHelper::calculateCurrentPercentageWidth() const
+     int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
+     int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
+ 
+-    int calcPercentWidth = std::ceil(m * m_parentWidth + c);
++    int calcPercentWidth = std::round(m * m_parentWidth + c);
+     return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
+ }
+ 
+@@ -146,9 +146,9 @@ qreal DelegateSizeHelper::currentWidth() const
+ 
+     qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
+     if (m_maxWidth < 0.0) {
+-        return std::ceil(absoluteWidth);
++        return std::round(absoluteWidth);
+     } else {
+-        return std::ceil(std::min(absoluteWidth, m_maxWidth));
++        return std::round(std::min(absoluteWidth, m_maxWidth));
+     }
+ }
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/neochat/patches/empty_image.source_crash.patch b/srcpkgs/neochat/patches/empty_image.source_crash.patch
new file mode 100644
index 00000000000..efc03cf5a72
--- /dev/null
+++ b/srcpkgs/neochat/patches/empty_image.source_crash.patch
@@ -0,0 +1,25 @@
+From 0d5929b4bc3ca8c55a9e27121782efb19e4d829e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 4 Sep 2023 19:03:06 +0000
+Subject: [PATCH] Fix enable/disable save button when image.source is empty.
+ Otherwise it will crash
+
+---
+ src/qml/Settings/EmoticonEditorPage.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qml/Settings/EmoticonEditorPage.qml b/src/qml/Settings/EmoticonEditorPage.qml
+index c55e9178e..1f003d24e 100644
+--- a/src/qml/Settings/EmoticonEditorPage.qml
++++ b/src/qml/Settings/EmoticonEditorPage.qml
+@@ -119,8 +119,8 @@
+                 MobileForm.FormButtonDelegate {
+                     id: save
+                     text: i18n("Save")
+-                    icon.name: "document-save"
+-                    enabled: !root.newEmoticon || (image.source && shortcode.text && description.text)
++		    icon.name: "document-save"
++		    enabled: !root.newEmoticon || (image.source.toString().length > 0 && shortcode.text && description.text)
+                     onClicked: {
+                         if (root.newEmoticon) {
+                             model.addEmoticon(image.source, shortcode.text, description.text, emoticonType === EmoticonFormCard.Stickers ? "sticker" : "emoticon")
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
index c6c4e699eca..1848b79c094 100644
--- a/srcpkgs/neochat/template
+++ b/srcpkgs/neochat/template
@@ -1,7 +1,7 @@
 # Template file for 'neochat'
 pkgname=neochat
-version=23.04.3
-revision=2
+version=23.08.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake
  qt5-host-tools kcoreaddons kconfig AppStream"
@@ -9,14 +9,16 @@ makedepends="kquickimageeditor-devel libQuotient-devel qtkeychain-qt5-devel
  qt5-multimedia-devel kirigami2-devel ki18n-devel cmark-devel
  knotifications-devel kconfig-devel kcoreaddons-devel qqc2-desktop-style-devel
  sonnet-devel kitemmodels-devel kirigami-addons kconfigwidgets-devel kio-devel
- qcoro-qt5-devel"
-depends="kquickimageeditor kitemmodels"
+ qcoro-qt5-devel olm-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
+ qt5-plugin-sqlite qt5-plugin-tds"
+depends="kquickimageeditor kitemmodels kirigami2 kirigami-addons kquickcharts
+ qt5-location"
 short_desc="Client for matrix from KDE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, GPL-3.0-or-later, GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://apps.kde.org/en/neochat"
 distfiles="${KDE_SITE}/release-service/${version}/src/neochat-${version}.tar.xz"
-checksum=2e7a006e24eea80049a0213897048291d1ddb52d484aae8d2d0f48bbb020af04
+checksum=4ead1a9fa308e53173229a744075c59580ed3364bd206a08c07d9db163758bfb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools"