From nobody Thu Dec 07 20:12:10 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 4SmQRG2XGGz53XWb; Thu, 7 Dec 2023 20:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SmQRG1l03z4q3b; Thu, 7 Dec 2023 20:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701979930; 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=Qhdz5qIVMrmtZTu/Ed+1Z7tWTrad9zp+SXckZ0JVpGE=; b=YFVLtjYaMS6k/uNb8JU1JIptgsLtdlx/RvQr1pgUBeqEqID80TXGGerdPUantuhsC5+Tch ez0kiw8QtiWNzSA1LDfWNAP7bcL6HAquwhHMa8M3B8IeurrQaQo3JNjKaZNts+3EoNXZP/ TdRYTff2yWahvdvD4vOQ3J8b93scWpne3hjct8LLdJsD7BrwiPDeahw6V+ie8pKBulWR+A zot08wU2sqNUaP5IlZJ0+F0OsLSzMxKpQccTcRr78Xz0Z2tmmfgcjznqis1WIzPtxoDhSo m4TfQIlaewRlcaoG64xCX6ndhCreoLNHmSJ5pe0A8yywf5GGE7BwsdaEYjBqCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701979930; a=rsa-sha256; cv=none; b=BVgt+u98H1yIPrnicG4zZsa+GYDbdO6vlhnZQ83GPC7Z/hiZak5Hg4dgA5ONW9zeRwCfSp ML74foQlsFUgOKih4B212MSSpQkHFESVBz3qMIcDrWpW6OGfYjP1/bma9MP5tnKzblvzOj PELLbaXW6F8UvWVD2Nz6Kr8hkLRO5X4EJ+gfNDXQgSauRzBnHhH6OHo/Oho1zfSNgstlb5 HSH0ozG6959V1tpePpVtyVdhzna8k9kE6zjfMz6CAwED/Mg55oR+rLv2ihp+P0559BKkp5 yI6u6LvgODQKHT9tThP9wvFHDcuTQccGFj6VAxeRzcvkae1mAe/pgl005Za5fg== 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=1701979930; 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=Qhdz5qIVMrmtZTu/Ed+1Z7tWTrad9zp+SXckZ0JVpGE=; b=aNZAvB6X92frbzopBlBXXSYy6T0he0yiGCjMHrlZGSNPBw+ZIb1pl56+I/sJorOQpauLFl j26N1UxhmyOpP9eYHJCsglpS6l3kxPHxExsNqi+PJSxGu316TE/VHxwG7eK8NKnZPaAAgF fRFzrhQw7YkhrhXdJr72Ji+bB841tmijK/YWJ2JQr/cgOCv3N1pyAbzZkrDh5za/3jGz9Q fQod3uyx3SpW5RnWt6UrInZE/y9K1cWbnszJkUlzu9glOHMXwsfvQyZsJRtdoz6lXakZZg FikgL87IBfQdB1nQo7IqFWGyaXodJvyhXFp8D+QbbO8HL3kju6ZpM2HARNWi8Q== 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 4SmQRG0qZrzrcd; Thu, 7 Dec 2023 20:12:10 +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 3B7KCAGF022940; Thu, 7 Dec 2023 20:12:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KCAu0022937; Thu, 7 Dec 2023 20:12:10 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:12:10 GMT Message-Id: <202312072012.3B7KCAu0022937@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: ec79cba63263 - main - x11-toolkits/kf6-kguiaddons: allow for co-intability with x11-toolkits/kf5-kguiaddons 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: ec79cba63263e9de8f188f19d9e71615aaf1cec6 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec79cba63263e9de8f188f19d9e71615aaf1cec6 commit ec79cba63263e9de8f188f19d9e71615aaf1cec6 Author: Tobias C. Berner AuthorDate: 2023-12-07 18:42:38 +0000 Commit: Tobias C. Berner CommitDate: 2023-12-07 20:11:33 +0000 x11-toolkits/kf6-kguiaddons: allow for co-intability with x11-toolkits/kf5-kguiaddons Only build the geo-handler binaries for the kf5 version, and run-depend on it instead. If no kf5 is required, then the default-on option KF5COMPAT can be toggled off. --- x11-toolkits/kf6-kguiaddons/Makefile | 11 +++++++++-- x11-toolkits/kf6-kguiaddons/pkg-plist | 10 +++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/x11-toolkits/kf6-kguiaddons/Makefile b/x11-toolkits/kf6-kguiaddons/Makefile index 943c67c9b5fb..ffd1dc882304 100644 --- a/x11-toolkits/kf6-kguiaddons/Makefile +++ b/x11-toolkits/kf6-kguiaddons/Makefile @@ -1,5 +1,6 @@ PORTNAME= kguiaddons DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits kde kde-frameworks COMMENT= Utilities for graphical user interfaces @@ -10,9 +11,15 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland \ USES= cmake desktop-file-utils gl kde:6 pkgconfig qt:6 tar:xz xorg USE_GL= gl opengl -USE_KDE= ecm:build \ - plasma-wayland-protocols:build +USE_KDE= ecm:build plasma-wayland-protocols:build USE_QT= base wayland USE_XORG= x11 xcb +OPTIONS_DEFINE= KF5COMPAT +KF5COMPAT_DESC= Allow for co-instability with KF5 +KF5COMPAT_CMAKE_BOOL_OFF= BUILD_GEO_SCHEME_HANDLER +KF5COMPAT_RUN_DEPENDS= kde-geo-uri-handler:x11-toolkits/kf5-kguiaddons +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +OPTIONS_SUB= YES + .include diff --git a/x11-toolkits/kf6-kguiaddons/pkg-plist b/x11-toolkits/kf6-kguiaddons/pkg-plist index de853a8f5070..9ada2b8e2cc5 100644 --- a/x11-toolkits/kf6-kguiaddons/pkg-plist +++ b/x11-toolkits/kf6-kguiaddons/pkg-plist @@ -1,4 +1,4 @@ -bin/kde-geo-uri-handler +%%NO_KF5COMPAT%%bin/kde-geo-uri-handler include/KF6/KGuiAddons/KColorCollection include/KF6/KGuiAddons/KColorMimeData include/KF6/KGuiAddons/KColorSchemeWatcher @@ -40,8 +40,8 @@ lib/cmake/KF6GuiAddons/KF6GuiAddonsTargets.cmake lib/libKF6GuiAddons.so lib/libKF6GuiAddons.so.%%KDE_FRAMEWORKS_VERSION%% lib/libKF6GuiAddons.so.6 -share/applications/google-maps-geo-handler.desktop -share/applications/openstreetmap-geo-handler.desktop -share/applications/qwant-maps-geo-handler.desktop -share/applications/wheelmap-geo-handler.desktop +%%NO_KF5COMPAT%%share/applications/google-maps-geo-handler.desktop +%%NO_KF5COMPAT%%share/applications/openstreetmap-geo-handler.desktop +%%NO_KF5COMPAT%%share/applications/qwant-maps-geo-handler.desktop +%%NO_KF5COMPAT%%share/applications/wheelmap-geo-handler.desktop share/qlogging-categories6/kguiaddons.categories