From nobody Sat Dec 02 19:35:05 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 4SjKrn4F9Fz53WBQ; Sat, 2 Dec 2023 19:35:05 +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 4SjKrn3pDtz4VcF; Sat, 2 Dec 2023 19:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701545705; 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=vD/sC5Gzt37aLkCK5yZ7Y4sgeJhk9y5uVnC7La1/BDU=; b=ZDhWKC7cRd0//EppYw+QbvlwEZ3I3LsjCtlsNhgLiK6FhNMuq4uezBooI9V49Bn3eP9lcU WqBOQlvrBWJXu5SaSO2MhXJ6qA9kKN7NPjkwEPNeWCZYxPAW0SHTWula0V8Fby8UFnWGEk IaYd6sMhDXn4O8Ctf0gHhwFnlQbP0DvnBn+Skiv5JsbI1AvY9BlS3sNTHfBqKXxpbuv9vt 25kXYwNvgb+4uhiWjIbYlDbooXMr47rbrcbpGEqeixyeo9h0akWQ4cfEfD0BLylmSU0dpi E6ztoOT9mvgsS8LZrPFPVKDqRoNtmF3kszFn/bUwrF1Jy7s2dgPsCutCy9pLlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701545705; 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=vD/sC5Gzt37aLkCK5yZ7Y4sgeJhk9y5uVnC7La1/BDU=; b=VT227OXeoY7VmjO6jRiajlMquWMBZXUS9ehSBTa8YzUwhz69ZaQWeA8w6jEFhVm+lFfsqC yOkiu9QoxJQ5IKuNowXYP66jLFaB2Q5/vKq1AAjF0s5ffX2CX2lQmiTf6ap/EZTkVYNKJO rBAyMkbAufc4D1UEYtM85w5P8i4MDJMXs/GymTFIQAAS0stBVL0L9hrNI/CW2D7KMv21I0 ZPfdMHYo3PRW2kZwv83HbuPuC1RWCdcpynkT6F7p1yJpydHR6uBiqNZjQExD0vG3ADIuZD diLW/EJvYj5POB1aFJ5sIMQJujZXHyFGsuxB23NhBG6ud4MbB1qxq67CxQ3iAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701545705; a=rsa-sha256; cv=none; b=JPpFIUAB6QFut7uQ3JQdw5nPQBEdbwo8RoJPMSOk4gS8hVg+tMXGzq/v2mvCsXArlnalAD GBsAzAsexkKDpq6acdZaQDBQfHMqh69Sx4vPA5kfFgwD+i8Sy5lzRFKnM4i9xDj0cvuzk4 gCUq1x8J7cPGUuugs6sLNxREHhk6AaA6lNB53hCRHGm7FwjEId7gwINPKjQ3lzu9iwaGHF AC34/Ay9Lk2qE6yrc+L5yKPLtXVSPuduu09nQMBi4t0xQBpdWgjMjRyFPRE4Hpx8t/yPeN Z9QSB1ZtELv3gbrxQQR05u/HxbpVHrsW3TrCzuy6Sz8/X8lWOPQyYenvf4Trkw== 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 4SjKrn2sJ7zVR8; Sat, 2 Dec 2023 19:35:05 +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 3B2JZ5kn000891; Sat, 2 Dec 2023 19:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2JZ5pd000888; Sat, 2 Dec 2023 19:35:05 GMT (envelope-from git) Date: Sat, 2 Dec 2023 19:35:05 GMT Message-Id: <202312021935.3B2JZ5pd000888@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: 6a90aa2883c6 - main - accessibility/libqaccessibilityclient: flavorize for Qt5 and Qt6 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: 6a90aa2883c681f4a9b6176ba3d3a2ca7bd850d7 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a90aa2883c681f4a9b6176ba3d3a2ca7bd850d7 commit 6a90aa2883c681f4a9b6176ba3d3a2ca7bd850d7 Author: Tobias C. Berner AuthorDate: 2023-12-02 19:26:40 +0000 Commit: Tobias C. Berner CommitDate: 2023-12-02 19:34:13 +0000 accessibility/libqaccessibilityclient: flavorize for Qt5 and Qt6 --- accessibility/kmag/Makefile | 3 ++- accessibility/libqaccessibilityclient/Makefile | 20 +++++++++++++++----- .../{pkg-plist => pkg-plist.qt5} | 0 accessibility/libqaccessibilityclient/pkg-plist.qt6 | 11 +++++++++++ x11-wm/kwinft/Makefile | 4 ++-- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile index 9a822746cae2..a6dccda0cee8 100644 --- a/accessibility/kmag/Makefile +++ b/accessibility/kmag/Makefile @@ -1,5 +1,6 @@ PORTNAME= kmag DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -9,7 +10,7 @@ WWW= https://www.kde.org/applications/utilities/kmag/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient +LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient@qt5 USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons \ diff --git a/accessibility/libqaccessibilityclient/Makefile b/accessibility/libqaccessibilityclient/Makefile index 6bbd6409fe44..2b17a4d6b8b6 100644 --- a/accessibility/libqaccessibilityclient/Makefile +++ b/accessibility/libqaccessibilityclient/Makefile @@ -1,20 +1,30 @@ PORTNAME= libqaccessibilityclient DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= accessibility kde MASTER_SITES= KDE/stable/${PORTNAME}/ +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Helper to make writing accessibility tools easier WWW= https://api.kde.org/libqaccessibilityclient/html/index.html -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual +LICENSE= LGPL21 LGPL3 +LICENSE_COMB= dual LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSES/LGPL-2.1-only.txt LICENSE_FILE_LGPL3= ${WRKSRC}/LICENSES/LGPL-3.0-only.txt -USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} \ + qt:${FLAVOR:S/qt//} tar:xz +CMAKE_ARGS= -DQT_MAJOR_VERSION=${FLAVOR:S/qt//} USE_KDE= ecm:build -USE_QT= core dbus gui widgets \ - buildtools:build qmake:build +USE_QT= ${_USE_QT_${FLAVOR}} +_USE_QT_qt5= core dbus gui widgets buildtools:build qmake:build +_USE_QT_qt6= base + +PLIST= ${.CURDIR}/pkg-plist.${FLAVOR} .include diff --git a/accessibility/libqaccessibilityclient/pkg-plist b/accessibility/libqaccessibilityclient/pkg-plist.qt5 similarity index 100% rename from accessibility/libqaccessibilityclient/pkg-plist rename to accessibility/libqaccessibilityclient/pkg-plist.qt5 diff --git a/accessibility/libqaccessibilityclient/pkg-plist.qt6 b/accessibility/libqaccessibilityclient/pkg-plist.qt6 new file mode 100644 index 000000000000..53e9b7c9a75e --- /dev/null +++ b/accessibility/libqaccessibilityclient/pkg-plist.qt6 @@ -0,0 +1,11 @@ +include/QAccessibilityClient6/qaccessibilityclient/accessibleobject.h +include/QAccessibilityClient6/qaccessibilityclient/libqaccessibilityclient-version.h +include/QAccessibilityClient6/qaccessibilityclient/qaccessibilityclient_export.h +include/QAccessibilityClient6/qaccessibilityclient/registry.h +lib/cmake/QAccessibilityClient6/QAccessibilityClient6Config.cmake +lib/cmake/QAccessibilityClient6/QAccessibilityClient6ConfigVersion.cmake +lib/cmake/QAccessibilityClient6/QAccessibilityClient6Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QAccessibilityClient6/QAccessibilityClient6Targets.cmake +lib/libqaccessibilityclient-qt6.so +lib/libqaccessibilityclient-qt6.so.0 +lib/libqaccessibilityclient-qt6.so.0.5.0 diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile index 41dbf3b41b0f..cff034f19120 100644 --- a/x11-wm/kwinft/Makefile +++ b/x11-wm/kwinft/Makefile @@ -1,7 +1,7 @@ PORTNAME= kwinft DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.27.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -55,7 +55,7 @@ DOCS_USE= KDE=doctools:build DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5DocTools QA11Y_DESC= Accessibility (focus tracking) for Zoom effect -QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient +QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient@qt5 QA11Y_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient post-patch: