From nobody Thu Mar 13 05:27:54 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 4ZCwxk6CCQz5r4nt; Thu, 13 Mar 2025 05:27:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCwxk38pBz3Jn3; Thu, 13 Mar 2025 05:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741843674; 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=0A/D/VNDs9Fn8QBdpweRzLJYJ7nDeKwQOla3WqyeffM=; b=lNp/saLClJoc+/KNzXM5xJbjhWW4AMAp3lWzW4n9aYhHi25S/sztJQ6FcvGEZhbQKzyhTf 3Z+QtsVvc1oiW279GrZw7NNtSa0fxCiLt88SExldEsXYqZRaRzWSphZa7x/4/Q6+8VvwDR T4wtNVfDf2FYr0kqMR9eeK46qU/qCO43X6kHxAS+0kYXkMgMOFyN0BgXNQxl1aTwak/dmJ i77sx9IiWgUaUvcSUaq+YXyUykyEEB1LYRaOJNiOShepLat+/kxuKEIADtq4xdqBhXWMzR JJHnUTwNU1DZrTYJc83pS0PdUedaMMqGsvgnmLJmO2nC19ALIAocVzuZI/SaFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741843674; a=rsa-sha256; cv=none; b=vA3tUINb94uLyAk+CXGLpubIp9E1vaX+nceI5SA8Lc+NTKc8aYnWXdX8imTyS6i12ELDp2 Szfa7jzv5pLSoV7XY8dPkkP8f9ZW5CrpFWarhA9yysnNH12KDSj7xF/m5MSfpHgWr7n0Wr CZhrRyMuz5lkCk6wKZO9/ZO+z5cuwcNsad9Z3s/RUxJE7c6+FDw/xC2gZFDOqlkA+/w/NI J+0qGetrT2Qj1cxqb9Mb72GWTO4wPaitjb1rYCXqNthAquRnanidF2EPpI3qHSAbQOCv3g hS7uz3imRKKpygBI3AaJ7E05EAZbE9T1rSXf9q0L4MIFGj2yrp9K7HYaudt0UA== 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=1741843674; 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=0A/D/VNDs9Fn8QBdpweRzLJYJ7nDeKwQOla3WqyeffM=; b=Kc32JW93GulW+SsAcJtTOXvSNl9e+gZM4ernkGrHlCRgKNQyrU24lQBqsOo4nyVn+hIhhJ k0l5VRC1y8xmdsR1jWxmV+oIFmxC7pDmUa8izAB1yWmuzxa0S/55UOt6X49zaobowntzmt /xo9LoO3s/aUgvcUYnS68fEXyIPAkYF9tFvDajrF2d3IE3Ujskh+TGkD0VDergKViti+yK UblLFoIrX9/vrDhBDS0vC70INHaezUtT5e3J8TlEl7hTRWBtgA795aaW0N8o54HLoe1+G9 fZkqgdLRmr3hxWN2ShmxpKxgMKMUTMvKplpJWzZtGDxp+78/fvzmaE2dLNqh0Q== 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 4ZCwxk2m6JzkQ5; Thu, 13 Mar 2025 05:27:54 +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 52D5RsnV048192; Thu, 13 Mar 2025 05:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52D5RsfM048189; Thu, 13 Mar 2025 05:27:54 GMT (envelope-from git) Date: Thu, 13 Mar 2025 05:27:54 GMT Message-Id: <202503130527.52D5RsfM048189@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 275243143128 - main - textproc/fcitx5-configtool: Add qt6 flavor 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 275243143128401c3cc9c6d382a3eeba7031d2ec Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=275243143128401c3cc9c6d382a3eeba7031d2ec commit 275243143128401c3cc9c6d382a3eeba7031d2ec Author: Eric Camachat AuthorDate: 2025-03-13 05:22:37 +0000 Commit: Li-Wen Hsu CommitDate: 2025-03-13 05:22:37 +0000 textproc/fcitx5-configtool: Add qt6 flavor PR: 283406 Approved by: khng (implicitly) Sponsored by: The FreeBSD Foundation --- textproc/fcitx5-configtool/Makefile | 34 ++++++++++++++++++++++++------ textproc/fcitx5-configtool/pkg-plist | 40 ++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/textproc/fcitx5-configtool/Makefile b/textproc/fcitx5-configtool/Makefile index 701c7326efd4..a236d790a9f1 100644 --- a/textproc/fcitx5-configtool/Makefile +++ b/textproc/fcitx5-configtool/Makefile @@ -10,29 +10,51 @@ WWW= https://github.com/fcitx/fcitx5-configtool LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt -BUILD_DEPENDS= fcitx5-qt5>=5.0.2:textproc/fcitx5-qt@qt5 \ - fcitx5>=5.0.10:textproc/fcitx5 \ - iso-codes>=0:misc/iso-codes +FLAVORS?= qt6 qt5 +FLAVOR?= ${FLAVORS:[1]} + +qt5_PKGNAMESUFFIX= -qt5 +qt6_PKGNAMESUFFIX= -qt6 + LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5 \ - libFcitx5Qt5DBusAddons.so:textproc/fcitx5-qt \ + libFcitx5Qt${FLAVOR:S/qt//}DBusAddons.so:textproc/fcitx5-qt@${FLAVOR} \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= iso-codes>=0:misc/iso-codes \ xkeyboard-config>=0:x11/xkeyboard-config -USES= cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig qt:5 \ +USES= cmake compiler:c++17-lang gettext-tools gl \ + kde:${FLAVOR:S/qt//} pkgconfig qt:${FLAVOR:S/qt//} \ tar:zst xorg +USE_GL= opengl PLIST_SUB= VER=${PORTVERSION} +.if ${FLAVOR} == qt5 + USE_KDE= config coreaddons ecm i18n iconthemes itemviews \ kdeclarative kirigami2 package plasma-framework service \ widgetsaddons USE_QT= concurrent core dbus declarative gui widgets \ x11extras buildtools:build qmake:build +CMAKE_OFF= ENABLE_TEST USE_QT6 +PLIST_SUB+= QT5="" + +.elif ${FLAVOR} == qt6 + +LIB_DEPENDS+= libKF6Svg.so:graphics/kf6-ksvg \ + libKF6KCMUtilsQuick.so:devel/kf6-kcmutils +USE_KDE= config coreaddons ecm i18n iconthemes itemviews \ + kdeclarative kirigami2 libplasma package service \ + widgetsaddons +USE_QT= base declarative +CMAKE_OFF= ENABLE_TEST +PLIST_SUB+= QT5="@comment " + +.endif + USE_XORG= x11 xkbfile USE_LDCONFIG= yes CMAKE_ON= ENABLE_CONFIG_QT ENABLE_KCM -CMAKE_OFF= ENABLE_TEST USE_QT6 .include diff --git a/textproc/fcitx5-configtool/pkg-plist b/textproc/fcitx5-configtool/pkg-plist index 2669228b808b..b6e486b67f52 100644 --- a/textproc/fcitx5-configtool/pkg-plist +++ b/textproc/fcitx5-configtool/pkg-plist @@ -10,26 +10,26 @@ share/applications/kbd-layout-viewer5.desktop share/applications/org.fcitx.fcitx5-config-qt.desktop share/applications/org.fcitx.fcitx5-migrator.desktop share/applications/kcm_fcitx5.desktop -share/kpackage/kcms/kcm_fcitx5/contents/ui/AddIMPage.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/AddonPage.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/BoolOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/ColorOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/ConfigGroup.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/ConfigPage.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/EnumOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/ExternalOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/FontOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/IntegerOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/KeyListOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/KeyOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/ListOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/OptionLoader.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/SaveWarningDialog.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/SelectLayoutSheet.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/StringOption.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/main.qml -share/kpackage/kcms/kcm_fcitx5/contents/ui/utils.js -share/kpackage/kcms/kcm_fcitx5/metadata.json +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/AddIMPage.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/AddonPage.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/BoolOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/ColorOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/ConfigGroup.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/ConfigPage.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/EnumOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/ExternalOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/FontOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/IntegerOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/KeyListOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/KeyOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/ListOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/OptionLoader.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/SaveWarningDialog.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/SelectLayoutSheet.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/StringOption.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/main.qml +%%QT5%%share/kpackage/kcms/kcm_fcitx5/contents/ui/utils.js +%%QT5%%share/kpackage/kcms/kcm_fcitx5/metadata.json share/locale/ca/LC_MESSAGES/fcitx5-configtool.mo share/locale/ca/LC_MESSAGES/kcm_fcitx5.mo share/locale/da/LC_MESSAGES/fcitx5-configtool.mo