diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/neochat-23.08.4.tar.xz b/neochat-23.08.4.tar.xz deleted file mode 100644 index 9670807..0000000 --- a/neochat-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d98038200bc042f2a8b96032eca531a39c98a3616ff6a34aa713fa08978ace9 -size 784304 diff --git a/neochat-23.08.4.tar.xz.sig b/neochat-23.08.4.tar.xz.sig deleted file mode 100644 index 57dfd55..0000000 --- a/neochat-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8asACgkQu0YzUNbv -Me8WVA/+MyJaYoCrpDqAQuaw0i+3nxgfxt1P8hXg15sRF0xzcvLpiT15EMcG2OXo -lh2S3AXP+MVzlA6a0wovtS7JCi9BLQDMPHAVKt0/0hXZ3fa3tRJjsHLYnYjwSZGV -Wt8NBbPAF390jZdpazMfkC0bbC3CthJu68X2OJ7g3a5/r6sJ7ZVJVC3STZq6mJ1K -fqsA+UiN+BBxcOtNUkM/Uoh/CtTiuNr1I7affP9n11wIfneKyIwRhsG0fSF0NxEw -kKGCbGrlvtyelOL+Q7p3hO865r2+tcUAXkYUDzNaPbJS0LI+pIpesvrklcxk7/mC -/qYSkkJE0t2oeHNrh/WJ5Is1Q5B6p4GzEzB0ZDyT0gMGnlJZIwjayaKoxdqw7GKc -sbTLw2PAA9mm2At6KYGpfakc5/sFODqZ+laKZNTOY+dAww0Yb1xAuvvXKFfPjLHj -AvQQWBJAPrfQmW+kAVqATMGHDzxPEKzX0B+OCQwQRytKJntiWC3z/dVYUc5I0PIh -hAm/D9mWXxH/GpumFPxKF+PGk5qj3RohmtZdw7IQynKM5fgrz8karNm4BkEVhjah -4QxIQM9wbJkVWzpBbWs1E9sRNLdFE4p3PyDZrX0bEzUYAeDFY1ny+O9/Ak7kXTxB -Na42N8UYk1smdiX9FRGIzEZ0o336TFDWUcj2A3N0S/0eZJEOUXI= -=W1KQ ------END PGP SIGNATURE----- diff --git a/neochat-24.01.95.tar.xz b/neochat-24.01.95.tar.xz new file mode 100644 index 0000000..7ca39f8 --- /dev/null +++ b/neochat-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b1d30b400bf8a84bc1beb254889142afb72652e057f632f46941fc0a37492dc +size 880560 diff --git a/neochat-24.01.95.tar.xz.sig b/neochat-24.01.95.tar.xz.sig new file mode 100644 index 0000000..7ccb61b --- /dev/null +++ b/neochat-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45NsACgkQOmpNuDnq +ptfQshAAhkDKGXPN/fv7EcMOtFm9bJccWGa/tvjKEST9IyglU8mdEkZ+zCQ+iHFA +7aH2Bh6ty96jUs0bb44Qewi4oRblwuB6YSFLCveEqJEVvn5VmQ5djJodCJOM4h5n +d6RSCTQruc8B2IX/MMLP/jzAYkdPKwqPFdN+FwTpb4DXhQC+8L4KPuxeyFStVThw +P49myX64g0X82CFSMmD1c+zT7dMebn0MNz5NmheeA9zebWr7cmZMGqZXFiUM0d/f +IsvcJ6ftdtijvasS5N/Jg5yFzvqipEwM1565QxPqNftOaaV85ddjDb7W5MSfhvvP +8Z7BOavnSPzmxtgLYzi1Lws4vA+SBh9nQStM2up8X8C7bpcQ/q8GSmN+HClkBqMR +peYYH6PbmlovNspTyB0pu6QC/gyDg6c3wV2qDIG9eUSYflh6p83BRZ5b4eXMUo7b +R3bw3q7xinBHA4QA/p9ugvSmUG3M32u0CXw44mJosSIrTMeNGtxo7dtdOe/EINR0 +90xjjomoohgWMzRU6dV0OqeCpTF04FiUfwyJDSLppKS9NkJl3E0JnCMAps8lbzuB +22+63vVsENixXVQwSh8eJ7TRkBBQHsw8fq3ZwoDeFJdis8iAJYy8VZK4YChUyg9O +CFv36dGJeamGCLsEUxk13FurTnA8FPxIBjNKqIpAy1KMEexHEc0= +=F+7V +-----END PGP SIGNATURE----- diff --git a/neochat.changes b/neochat.changes index d09e1a2..f4df619 100644 --- a/neochat.changes +++ b/neochat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:10:01 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:34 UTC 2023 - Christophe Marin diff --git a/neochat.spec b/neochat.spec index 10e40ab..bdbf3a0 100644 --- a/neochat.spec +++ b/neochat.spec @@ -1,7 +1,7 @@ # # spec file for package neochat # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,68 +16,71 @@ # -%define _kf5_version 5.88.0 -%bcond_without released +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + +%bcond_without released Name: neochat -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: A chat client for Matrix, the decentralized communication protocol License: BSD-2-Clause AND GPL-3.0-only AND GPL-3.0-or-later Group: Productivity/Networking/Instant Messenger URL: https://apps.kde.org/neochat/ -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: cmake >= 3.16 +# Needed for leap 15.5 BuildRequires: cmark -BuildRequires: extra-cmake-modules >= %{_kf5_version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes -%if 0%{?suse_version} == 1500 -BuildRequires: gcc12-PIE -BuildRequires: gcc12-c++ -%endif -BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(KF5Config) >= %{_kf5_version} -BuildRequires: cmake(KF5ConfigWidgets) >= %{_kf5_version} -BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_version} -BuildRequires: cmake(KF5DBusAddons) >= %{_kf5_version} -BuildRequires: cmake(KF5DocTools) >= %{_kf5_version} -BuildRequires: cmake(KF5I18n) >= %{_kf5_version} -BuildRequires: cmake(KF5ItemModels) >= %{_kf5_version} -BuildRequires: cmake(KF5KIO) >= %{_kf5_version} -BuildRequires: cmake(KF5Kirigami2) >= %{_kf5_version} -BuildRequires: cmake(KF5KirigamiAddons) >= 0.7.2 -BuildRequires: cmake(KF5Notifications) >= %{_kf5_version} -BuildRequires: cmake(KF5QQC2DesktopStyle) >= %{_kf5_version} -BuildRequires: cmake(KF5Sonnet) >= %{_kf5_version} -BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_version} -BuildRequires: cmake(KQuickImageEditor) >= 0.1 -BuildRequires: cmake(QCoro5Coro) -BuildRequires: cmake(Qt5Core) >= 5.15.2 -BuildRequires: cmake(Qt5Gui) >= 5.15.2 -BuildRequires: cmake(Qt5Keychain) -BuildRequires: cmake(Qt5Multimedia) >= 5.15.2 -BuildRequires: cmake(Qt5Quick) >= 5.15.2 -BuildRequires: cmake(Qt5QuickControls2) >= 5.15.2 -BuildRequires: cmake(Qt5Svg) >= 5.15.2 -BuildRequires: cmake(Qt5Widgets) >= 5.15.2 -BuildRequires: cmake(Quotient) >= 0.7.0 +BuildRequires: cmake(KF6ColorScheme) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6ItemModels) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Kirigami) >= %{kf6_version} +BuildRequires: cmake(KF6KirigamiAddons) >= 0.7.2 +BuildRequires: cmake(KF6Notifications) >= %{kf6_version} +BuildRequires: cmake(KF6QQC2DesktopStyle) >= %{kf6_version} +BuildRequires: cmake(KF6Sonnet) >= %{kf6_version} +BuildRequires: cmake(KF6StatusNotifierItem) >= %{kf6_version} +BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version} +BuildRequires: cmake(KQuickImageEditor) >= 0.2 +BuildRequires: cmake(QCoro6Core) +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Multimedia) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6WebView) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: cmake(QuotientQt6) >= 0.7.0 +BuildRequires: pkgconfig(icu-uc) >= 61.0 BuildRequires: pkgconfig(libcmark) -Requires: kirigami-addons -Requires: kirigami2 -Requires: kitemmodels-imports -Requires: kquickimageeditor-imports -Requires: syntax-highlighting-imports -Requires: qt5qmlimport(QtLocation.5) >= 15 -Requires: qt5qmlimport(QtPositioning.5) >= 15 -Requires: qt5qmlimport(org.kde.quickcharts.1) >= 0 +# It can only build on the same platforms as Qt Webengine +ExclusiveArch: x86_64 aarch64 riscv64 +Requires: kf6-kirigami-imports >= %{kf6_version} +Requires: kf6-kitemmodels-imports >= %{kf6_version} +Requires: kf6-kquickcharts >= %{kf6_version} +Requires: kf6-prison-imports >= %{kf6_version} +Requires: kf6-qqc2-desktop-style >= %{kf6_version} +Requires: kf6-syntax-highlighting-imports >= %{kf6_version} +Requires: kirigami-addons6 >= 0.7.2 +Requires: qt6-location >= %{qt6_version} +Requires: qt6-positioning-imports >= %{qt6_version} +Requires: qt6qmlimport(org.kde.kquickimageeditor.1) %description -Neochat is a client for Matrix, the decentralized communication protocol for instant -messaging. +Neochat is a client for Matrix, the decentralized communication protocol for +instant messaging. %lang_package @@ -85,17 +88,12 @@ messaging. %autosetup -p1 %build -# c++-20 is required -%if 0%{?suse_version} == 1500 - export CC=gcc-12 CXX=g++-12 -%endif +%cmake_kf6 -%cmake_kf5 -d build - -%cmake_build +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install %fdupes %{buildroot} @@ -103,18 +101,16 @@ messaging. %files %license LICENSES/* -%doc README* -%dir %{_kf5_sharedir}/krunner/ -%dir %{_kf5_sharedir}/krunner/dbusplugins/ -%{_kf5_applicationsdir}/org.kde.neochat.desktop -%{_kf5_appstreamdir}/org.kde.neochat.appdata.xml -%{_kf5_bindir}/neochat -%{_kf5_debugdir}/neochat.categories -%{_kf5_iconsdir}/hicolor/*/apps/org.kde.neochat.svg -%{_kf5_iconsdir}/hicolor/scalable/apps/org.kde.neochat.tray.svg -%{_kf5_mandir}/man1/neochat.1%{?ext_man} -%{_kf5_notifydir}/neochat.notifyrc -%{_kf5_sharedir}/krunner/dbusplugins/plasma-runner-neochat.desktop +%doc README.md +%{_kf6_applicationsdir}/org.kde.neochat.desktop +%{_kf6_appstreamdir}/org.kde.neochat.appdata.xml +%{_kf6_bindir}/neochat +%{_kf6_debugdir}/neochat.categories +%{_kf6_iconsdir}/hicolor/*/apps/org.kde.neochat.svg +%{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.neochat.tray.svg +%{_kf6_mandir}/man1/neochat.1%{?ext_man} +%{_kf6_notificationsdir}/neochat.notifyrc +%{_kf6_sharedir}/krunner/dbusplugins/plasma-runner-neochat.desktop %files lang -f %{name}.lang