From nobody Sun Feb 16 10:52:59 2025 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 4YwjLP1zpcz5nGZC; Sun, 16 Feb 2025 10:53:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwjLM6Zdxz3PbX; Sun, 16 Feb 2025 10:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739703180; 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=AMUowjJqsN4f2i3SPBFEpszHb8RioH9kSuskGogiPD8=; b=t5Pe60csH7QoAR5Ma/UEG+lwFDQl563VKgwL1RgUbuZTbZD4TXrzPg/pAVscS6h2ignbWC 1GJIczSPnu0QYIN9o+w9HKT/aJuH9T4UtQyiVFyzGSGTTTGPmvwqhAy6LqbI/7gtB7zaTe xTZoBM9Xpt4jPbkkCz15mvnViT9Wajp3SrxCnrwpgirEo5XdCc90nKmJ74yvQ8ZfmL9Whb ityeTjTOd5zB+qtvjQ/Cf2EjwuzeLJrczFlOibetqZAxITqW3lR/fZfZScPsPcrPJv2k7m YhRBpYjHHVGkg5itMasNBhXDwThaayfkrclFyu/gzoSNEe0BR0kgxX1BGoNFOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739703180; a=rsa-sha256; cv=none; b=Bae/RIW9I+WuVRK7UYdVkUvScB013LgkBhdN/uUa0IhIlk/JcGrs3W0ZyJW5PrSU4qg/EJ 8YQUY3b7uIrzXG9NcLkf+SLDT+slWdj/3Nbkxq0juBDxgl5jP+xmXD57nsuyaikekh4yT2 yqaMNZPeG6e5n0/j26RxIIvOCs2PK3EOxpg8qfMVjpN9ZsMLOjPNY8wUBcv24rYJg0y181 UQTVmVN9c3ZDu0o5xfvYa0EgFJiO1gU54kY0t6ONnSK2WV3x8/Y1U/cgRdF/0WGjWln0tS YqF1DYTW+0ekVN9q0/SxGBOr/E/sa5pBPG6Kv2uIW+rEMutcB8qv25EAADYYUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739703180; 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=AMUowjJqsN4f2i3SPBFEpszHb8RioH9kSuskGogiPD8=; b=vyLU+5Ixm4bT9oEy3hdClALQHAWrbFtDQ4BTqScHIYvyTPHsnWtjVC3FWyREbpYc0gf8Yx 7jg4uXgAfJfeRbYUlID6iv3jMD974Vn+zmgwcS97DDrAG469LT8zQpho9xzl5TQKoJf9mE s84SOv5Ea2YFyWtPN1/G8nr5/ecwCtj8ERWQNLliVSTEySAGz5uVjN32cUmGUooF5inA1k 9oGNfs044wKJpDU/5DQzcCthQVnugtG1s67k/AcEuUtAHcUJlcoHwUsdmeVNHb4O1q/AmW NSZ4xhTA8iQvdYiondVL730/25lmNKiv/2BhRJCWMdRfPKQ2lUQlu31Ea6zPQQ== 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 4YwjLM6B61zkfC; Sun, 16 Feb 2025 10:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51GAqx9G000355; Sun, 16 Feb 2025 10:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GAqx9S000352; Sun, 16 Feb 2025 10:52:59 GMT (envelope-from git) Date: Sun, 16 Feb 2025 10:52:59 GMT Message-Id: <202502161052.51GAqx9S000352@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 9b76bc3d82c5 - main - net-im/kaidan: Update to 0.11.0 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b76bc3d82c55628723de4df49d5e44c7ea2eccd Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b76bc3d82c55628723de4df49d5e44c7ea2eccd commit 9b76bc3d82c55628723de4df49d5e44c7ea2eccd Author: Jason E. Hale AuthorDate: 2025-02-16 10:47:20 +0000 Commit: Jason E. Hale CommitDate: 2025-02-16 10:52:52 +0000 net-im/kaidan: Update to 0.11.0 Kaidan now only builds with Qt6/KF6 with this release. --- net-im/kaidan/Makefile | 28 +++++++++++----------- net-im/kaidan/distinfo | 6 ++--- .../patch-src_singleapp_singleapplication.cpp | 28 ++++++++++++++++++++++ net-im/kaidan/pkg-plist | 3 ++- 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/net-im/kaidan/Makefile b/net-im/kaidan/Makefile index 8712e99982a6..73bedb018193 100644 --- a/net-im/kaidan/Makefile +++ b/net-im/kaidan/Makefile @@ -1,6 +1,5 @@ PORTNAME= kaidan -DISTVERSION= 0.10.1 -PORTREVISION= 1 +DISTVERSION= 0.11.0 CATEGORIES= net-im kde MASTER_SITES= KDE/unstable/${PORTNAME}/${DISTVERSION} @@ -11,20 +10,21 @@ WWW= https://apps.kde.org/kaidan/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt -BUILD_DEPENDS= kquickimageeditor-qt5>0:graphics/kquickimageeditor@qt5 -LIB_DEPENDS= libQXmppQt5.so:net-im/qxmpp@qt5 \ - libZXing.so:textproc/zxing-cpp -RUN_DEPENDS= kquickimageeditor-qt5>0:graphics/kquickimageeditor@qt5 +BUILD_DEPENDS= kquickimageeditor-qt6>0:graphics/kquickimageeditor@qt6 +LIB_DEPENDS= libQXmppQt6.so:net-im/qxmpp \ + libicuuc.so:devel/icu \ + libxkbcommon.so:x11/libxkbcommon +RUN_DEPENDS= kquickimageeditor-qt6>0:graphics/kquickimageeditor@qt6 -USES= cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig \ - qt:5 tar:xz xorg -USE_KDE= completion config coreaddons jobwidgets kio kirigami-addons \ - kirigami2 notifications qqc2-desktop-style service solid \ - widgetsaddons windowsystem \ +USES= cmake compiler:c++23-lang desktop-file-utils gl kde:6 \ + pkgconfig qt:6 tar:xz xorg +USE_GL= gl opengl # GLX +USE_KDE= completion config coreaddons crash jobwidgets kio \ + kirigami-addons kirigami2 notifications prison \ + qqc2-desktop-style service solid widgetsaddons \ ecm:build -USE_QT= concurrent core dbus declarative gui location multimedia network \ - quickcontrols2 sql svg widgets xml \ - buildtools:build qmake:build +USE_QT= base declarative location multimedia positioning svg \ + tools:build USE_XORG= x11 .include diff --git a/net-im/kaidan/distinfo b/net-im/kaidan/distinfo index 51ef33b77466..36aaf231bbb8 100644 --- a/net-im/kaidan/distinfo +++ b/net-im/kaidan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737528542 -SHA256 (kaidan-0.10.1.tar.xz) = d28ec1cb9bdd44f4b73c23c651b1adfa233981f6d7b1c760e8a7a72c1cdc6f16 -SIZE (kaidan-0.10.1.tar.xz) = 3064212 +TIMESTAMP = 1739685884 +SHA256 (kaidan-0.11.0.tar.xz) = 3feef43d66ff5c30ae81894a7343da1856ca84b0177b8a07922f193ca33776a2 +SIZE (kaidan-0.11.0.tar.xz) = 874168 diff --git a/net-im/kaidan/files/patch-src_singleapp_singleapplication.cpp b/net-im/kaidan/files/patch-src_singleapp_singleapplication.cpp new file mode 100644 index 000000000000..9cde19b22775 --- /dev/null +++ b/net-im/kaidan/files/patch-src_singleapp_singleapplication.cpp @@ -0,0 +1,28 @@ +Using the default PosixRealtime semaphores causes the application to exit +upon start. SingleApplication is third party to kaidan. This needs more +investigation. + +SingleApplication: Unable to create block. +SingleApplication: QSharedMemory::UnknownError "QSharedMemoryPrivate::initKey: +unable to set key on lock (QSystemSemaphore::handle: unknown error: Invalid argument)" + +--- src/singleapp/singleapplication.cpp.orig 2025-02-15 10:18:43 UTC ++++ src/singleapp/singleapplication.cpp +@@ -69,7 +69,7 @@ SingleApplication::SingleApplication(int &argc, char * + // By explicitly attaching it and then deleting it we make sure that the + // memory is deleted even after the process has crashed on Unix. + #if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) +- d->memory = new QSharedMemory(QNativeIpcKey(d->blockServerName)); ++ d->memory = new QSharedMemory(QNativeIpcKey(d->blockServerName, QNativeIpcKey::Type::SystemV)); + #else + d->memory = new QSharedMemory(d->blockServerName); + #endif +@@ -78,7 +78,7 @@ SingleApplication::SingleApplication(int &argc, char * + #endif + // Guarantee thread safe behaviour with a shared memory block. + #if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) +- d->memory = new QSharedMemory(QNativeIpcKey(d->blockServerName)); ++ d->memory = new QSharedMemory(QNativeIpcKey(d->blockServerName, QNativeIpcKey::Type::SystemV)); + #else + d->memory = new QSharedMemory(d->blockServerName); + #endif diff --git a/net-im/kaidan/pkg-plist b/net-im/kaidan/pkg-plist index ea1e909864be..19c5e3c07812 100644 --- a/net-im/kaidan/pkg-plist +++ b/net-im/kaidan/pkg-plist @@ -26,7 +26,7 @@ share/icons/hicolor/scalable/apps/kaidan.svg %%DATADIR%%/providers-completion.json.license %%DATADIR%%/providers.json %%DATADIR%%/providers.json.license -share/knotifications5/kaidan.notifyrc +share/knotifications6/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 @@ -66,3 +66,4 @@ share/locale/uk/LC_MESSAGES/kaidan_qt.qm share/locale/zh_CN/LC_MESSAGES/kaidan_qt.qm share/locale/zh_TW/LC_MESSAGES/kaidan_qt.qm share/metainfo/im.kaidan.kaidan.appdata.xml +share/qlogging-categories6/kaidan.categories