From be549c7dacbf20b47e4243661d3f289860475728 Mon Sep 17 00:00:00 2001
From: krop <>
Date: May 24 2023 18:57:18 +0000
Subject: Update kaidan to version 0.9.1 / rev 4 via SR 1088698
https://build.opensuse.org/request/show/1088698
by user krop + dimstar_suse
---
diff --git a/.files b/.files
index 9663bab..ae8f672 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index de8ac46..1e3a307 100644
--- a/.rev
+++ b/.rev
@@ -26,4 +26,12 @@
Update to 0.9.0
1085094
+
+ 580bb1dbdcccac3906784e7e096eccda
+ 0.9.1
+
+ dimstar_suse
+
+ 1088698
+
diff --git a/0001-QrCodeDecoder-Replace-deprecated-BarcodeFormat-QR_CO.patch b/0001-QrCodeDecoder-Replace-deprecated-BarcodeFormat-QR_CO.patch
deleted file mode 100644
index 72bb51f..0000000
--- a/0001-QrCodeDecoder-Replace-deprecated-BarcodeFormat-QR_CO.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9a2f88779064b46ae097a354c97d657901f47d01 Mon Sep 17 00:00:00 2001
-From: Melvin Keskin
-Date: Fri, 18 Feb 2022 10:48:46 +0100
-Subject: [PATCH] QrCodeDecoder: Replace deprecated 'BarcodeFormat::QR_CODE'
- with 'BarcodeFormat::QRCode'
-
----
- src/QrCodeDecoder.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp
-index a84978f..a7b0cf5 100644
---- a/src/QrCodeDecoder.cpp
-+++ b/src/QrCodeDecoder.cpp
-@@ -60,7 +60,11 @@ void QrCodeDecoder::decodeImage(const QImage &image)
- {
- // Advise the decoder to check for QR codes and to try decoding rotated versions of the image.
- #if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 0)
-+# if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 1)
-+ const auto decodeHints = DecodeHints().setFormats(BarcodeFormat::QRCode);
-+# else
- const auto decodeHints = DecodeHints().setFormats(BarcodeFormat::QR_CODE);
-+# endif
- const auto result = ReadBarcode({image.bits(), image.width(), image.height(), ZXing::ImageFormat::Lum, image.bytesPerLine()}, decodeHints);
- #else
- const auto decodeHints =
---
-2.39.1
-
diff --git a/0001-QrCodeGenerator-Replace-deprecated-BarcodeFormat-QR_.patch b/0001-QrCodeGenerator-Replace-deprecated-BarcodeFormat-QR_.patch
deleted file mode 100644
index 9acc14d..0000000
--- a/0001-QrCodeGenerator-Replace-deprecated-BarcodeFormat-QR_.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dc41a3f3850308d5204134ae08e66f20a58195f9 Mon Sep 17 00:00:00 2001
-From: Melvin Keskin
-Date: Sun, 13 Mar 2022 13:03:16 +0100
-Subject: [PATCH] QrCodeGenerator: Replace deprecated 'BarcodeFormat::QR_CODE'
- with 'BarcodeFormat::QRCode'
-
----
- src/QrCodeGenerator.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/QrCodeGenerator.cpp b/src/QrCodeGenerator.cpp
-index b9c8743..1338308 100644
---- a/src/QrCodeGenerator.cpp
-+++ b/src/QrCodeGenerator.cpp
-@@ -33,6 +33,10 @@
- #include
- #include
-
-+#include
-+#define ZXING_VERSION \
-+ QT_VERSION_CHECK(ZXING_VERSION_MAJOR, ZXING_VERSION_MINOR, ZXING_VERSION_PATCH)
-+
- #include
- #include
-
-@@ -74,7 +78,11 @@ QImage QrCodeGenerator::generateBareJidQrCode(int edgePixelCount, const QString
- QImage QrCodeGenerator::generateQrCode(int edgePixelCount, const QString &text)
- {
- try {
-+#if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 1)
-+ ZXing::MultiFormatWriter writer(ZXing::BarcodeFormat::QRCode);
-+#else
- ZXing::MultiFormatWriter writer(ZXing::BarcodeFormat::QR_CODE);
-+#endif
- const ZXing::BitMatrix &bitMatrix = writer.encode(text.toStdWString(), edgePixelCount, edgePixelCount);
- return toImage(bitMatrix);
- } catch (const std::invalid_argument &e) {
---
-2.39.1
-
diff --git a/0001-Support-ZXing-2.0.patch b/0001-Support-ZXing-2.0.patch
deleted file mode 100644
index 50e13ef..0000000
--- a/0001-Support-ZXing-2.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7171e5c4bc31114be265f6fde8cc08a519c4a6f3 Mon Sep 17 00:00:00 2001
-From: Volker Krause
-Date: Wed, 4 Jan 2023 17:28:31 +0100
-Subject: [PATCH] Support ZXing 2.0
-
-An alternative approach going forward might be replacing the entire direct
-ZXing use and video stream processing by KF::Prison. Avoids duplicated
-maintenance, but adds a new dependency.
----
- src/QrCodeDecoder.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/QrCodeDecoder.cpp b/src/QrCodeDecoder.cpp
-index ea2a89d..081acb5 100644
---- a/src/QrCodeDecoder.cpp
-+++ b/src/QrCodeDecoder.cpp
-@@ -81,7 +81,11 @@ void QrCodeDecoder::decodeImage(const QImage &image)
- // If a QR code could be found and decoded, emit a signal with the decoded string.
- // Otherwise, emit a signal for failed decoding.
- if (result.isValid())
-+#if ZXING_VERSION < QT_VERSION_CHECK(2, 0, 0)
- emit decodingSucceeded(QString::fromStdString(TextUtfEncoding::ToUtf8(result.text())));
-+#else
-+ emit decodingSucceeded(QString::fromStdString(result.text()));
-+#endif
- else
- emit decodingFailed();
- }
---
-2.40.1
-
diff --git a/kaidan-0.9.0.tar.xz b/kaidan-0.9.0.tar.xz
deleted file mode 120000
index 5a6d6f6..0000000
--- a/kaidan-0.9.0.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeie2nzehpf7kh22txar23abetn4wgjy6yz7rhsvqyi57je7yp5ausm
\ No newline at end of file
diff --git a/kaidan-0.9.0.tar.xz.sig b/kaidan-0.9.0.tar.xz.sig
deleted file mode 100644
index 8dbf2be..0000000
--- a/kaidan-0.9.0.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEA8LRDcl+WwvruPO0RmMjGpGh4nsFAmROW6EACgkQRmMjGpGh
-4nsYxw//dFX5aT4QwQKorWHRHqIjmeafaftAOrjXmu5nwyd9/6NqU0JrEHdNx6It
-DTmeFxof4QmafAz8NsGK1gkWWAXTlRyP0nBuGiVpXsEF41qgJwLcEqK99zUGLUrR
-uvthzrAczwEIUAMwnXls1g+zz56dwFOv06izz8meTlz2vHbO1kIfxgL80RtJgd9H
-Ulbx42PsDS7LqQ6BY6F2ldW5rNz66iDS0rpPwziuZxHX+yVy29xJa/BzUuv9VnrH
-Gu/wlwvWjDLci3YncXiDkBTkPKyQkR28MP0G52UIq/nxT38awkVSEc0CohBdY6lX
-BuSonUDLa7IZx7ShouxmNrEQ+eYCyf65s+zQuxIfg25Fbi3Sc04txGUz0c9m/5ij
-X9S+rbVy7RN9ngTvZY3dzA+OOYN2fng2Q10KAIVZ4MSfOH+CCO2LKhKl85oqrSNt
-myCxhyS1/+4VEJtiYvX2v0QsF8UYaGLkf4Ty6M36noqhIXfH0+KVwsCzghFud3FS
-kj7M4sjCBaaq8OipgzZe0ZZ6CwG9r4vQ7hUVdd4YNN3QBAXoALxc17jAwbBzePHl
-Jgk4e7rCL54jJedekUPO8wNIKmg6rglvWRTzRRZR3Aq7ZDpUSO2aWBq07u+Lil77
-eUPuzfDD66S57wSyB4UDm/3y+zdAmqXKH/7dABG5UaRKb9ab3hk=
-=JK3o
------END PGP SIGNATURE-----
diff --git a/kaidan-0.9.1.tar.xz b/kaidan-0.9.1.tar.xz
new file mode 120000
index 0000000..0c6e618
--- /dev/null
+++ b/kaidan-0.9.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeian6yp6fuxjkumefulkdl63ecnvnyf3jrgzef6dffqxkkb27izy2y
\ No newline at end of file
diff --git a/kaidan-0.9.1.tar.xz.sig b/kaidan-0.9.1.tar.xz.sig
new file mode 100644
index 0000000..5c50bec
--- /dev/null
+++ b/kaidan-0.9.1.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEA8LRDcl+WwvruPO0RmMjGpGh4nsFAmRXhmYACgkQRmMjGpGh
+4nvWohAAwYWUspM2E+xYhgt8LTUjxGDF7gWMFs+w/sE8UAukI0e7qu3WPlKaoJVY
+ySmV/mvh3LsSljPvvu3eGb0CA4otIrSDL4elHMGdTAddfIteoBOrJRr/fCaG0uV4
+mprykxb28CMmdIuDnjWuL2Z36P5n6n5TCotP8YRgOx3jQ8hGxp6+PCBS0RIqK/xT
+puyulu3b3inKn3WsFVKEwj+NC3qHSQkLsSdjRJuJAqpb5fQz4RYvKFgKtZ3umYc6
+ZZYtgYn+TPdi8V5EbGd+n3f4Q99YvUbCRr3w4HXhewEGXs8IppccyIcVHBqBMJCh
+3p4UqHR4vZBavMAy+bZtRDdV7RR70oT0ICyu3KZoI78JeznW8wXGtVrwcp0QBw/o
+Pq6XR6J5DxICVwsEAhgn9Lb8DaifF0icTUEl/Vx8gU7jMuqxhcEH8HsqX/wU1Szd
+F21qOc7ve85AUgJae2WCPe+G6MgbvpCNDM0pU08OXWsq21XKFaN1Mlar1DMCMUHE
+OeC1BqciCtcJ1Mgy/7wjmMhjU8l1nCW3TQVUtuMgZyAP+fXYFoE+k/6uYCk94+HV
+3LJ6QPjkn43Xb++JHZ0y7zB/yrU9Vv5iIY4+nrFSV3IX3D0/7ydZzZr/W4uRNz4v
+5Udn+IALfPEGbtvR4rStroM9+U2+uX4D+OjrwBWds5tisYrIDmo=
+=OSpN
+-----END PGP SIGNATURE-----
diff --git a/kaidan.changes b/kaidan.changes
index 6107ecd..994d9cb 100644
--- a/kaidan.changes
+++ b/kaidan.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon May 22 21:10:32 UTC 2023 - Jaime Marquínez Ferrándiz
+
+- Update to 0.9.1:
+ * The published tar for 0.9.0 contained the wrong version
+- Add the lang package
+- Drop 0001-QrCodeDecoder-Replace-deprecated-BarcodeFormat-QR_CO.patch, 0001-QrCodeGenerator-Replace-deprecated-BarcodeFormat-QR_.patch and 0001-Support-ZXing-2.0.patch
+
+-------------------------------------------------------------------
Fri May 5 12:14:24 UTC 2023 - Christophe Marin
- Update to 0.9.0
diff --git a/kaidan.spec b/kaidan.spec
index da3c628..af79e37 100644
--- a/kaidan.spec
+++ b/kaidan.spec
@@ -17,27 +17,25 @@
Name: kaidan
-Version: 0.9.0
+Version: 0.9.1
Release: 0
Summary: A XMPP client based on KDE Framework
-License: GPL-3.0-or-later AND SUSE-GPL-3.0+-with-openssl-exception AND MIT AND AML AND CC-BY-SA-4.0
+License: AML AND GPL-3.0-or-later AND SUSE-GPL-3.0+-with-openssl-exception AND MIT AND CC-BY-SA-4.0
URL: https://www.kaidan.im
-Source0: https://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.xz
-Source1: https://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.xz.sig
+Source0: https://download.kde.org/unstable/%{name}/%{name}-%{version}.tar.xz
+Source1: https://download.kde.org/unstable/%{name}/%{name}-%{version}.tar.xz.sig
Source2: kaidan.keyring
-# PATCH-FIX-UPSTREAM
-Patch0: 0001-QrCodeDecoder-Replace-deprecated-BarcodeFormat-QR_CO.patch
-# PATCH-FIX-UPSTREAM
-Patch1: 0001-QrCodeGenerator-Replace-deprecated-BarcodeFormat-QR_.patch
-# PATCH-FIX-UPSTREAM
-Patch2: 0001-Support-ZXing-2.0.patch
BuildRequires: cmake >= 3.3
BuildRequires: extra-cmake-modules >= 5.40.0
BuildRequires: update-desktop-files
+BuildRequires: cmake(KF5CoreAddons) >= 5.67.0
+BuildRequires: cmake(KF5KIO) >= 5.67.0
BuildRequires: cmake(KF5Kirigami2) >= 5.67.0
+BuildRequires: cmake(KF5KirigamiAddons) >= 0.7.0
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5QQC2DeskopStyle)
-BuildRequires: cmake(QXmpp) >= 1.3.0
+BuildRequires: cmake(KQuickImageEditor)
+BuildRequires: cmake(QXmpp) >= 1.5.0
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core) >= 5.14.0
BuildRequires: cmake(Qt5LinguistTools)
@@ -53,7 +51,9 @@ BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
BuildRequires: cmake(ZXing) >= 1.0.8
+Requires: kirigami-addons >= 0.7.0
Requires: kirigami2 >= 5.67.0
+Requires: kquickimageeditor-imports
Requires: libqt5-qtquickcontrols2
%description
@@ -61,6 +61,8 @@ Kaidan is a simple Jabber/XMPP client providing a user-interface using
Kirigami and QtQuick. The back-end of Kaidan is entirely written in C++
using the qxmpp XMPP client library and Qt 5.
+%lang_package
+
%prep
%autosetup -p1
@@ -72,6 +74,8 @@ using the qxmpp XMPP client library and Qt 5.
%kf5_makeinstall -C build
%suse_update_desktop_file im.kaidan.kaidan
+%find_lang %{name} --with-qt
+
%files
%license LICENSE
%doc README.md NEWS
@@ -82,6 +86,8 @@ using the qxmpp XMPP client library and Qt 5.
%{_kf5_iconsdir}/hicolor/*/apps/%{name}.*
%{_kf5_notifydir}/kaidan.notifyrc
%{_kf5_sharedir}/%{name}/images
-%{_kf5_sharedir}/%{name}/servers.json
+%{_kf5_sharedir}/%{name}/providers.json
+
+%files lang -f %{name}.lang
%changelog