From nobody Wed Jan 29 09:49:10 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 4Yjcn24zgKz5mSr0; Wed, 29 Jan 2025 09:49:10 +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 4Yjcn2432Tz3v9N; Wed, 29 Jan 2025 09:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144150; 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=ts8pngTQBFxSBgGDJd7eACGspOewqF274M2UtKooMMc=; b=eKRQa9zUZiY8M7GeO/b1Hl7rL67V8T6nZkLHSsT4UYwSP6ruIGOtgPabteD/1L/4lNIj6J +dd4Kxcim3McYfkgnlgGxPIQGhGUKhGWlWMSki6uDsCCRC17YhzEFvDiXJ3Cc13CrCKopD rMPQUioo/IjpnJI1g5XFcS1xWGuLoj1knxq9bpPiZdV98OjgFL7Yk0w4EN4z9msn5Ja7uy iTvhGujUcnGVPQYIaIFVG+PVp92dVbj0Hw1r4to4+R+8fT1jqPxSlv+c/NPS6sh4zZYaFy g9uHgVl6lvTQR/nDQT0RQLIpVl9r3T/AEOLzlmYRKV8fZdeWi4QWIdVswNjVvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144150; 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=ts8pngTQBFxSBgGDJd7eACGspOewqF274M2UtKooMMc=; b=ySSDRqY1gtrfA6YCxG6NWXU+u/m4gKWZ6uF2ZXcr8v9jZaDJmBx3lhlXP/xtsXfcQ1sXcr eq0sH9QVkvktxYKqC6TsPKMaPOlQ/JvAboB4CrstvAznXPmS+lS4qPrO+ojjl3U5PJJ1i3 e8MkK8b+6zKApgAQxcSfpW7ux8syCuDtBs6btnvCmd8c2p7lwOeE58P0UQHksY8JusrHNe 0NFzbo6UiU1dtxGsiy43AFfnGfdIFRAqFY0uWRamPSDJutrUq3TjbDoiERw56C9Yg4eqR9 GksIZVFKad8i/ZNviDIU2GuwTyV6/sr/rVZVFYcZrscoy/JPR4iQJDTGN3Iaag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738144150; a=rsa-sha256; cv=none; b=yqowntU5HuUUstngebjxbBdRPI9UrVE5uxOhhhbRENpbnXP3qVyIf9YZceVmqlxFlHPr7I 6U7PFL1JPMS3/cMNNG2DeCtWzzl/CBEkGRIL9yWRxYoYcgcCJcNRrlXEBgmj6EW+9ufocs utuIOQPheCdqMSgokxTFYj73jBeIa7ahfWIARElUtVXO4tYTkodCg/BtwFycA7QIAXA7BL 7vsJjP8eSeKUtbKxDpFfLruqH6Nrxd+vu+eAvum/oR2ymHNulEAQ6getGVCo/KI8hD8AtY O0tdJ5hzE6O5iuQfBS8+4SEq2RJY1WfTLiblGQO3z9i2P2FAwUfgucBZk9L/nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yjcn23Q25zwRY; Wed, 29 Jan 2025 09:49:10 +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 50T9nAgn034673; Wed, 29 Jan 2025 09:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T9nAdF034670; Wed, 29 Jan 2025 09:49:10 GMT (envelope-from git) Date: Wed, 29 Jan 2025 09:49:10 GMT Message-Id: <202501290949.50T9nAdF034670@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: f22616944873 - main - x11/plasma6-plasma-integration: introduce Qt6 and Qt5 flavors 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: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f226169448737b65ab4edc0b62cfeabf2b3070f8 Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=f226169448737b65ab4edc0b62cfeabf2b3070f8 commit f226169448737b65ab4edc0b62cfeabf2b3070f8 Author: Max Brazhnikov AuthorDate: 2025-01-29 09:47:14 +0000 Commit: Max Brazhnikov CommitDate: 2025-01-29 09:47:14 +0000 x11/plasma6-plasma-integration: introduce Qt6 and Qt5 flavors --- x11/plasma6-plasma-integration/Makefile | 46 ++++++++++++++++++---- x11/plasma6-plasma-integration/pkg-plist.qt5 | 1 + .../{pkg-plist => pkg-plist.qt6} | 0 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/x11/plasma6-plasma-integration/Makefile b/x11/plasma6-plasma-integration/Makefile index 5a895d1cdcaf..b3d8716911be 100644 --- a/x11/plasma6-plasma-integration/Makefile +++ b/x11/plasma6-plasma-integration/Makefile @@ -1,27 +1,57 @@ PORTNAME= plasma-integration DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma +PKGNAMESUFFIX= -${FLAVOR} -COMMENT= Qt Platform Theme integration plugins for the Plasma workspaces +COMMENT= Plasma 6 theme integration plugins for Qt${FLAVOR:S/qt//} MAINTAINER= kde@FreeBSD.org +FLAVORS= qt6 qt5 +FLAVOR?= qt6 + LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hack-font>0:x11-fonts/hack-font \ noto-basic>0:x11-fonts/noto-basic \ noto-emoji>0:x11-fonts/noto-emoji -USES= cmake gettext gl kde:6 qt:6 tar:xz xorg -USE_KDE= bookmarks breeze colorscheme completion config configwidgets \ +USES= cmake gettext gl tar:xz xorg +USES+= ${${FLAVOR}_USES} +USE_KDE= ${${FLAVOR}_USE_KDE} +USE_GL= gl opengl +USE_XORG= x11 xcb xcursor +USE_QT= ${${FLAVOR}_USE_QT} + +CMAKE_ON= ${${FLAVOR}_CMAKE_ON} +CMAKE_OFF= ${${FLAVOR}_CMAKE_OFF} + +PLIST= ${.CURDIR}/pkg-plist.${FLAVOR} + +# Sync Qt5 flavor with Qt6 +KDE_PLASMA_VERSION= ${KDE_PLASMA6_VERSION} +PKGNAMEPREFIX?= plasma6- +DESCR= ${.CURDIR:H:H}/x11/plasma6-plasma/pkg-descr + +# Qt6 flavor +qt6_USES= kde:6 qt:6 +qt6_USE_KDE= bookmarks breeze colorscheme completion config configwidgets \ coreaddons guiaddons i18n iconthemes itemviews jobwidgets kio \ notifications service solid statusnotifieritem widgetsaddons \ windowsystem xdg-desktop-portal-kde xmlgui \ ecm:build plasma-wayland-protocols:build -USE_GL= gl opengl -USE_XORG= x11 xcb xcursor -USE_QT= base declarative wayland +qt6_USE_QT= base declarative wayland +qt6_CMAKE_ON= BUILD_QT6 +qt6_CMAKE_OFF= BUILD_QT5 -CMAKE_ON= BUILD_QT6 -CMAKE_OFF= BUILD_QT5 +# Qt5 flavor +qt5_USES= kde:5 pkgconfig qt:5 +qt5_USE_KDE= config configwidgets guiaddons i18n iconthemes kio \ + notifications wayland windowsystem xmlgui \ + ecm:build plasma-wayland-protocols:build +qt5_USE_QT= core gui quickcontrols2 wayland x11extras \ + buildtools:build qmake:build +qt5_CMAKE_ON= BUILD_QT5 +qt5_CMAKE_OFF= BUILD_QT6 .include diff --git a/x11/plasma6-plasma-integration/pkg-plist.qt5 b/x11/plasma6-plasma-integration/pkg-plist.qt5 new file mode 100644 index 000000000000..79acad8c5e4c --- /dev/null +++ b/x11/plasma6-plasma-integration/pkg-plist.qt5 @@ -0,0 +1 @@ +%%QT_PLUGINDIR%%/platformthemes/KDEPlasmaPlatformTheme5.so diff --git a/x11/plasma6-plasma-integration/pkg-plist b/x11/plasma6-plasma-integration/pkg-plist.qt6 similarity index 100% rename from x11/plasma6-plasma-integration/pkg-plist rename to x11/plasma6-plasma-integration/pkg-plist.qt6