From nobody Tue Jul 11 18:54:36 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R0qmX4GTSz3cR3N; Tue, 11 Jul 2023 18:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0qmX3pM1z4Q58; Tue, 11 Jul 2023 18:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689101676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ww7WvT2D3EPNm8zimWkh5rwmHrsx5RCGHHdfSLhe74=; b=phVOhAVGe3qFYWUQ27CymltW7Ao8YKQaqUikqYhrhrsAdLob92+fnUPUbryFMDLZ8laDKr XjZdx+f0PNMC5lwGi9orSVL+PQ96XMvmQ1IvQuyoh7ptLWpa7+nTys/Mx5bk9zlDMnHNuW ypRLItmA8ER6OMjLQyTFUZhzFgUPeTFJkMDZIsO35FE1XEowAiYibnD7h7cJCdH+9ryQsU 6C0bwU/x98sNU41k/OCVsClj05iCIEVmsdkKgvrtBiEWcRK41yhddavzlsjxeJyOwuKCpU chy2RCbZegq8a59m03camIYdTubzOEeK/o3Xj/sMnvpLrnzSjOrWP2f5ebokBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689101676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ww7WvT2D3EPNm8zimWkh5rwmHrsx5RCGHHdfSLhe74=; b=oVnNOE6Uz0NllTc6oUudyUMPt3sOWiAQ7p18wIuCVZaKLsdmNos0EgdcvEliGUS0sIWOva a64ENzg/8jGEM5FdDrt51Jo2E7SiQnkGB9bDJLmq3OQO27mKJcezLAgY7DKA20VnY3Vk9B PeNEfNZyO/oYE66abO68tKNOuv6kCCW5OhVoRBad8NqkgmGu0Gki1DtxBQycdQkfwEqQkn XRreT7KJuUmCtS3Rl6vdbd2rNoN4WTBh5BJJX6KwM6E+Nl2k+8dEADHd34/KwC8OgMu83M RSgypRcTmM+fQC3+qap9LgBzvYIgII/cH+QDWBR7MPCjCothYLbL6xPTgIc2Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689101676; a=rsa-sha256; cv=none; b=s694+XPzjXDjj5//coxRnIHwgY/F1khg5MuX0rPsQER4CcKgk26tg898LPVPkamBObAJ37 zV3OhljbA0Ykjhw1EUm1EiOwkjBwdp3QzwrwQGVKjnQVPOM1xt0EtjAc3RUZ0y3qeQ6PEW NPD0hE2/NYibK95KqOIEHyjINeDCjrJDWj+z5UceZuQ2knjvrSzRsMEAl1aa08xBFCiUPU C9XGNTNUlw58ArY5ihoGLX2wY9yLs/7iPGjPx9+bUDIwj9t+IDNvNSBX0AIqsxL0KV78zZ kzoHSoPz/6vXJHbF4WFKQ4eD4uBnwYPO+vFx6SaW7zhJz9Wui29QKDK//Odg+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0qmX2vWtzdD0; Tue, 11 Jul 2023 18:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BIsa1Y087686; Tue, 11 Jul 2023 18:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BIsa31087685; Tue, 11 Jul 2023 18:54:36 GMT (envelope-from git) Date: Tue, 11 Jul 2023 18:54:36 GMT Message-Id: <202307111854.36BIsa31087685@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 033cdd617f5f - main - net-im/kaidan: update to 0.9.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 033cdd617f5fa0b54fa0f9068c08eeb92f9769b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=033cdd617f5fa0b54fa0f9068c08eeb92f9769b5 commit 033cdd617f5fa0b54fa0f9068c08eeb92f9769b5 Author: Tobias C. Berner AuthorDate: 2023-07-11 18:45:31 +0000 Commit: Tobias C. Berner 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 - #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::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