From nobody Mon Oct 10 09:39:01 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 4MmDPy0DKmz4f0pH; Mon, 10 Oct 2022 09:39:02 +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 4MmDPx6qZZz3gYX; Mon, 10 Oct 2022 09:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665394742; 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=ZxErdmn+ao0K7DlAElpomwqchE21j42eWcCSch+9K8w=; b=Rsyo4KPTADiUC3G1plhoAOK8upmdiAiY9V88nhRD1Hvdr6mnTbmasZ5fRtE7C6SWnsoMn1 SN5T9SfmdJ7FtybkkhkV+jPPwe21NNWtuJiT1YU520nrKQImxttCFHQBMFkjwUTCPd2ODR Bsy4vS5Oa9yW469O8wyiWGJil0jCzJIOSXTX845G/jo194LF0JFlsOraiXYk5Q0n9FlylH 8nwZnCBouvfDIkCA8rNHE0zW2AzVbrZ0e8UFu4jF+TTH3oTWMJRpACVZrs1HyZcTzqbQIi h0z4ZUnywGF72CTJQt/30ZFMlJ6sRBV0iX7Npp8fJqU3zpKzoKEWHxouXjdzrw== 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 4MmDPx5MtTzb3Y; Mon, 10 Oct 2022 09:39:01 +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 29A9d1ch091348; Mon, 10 Oct 2022 09:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29A9d1G9091346; Mon, 10 Oct 2022 09:39:01 GMT (envelope-from git) Date: Mon, 10 Oct 2022 09:39:01 GMT Message-Id: <202210100939.29A9d1G9091346@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ka Ho Ng Subject: git: f5d6cd42fc05 - main - textproc/fcitx5-qt*: Add Qt6 support 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: khng X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5d6cd42fc05d26dea853e58c19b4ab0cae05cbc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665394742; 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=ZxErdmn+ao0K7DlAElpomwqchE21j42eWcCSch+9K8w=; b=G16CN1Pg0fn25u066VSnHCgjQYj5mVwZWl6VZDseBg73rJpuKkZFSVi8gDuY7JVVHJGpLA Tgvwa1olsUtY3XtdJaY1mll15sIJgFG+ytOCkZe8oIfgYY6gJptYPM8anRw4Di6nurj8FK kcLD23NASbbu1enFobStKPz5Rs6TU3Ph6PI2WR/h9UrPJoPubjST9CKvOkphQV4NUz7PB9 mmmashXi7zd7rO5NM9pm8G+Wt6SyMq5si470SgMd2cuAN7P06eYglTe8u7jLGq0AYXBoir sONiuBaaJRjJ9a6vFsUxZLbrepnNQNARSe1EdcKOWNsFZPN/X4CKfapQ11Rcbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665394742; a=rsa-sha256; cv=none; b=JaEMn7sqK+lCtjYPgJOJd727WV6paD4oi7eDLEM7k8MZsfc4H6JfoJmZJliL09LTXVA5ep 4sVcSYoz10ycyFggN72Cw4z+PbXfe5xczMhCF2BRaLEmyO5hSzzGPWken2yvcOl1IeldOq Sd4Dw39mM4grTNA+tlPmhVz2bCfdfZBvluDWw/RGHuVcqXpIgGVvpynn4phDl/goc2Ri/Z J266xEZX6+mp+9GhOYHYw6YnDCM+59RBlfZ2/XD3y2LT+qOl54XB8xoeBVR1Z4pwrFZ595 tKLnXH8Qidacn44nyEMKqtuBPGGEZgGq463xKYlBc8RSsti6yE04yFE8ihEl6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by khng (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=f5d6cd42fc05d26dea853e58c19b4ab0cae05cbc commit f5d6cd42fc05d26dea853e58c19b4ab0cae05cbc Author: Li-Wen Hsu AuthorDate: 2022-10-10 07:08:16 +0000 Commit: Ka Ho Ng CommitDate: 2022-10-10 09:36:02 +0000 textproc/fcitx5-qt*: Add Qt6 support - Split into qt5, qt6 FLAVORS - Extract common files to textproc/fcitx5-qt-common Differential Revision: https://reviews.freebsd.org/D36408 Approved by: lwhsu (ports) --- textproc/Makefile | 1 + textproc/fcitx5-qt-common/Makefile | 16 +++++++++++ textproc/fcitx5-qt/Makefile | 33 ++++++++++++++++++---- .../fcitx5-qt/files/extra-patch-CMakeLists.txt | 14 +++++++++ textproc/fcitx5-qt/pkg-plist.common | 11 ++++++++ textproc/fcitx5-qt/{pkg-plist => pkg-plist.qt5} | 11 -------- textproc/fcitx5-qt/pkg-plist.qt6 | 15 ++++++++++ 7 files changed, 84 insertions(+), 17 deletions(-) diff --git a/textproc/Makefile b/textproc/Makefile index 6a854748625a..7fd1d840f6ea 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -200,6 +200,7 @@ SUBDIR += fcitx5-gtk SUBDIR += fcitx5-lua SUBDIR += fcitx5-qt + SUBDIR += fcitx5-qt-common SUBDIR += fex SUBDIR += ffe SUBDIR += fi-aspell diff --git a/textproc/fcitx5-qt-common/Makefile b/textproc/fcitx5-qt-common/Makefile new file mode 100644 index 000000000000..48a6209023db --- /dev/null +++ b/textproc/fcitx5-qt-common/Makefile @@ -0,0 +1,16 @@ +PORTREVISION= 0 + +COMMENT= Fcitx support for Qt (common files) + +PKGNAMESUFFIX= -common + +MASTERDIR= ${.CURDIR}/../fcitx5-qt + +PLIST= ${MASTERDIR}/pkg-plist.common + +FLAVORS= # empty +FLAVOR= # empty + +CMAKE_OFF= ENABLE_QT4 ENABLE_QT5 ENABLE_QT6 + +.include "${MASTERDIR}/Makefile" diff --git a/textproc/fcitx5-qt/Makefile b/textproc/fcitx5-qt/Makefile index 5f00f8cd132a..ad0290e4d434 100644 --- a/textproc/fcitx5-qt/Makefile +++ b/textproc/fcitx5-qt/Makefile @@ -6,7 +6,7 @@ PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= f7f983e1e709.patch:-p1 MAINTAINER= khng@FreeBSD.org -COMMENT= Fcitx support for Qt5 +COMMENT= Fcitx support for Qt (${FLAVOR}) WWW= https://github.com/fcitx/fcitx5-qt LICENSE= LGPL21+ BSD3CLAUSE @@ -17,18 +17,39 @@ LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSES/BSD-3-Clause.txt LIB_DEPENDS= libFcitx5Utils.so:textproc/fcitx5 \ libxkbcommon.so:x11/libxkbcommon -USES= compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig qt:5 xorg +FLAVORS?= qt5 qt6 +FLAVOR?= ${FLAVORS:[1]} +qt5_PKGNAMESUFFIX= 5 +qt6_PKGNAMESUFFIX= 6 + +USES= compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig xorg + +CMAKE_OFF?= ENABLE_QT4 + +.if ${FLAVOR} == qt5 +USES+= qt:5 +USE_QT= concurrent core dbus gui widgets xml buildtools:build qmake:build +CMAKE_ON= ENABLE_QT5 +CMAKE_OFF+= ENABLE_QT6 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt +RUN_DEPENDS= fcitx5-qt-common>=${DISTVERSION}:textproc/fcitx5-qt-common +.elif ${FLAVOR} == qt6 +USES+= qt:6 +USE_QT= base +CMAKE_ON= ENABLE_QT6 +CMAKE_OFF+= ENABLE_QT5 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt +RUN_DEPENDS= fcitx5-qt-common>=${DISTVERSION}:textproc/fcitx5-qt-common +.endif + +PLIST?= ${PKGDIR}/pkg-plist.${FLAVOR} PLIST_SUB= VER=${PORTVERSION} USE_GITHUB= yes GH_ACCOUNT= fcitx USE_KDE= ecm -USE_QT= concurrent core dbus widgets buildtools:build qmake:build USE_XORG= x11 xcb USE_LDCONFIG= yes -CMAKE_ON= ENABLE_QT5 -CMAKE_OFF= ENABLE_QT4 ENABLE_QT6 - .include diff --git a/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt b/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt new file mode 100644 index 000000000000..7fa1abdc5bf2 --- /dev/null +++ b/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2022-08-31 10:36:00 UTC ++++ CMakeLists.txt +@@ -80,11 +80,6 @@ if(ENABLE_QT6) + add_subdirectory(qt6) + endif() + +-if(NOT BUILD_ONLY_PLUGIN) +-find_package(Gettext REQUIRED) +-add_subdirectory(po) +-endif() +- + enable_testing() + add_subdirectory(test) + diff --git a/textproc/fcitx5-qt/pkg-plist.common b/textproc/fcitx5-qt/pkg-plist.common new file mode 100644 index 000000000000..37a4e686b05b --- /dev/null +++ b/textproc/fcitx5-qt/pkg-plist.common @@ -0,0 +1,11 @@ +share/locale/ca/LC_MESSAGES/fcitx5-qt.mo +share/locale/da/LC_MESSAGES/fcitx5-qt.mo +share/locale/de/LC_MESSAGES/fcitx5-qt.mo +share/locale/es/LC_MESSAGES/fcitx5-qt.mo +share/locale/fr/LC_MESSAGES/fcitx5-qt.mo +share/locale/he/LC_MESSAGES/fcitx5-qt.mo +share/locale/ja/LC_MESSAGES/fcitx5-qt.mo +share/locale/ko/LC_MESSAGES/fcitx5-qt.mo +share/locale/ru/LC_MESSAGES/fcitx5-qt.mo +share/locale/zh_CN/LC_MESSAGES/fcitx5-qt.mo +share/locale/zh_TW/LC_MESSAGES/fcitx5-qt.mo diff --git a/textproc/fcitx5-qt/pkg-plist b/textproc/fcitx5-qt/pkg-plist.qt5 similarity index 79% rename from textproc/fcitx5-qt/pkg-plist rename to textproc/fcitx5-qt/pkg-plist.qt5 index 49b1e8121515..0da39797c8e6 100644 --- a/textproc/fcitx5-qt/pkg-plist +++ b/textproc/fcitx5-qt/pkg-plist.qt5 @@ -29,14 +29,3 @@ lib/libFcitx5Qt5WidgetsAddons.so.2 lib/libFcitx5Qt5WidgetsAddons.so.%%VER%% %%QT_PLUGINDIR%%/platforminputcontexts/libfcitx5platforminputcontextplugin.so libexec/fcitx5-qt5-gui-wrapper -share/locale/ca/LC_MESSAGES/fcitx5-qt.mo -share/locale/da/LC_MESSAGES/fcitx5-qt.mo -share/locale/de/LC_MESSAGES/fcitx5-qt.mo -share/locale/es/LC_MESSAGES/fcitx5-qt.mo -share/locale/fr/LC_MESSAGES/fcitx5-qt.mo -share/locale/he/LC_MESSAGES/fcitx5-qt.mo -share/locale/ja/LC_MESSAGES/fcitx5-qt.mo -share/locale/ko/LC_MESSAGES/fcitx5-qt.mo -share/locale/ru/LC_MESSAGES/fcitx5-qt.mo -share/locale/zh_CN/LC_MESSAGES/fcitx5-qt.mo -share/locale/zh_TW/LC_MESSAGES/fcitx5-qt.mo diff --git a/textproc/fcitx5-qt/pkg-plist.qt6 b/textproc/fcitx5-qt/pkg-plist.qt6 new file mode 100644 index 000000000000..f240faa5c1df --- /dev/null +++ b/textproc/fcitx5-qt/pkg-plist.qt6 @@ -0,0 +1,15 @@ +include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitx5qt6dbusaddons_export.h +include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtcontrollerproxy.h +include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtdbustypes.h +include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtinputcontextproxy.h +include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtinputmethodproxy.h +include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtwatcher.h +include/Fcitx5Qt6/fcitx5qt6dbusaddons_version.h +lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfig.cmake +lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfigVersion.cmake +lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsTargets.cmake +lib/libFcitx5Qt6DBusAddons.so +lib/libFcitx5Qt6DBusAddons.so.1 +lib/libFcitx5Qt6DBusAddons.so.%%VER%% +%%QT_PLUGINDIR%%/platforminputcontexts/libfcitx5platforminputcontextplugin.so