From nobody Sun Aug 21 13:53:12 2022 X-Original-To: dev-commits-ports-main@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 4M9cQK0TQXz4ZrGF; Sun, 21 Aug 2022 13:53:13 +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 4M9cQJ71qLz4JHt; Sun, 21 Aug 2022 13:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661089993; 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=9iKrr+Zs4PIr8VlFEbJFjcTUsAU1rnNSY52iFZCg2J4=; b=r96JJqu6PgDdhzFYonXNND39OIN5q/44fED5DUTMSDv+XuixlZEWkU2jam0DrSAKLQgJ4I 95/g51ARyrJOcSDE/kVfVv9DBRzx2e+bWCcnWXzhHAPDDCzvP/nzOAkLk/LnhvcAjL/XQ2 U2XOPsxFNklb8qdz59b07NyNsa103cOxmlyTjKAkSHU2ovVq4jDtQkWg2btLby2g2JwhQj 6kFqr0rbRPQtxe+qkrdptyXRPP2BBtM4bfmFvOOLRBuGMskcudVsCu0luE/mrQilrsPAZB qhCk1v5Ln+c4i/En3p1LUB5kMkKwRJoETjNHuVGEEBHELO5o/mvhkaZTFcqJ0w== 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 4M9cQJ63Y0z1CgY; Sun, 21 Aug 2022 13:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27LDrCXY014644; Sun, 21 Aug 2022 13:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LDrCkn014643; Sun, 21 Aug 2022 13:53:12 GMT (envelope-from git) Date: Sun, 21 Aug 2022 13:53:12 GMT Message-Id: <202208211353.27LDrCkn014643@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: b37a6fe56034 - main - x11/plasma5-plasma-desktop: fix emojier plugin packaging (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b37a6fe560348d964ee75555e05fc1b9a56d1ebf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661089993; 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=9iKrr+Zs4PIr8VlFEbJFjcTUsAU1rnNSY52iFZCg2J4=; b=UnojfgJfCIy8av5WJx1z68/mIUH62BSj6ZK6EFKzKWYjxHCLgn0fRJpzeJUgcP9E8IpTDK oV4vEugrFx7v0raVLRUbUF2DQemQjQtDmfDkLiAFvXSBnnWyh0rOMAQr2QzUvmiK7gYxL3 KDwx0YsEBfuZqD4czR2K8XkNH71te3RhvxdwDnDs2Jc29LTbpmQnsokaAWnWF6akT1iYqp PUiYCCOzaGNGVsDQZ2TISg0AtKJFwhmd4EZPBp5JZ6ZoGu0AY6C/kelGEGZZjozxIJh0vo hCvMeE6Mma25mNvzWPu4v4fkACGOSrPnesQJ/AZDktzZRln4vb2bG/gdB4IBNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661089993; a=rsa-sha256; cv=none; b=dnmUyMi1pTqudecGnXVTADDHQ26fl2C2eixzHBFd2ht55h6r+2ijNOfCJuXO/mQNd5lboJ ZLjxqTd8VFMoBd8qwrKetiVUA+3hE+j6zpfz34wQpbznrAHwCtJfpBllnrfJ25UYcpPF8m YdShiXuHk9Z4fpBnuwxXUZfSv3SwFUf7NeD6k8E0ufDq2rElGul3ZKuPyzuaAyxgNglp4C zyB1KHqt34UOgVnb99b4PUl8af1t9MjBoVGvX7eFVYcc1c1d6wV8aVkd/hJEO2rdWP8A1J E+PZdVGhRLcb9+vTdEyhzWvQOeMlw2v4GMroeqzKtXxZwlNimABEeR2o1Xu82A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b37a6fe560348d964ee75555e05fc1b9a56d1ebf commit b37a6fe560348d964ee75555e05fc1b9a56d1ebf Author: Dima Panov AuthorDate: 2022-08-21 13:50:05 +0000 Commit: Dima Panov CommitDate: 2022-08-21 13:50:05 +0000 x11/plasma5-plasma-desktop: fix emojier plugin packaging (+) This commit is a follow-up to e9bacd8754ba65acad948624fa6ab295d855a0ff emojier plugin is part of Ibus integration not KAccounts :( While here, pet poudriere about missing libaccounts-qt5 dependency Pointy hat to: fluffy --- x11/plasma5-plasma-desktop/Makefile | 3 ++- x11/plasma5-plasma-desktop/pkg-plist | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile index bdcb5a4d0bc5..745ba8c6cbd3 100644 --- a/x11/plasma5-plasma-desktop/Makefile +++ b/x11/plasma5-plasma-desktop/Makefile @@ -67,7 +67,8 @@ IBUS_DESC= Enable IBUS backend for input dialog SCIM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_SCIM SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim SCIM_DESC= Enable SCIM backend for input dialog -ACCOUNTS_LIB_DEPENDS= libkaccounts.so:net-im/kaccounts-integration +ACCOUNTS_LIB_DEPENDS= libkaccounts.so:net-im/kaccounts-integration \ + libaccounts-qt5.so:net-im/libaccounts-qt5 ACCOUNTS_USE= gnome=intltool ACCOUNTS_DESC= Accounts management library support FEEDBACK_LIB_DEPENDS= libKUserFeedbackCore.so:deskutils/kuserfeedback diff --git a/x11/plasma5-plasma-desktop/pkg-plist b/x11/plasma5-plasma-desktop/pkg-plist index 62cb5bd9c8b8..a8042ddd1688 100644 --- a/x11/plasma5-plasma-desktop/pkg-plist +++ b/x11/plasma5-plasma-desktop/pkg-plist @@ -46,8 +46,8 @@ lib/libexec/kauth/kcmdatetimehelper %%QT_QMLDIR%%/org/kde/activities/settings/qmldir %%QT_QMLDIR%%/org/kde/plasma/activityswitcher/libactivityswitcherextensionplugin.so %%QT_QMLDIR%%/org/kde/plasma/activityswitcher/qmldir -%%ACCOUNTS%%%%QT_QMLDIR%%/org/kde/plasma/emoji/libEmojierDeclarativePlugin.so -%%ACCOUNTS%%%%QT_QMLDIR%%/org/kde/plasma/emoji/qmldir +%%IBUS%%%%QT_QMLDIR%%/org/kde/plasma/emoji/libEmojierDeclarativePlugin.so +%%IBUS%%%%QT_QMLDIR%%/org/kde/plasma/emoji/qmldir %%QT_QMLDIR%%/org/kde/plasma/private/kimpanel/libkimpanelplugin.so %%QT_QMLDIR%%/org/kde/plasma/private/kimpanel/qmldir %%QT_QMLDIR%%/org/kde/plasma/private/pager/libpagerplugin.so @@ -86,7 +86,7 @@ share/applications/kcm_tablet.desktop share/applications/kcm_workspace.desktop share/applications/kcmspellchecking.desktop share/applications/org.kde.knetattach.desktop -%%ACCOUNTS%%share/applications/org.kde.plasma.emojier.desktop +%%IBUS%%share/applications/org.kde.plasma.emojier.desktop share/config.kcfg/kactivitymanagerd_plugins_settings.kcfg share/config.kcfg/kactivitymanagerd_settings.kcfg share/config.kcfg/kcmaccessibilitybell.kcfg @@ -755,7 +755,7 @@ share/kf5/kactivitymanagerd/workspace/settings/qml/activitiesTab/ActivitiesView. share/kf5/kactivitymanagerd/workspace/settings/qml/activitiesTab/main.qml share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/GeneralTab.qml share/kf5/kactivitymanagerd/workspace/settings/qml/privacyTab/BlacklistApplicationView.qml -%%ACCOUNTS%%share/kglobalaccel/org.kde.plasma.emojier.desktop +%%IBUS%%share/kglobalaccel/org.kde.plasma.emojier.desktop share/knotifications5/kaccess.notifyrc share/knotifications5/kcm_touchpad.notifyrc share/knsrcfiles/krunner.knsrc