git: 033cdd617f5f - main - net-im/kaidan: update to 0.9.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 11 Jul 2023 18:54:36 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=033cdd617f5fa0b54fa0f9068c08eeb92f9769b5
commit 033cdd617f5fa0b54fa0f9068c08eeb92f9769b5
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-07-11 18:45:31 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-07-11 18:54:24 +0000
net-im/kaidan: update to 0.9.1
---
net-im/kaidan/Makefile | 9 +++--
net-im/kaidan/distinfo | 6 +--
net-im/kaidan/files/patch-src_QrCodeDecoder.cpp | 26 -------------
net-im/kaidan/files/patch-src_QrCodeGenerator.cpp | 25 -------------
net-im/kaidan/pkg-plist | 45 ++++++++++++++++++++---
5 files changed, 48 insertions(+), 63 deletions(-)
diff --git a/net-im/kaidan/Makefile b/net-im/kaidan/Makefile
index 403ef821d726..603b616299b4 100644
--- a/net-im/kaidan/Makefile
+++ b/net-im/kaidan/Makefile
@@ -1,13 +1,16 @@
PORTNAME= kaidan
-DISTVERSION= 0.8.0
-PORTREVISION= 4
+DISTVERSION= 0.9.1
CATEGORIES= net-im kde
-MASTER_SITES= KDE/unstable/${PORTNAME}/${DISTVERSION}
+MASTER_SITES= KDE/unstable/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= User-friendly XMPP client for every device
WWW= https://www.kaidan.im/
+BUILD_DEPENDS= kquickimageeditor>0:graphics/kquickimageeditor \
+ kirigami-addons>0:x11-toolkits/kirigami-addons
+RUN_DEPENDS= kquickimageeditor>0:graphics/kquickimageeditor \
+ kirigami-addons>0:x11-toolkits/kirigami-addons
LIB_DEPENDS= libQXmppQt5.so:net-im/qxmpp@qt5 \
libZXing.so:textproc/zxing-cpp
diff --git a/net-im/kaidan/distinfo b/net-im/kaidan/distinfo
index 0b812e8cec00..d1ca4aa8e709 100644
--- a/net-im/kaidan/distinfo
+++ b/net-im/kaidan/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622279232
-SHA256 (kaidan-0.8.0.tar.xz) = a7e772dc7abab565fdf9a7bdaf575a6229bdd509de0891079a83bd32766bb1a4
-SIZE (kaidan-0.8.0.tar.xz) = 532028
+TIMESTAMP = 1689100024
+SHA256 (kaidan-0.9.1.tar.xz) = 8137011d5c36a11d23fcc600d4fd5b0767951d69cf21c8eaac43e98d1c918f90
+SIZE (kaidan-0.9.1.tar.xz) = 692464
diff --git a/net-im/kaidan/files/patch-src_QrCodeDecoder.cpp b/net-im/kaidan/files/patch-src_QrCodeDecoder.cpp
deleted file mode 100644
index 5223f26e47c6..000000000000
--- a/net-im/kaidan/files/patch-src_QrCodeDecoder.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/QrCodeDecoder.cpp.orig 2023-01-10 10:30:39 UTC
-+++ 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 =
-@@ -77,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();
- }
diff --git a/net-im/kaidan/files/patch-src_QrCodeGenerator.cpp b/net-im/kaidan/files/patch-src_QrCodeGenerator.cpp
deleted file mode 100644
index f72eba0b2bdb..000000000000
--- a/net-im/kaidan/files/patch-src_QrCodeGenerator.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/QrCodeGenerator.cpp.orig 2023-01-10 10:34:19 UTC
-+++ src/QrCodeGenerator.cpp
-@@ -33,6 +33,10 @@
- #include <QImage>
- #include <QRgb>
-
-+#include <ZXing/ZXVersion.h>
-+#define ZXING_VERSION \
-+ QT_VERSION_CHECK(ZXING_VERSION_MAJOR, ZXING_VERSION_MINOR, ZXING_VERSION_PATCH)
-+
- #include <ZXing/BarcodeFormat.h>
- #include <ZXing/MultiFormatWriter.h>
-
-@@ -74,7 +78,11 @@ QImage QrCodeGenerator::generateQrCode(int edgePixelCo
- 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) {
diff --git a/net-im/kaidan/pkg-plist b/net-im/kaidan/pkg-plist
index 0ae9634f86fe..fe57cd1d6e49 100644
--- a/net-im/kaidan/pkg-plist
+++ b/net-im/kaidan/pkg-plist
@@ -2,14 +2,11 @@ bin/kaidan
share/applications/im.kaidan.kaidan.desktop
share/icons/hicolor/128x128/apps/kaidan.png
share/icons/hicolor/scalable/apps/kaidan.svg
-%%DATADIR%%/images/account-deletion-from-client-and-server.svg
-%%DATADIR%%/images/account-deletion-from-client.svg
%%DATADIR%%/images/chat-page-background.svg
-%%DATADIR%%/images/check-mark.svg
%%DATADIR%%/images/check-mark-pale.svg
+%%DATADIR%%/images/check-mark.svg
%%DATADIR%%/images/cross.svg
%%DATADIR%%/images/dots.svg
-%%DATADIR%%/images/global-drawer-banner.svg
%%DATADIR%%/images/kaidan-bw.svg
%%DATADIR%%/images/kaidan.svg
%%DATADIR%%/images/mic0.svg
@@ -23,11 +20,47 @@ share/icons/hicolor/scalable/apps/kaidan.svg
%%DATADIR%%/images/onboarding/login.svg
%%DATADIR%%/images/onboarding/manual-registration.svg
%%DATADIR%%/images/onboarding/password.svg
+%%DATADIR%%/images/onboarding/provider.svg
%%DATADIR%%/images/onboarding/registration.svg
%%DATADIR%%/images/onboarding/result.svg
-%%DATADIR%%/images/onboarding/server.svg
%%DATADIR%%/images/onboarding/username.svg
%%DATADIR%%/images/onboarding/web-registration.svg
-%%DATADIR%%/servers.json
+%%DATADIR%%/images/qr-code-scan-1.svg
+%%DATADIR%%/images/qr-code-scan-2.svg
+%%DATADIR%%/images/qr-code-scan-own-1.svg
+%%DATADIR%%/images/qr-code-scan-own-2.svg
+%%DATADIR%%/providers.json
share/knotifications5/kaidan.notifyrc
+share/locale/ar/LC_MESSAGES/kaidan_qt.qm
+share/locale/ca/LC_MESSAGES/kaidan_qt.qm
+share/locale/ca@valencia/LC_MESSAGES/kaidan_qt.qm
+share/locale/cs/LC_MESSAGES/kaidan_qt.qm
+share/locale/de/LC_MESSAGES/kaidan_qt.qm
+share/locale/el/LC_MESSAGES/kaidan_qt.qm
+share/locale/en_GB/LC_MESSAGES/kaidan_qt.qm
+share/locale/es/LC_MESSAGES/kaidan_qt.qm
+share/locale/eu/LC_MESSAGES/kaidan_qt.qm
+share/locale/fi/LC_MESSAGES/kaidan_qt.qm
+share/locale/fr/LC_MESSAGES/kaidan_qt.qm
+share/locale/gl/LC_MESSAGES/kaidan_qt.qm
+share/locale/he/LC_MESSAGES/kaidan_qt.qm
+share/locale/hu/LC_MESSAGES/kaidan_qt.qm
+share/locale/hy/LC_MESSAGES/kaidan_qt.qm
+share/locale/ie/LC_MESSAGES/kaidan_qt.qm
+share/locale/it/LC_MESSAGES/kaidan_qt.qm
+share/locale/ka/LC_MESSAGES/kaidan_qt.qm
+share/locale/ko/LC_MESSAGES/kaidan_qt.qm
+share/locale/ms/LC_MESSAGES/kaidan_qt.qm
+share/locale/nb/LC_MESSAGES/kaidan_qt.qm
+share/locale/nl/LC_MESSAGES/kaidan_qt.qm
+share/locale/pa/LC_MESSAGES/kaidan_qt.qm
+share/locale/pl/LC_MESSAGES/kaidan_qt.qm
+share/locale/pt/LC_MESSAGES/kaidan_qt.qm
+share/locale/pt_BR/LC_MESSAGES/kaidan_qt.qm
+share/locale/ru/LC_MESSAGES/kaidan_qt.qm
+share/locale/sk/LC_MESSAGES/kaidan_qt.qm
+share/locale/sl/LC_MESSAGES/kaidan_qt.qm
+share/locale/sv/LC_MESSAGES/kaidan_qt.qm
+share/locale/tr/LC_MESSAGES/kaidan_qt.qm
+share/locale/uk/LC_MESSAGES/kaidan_qt.qm
share/metainfo/im.kaidan.kaidan.appdata.xml