From nobody Fri Jan 5 13:10:44 2024 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 4T63jd1rfXz574Sm; Fri, 5 Jan 2024 13:10:45 +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 4T63jd1JmCz4YH2; Fri, 5 Jan 2024 13:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704460245; 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=81Fww0XlQjcuUxbY6MdSaG64Eh8B8UWLHw7i5zCr2js=; b=MdNHtHzUdNNh/UFlvnBkrL7tLaCpqcXk1Moff3H38/gGAQXnQsl518T5PO5XGD9whdjk46 tbyQi13p/vvKh6D3lmMw+4fr5P9hwiveO2tyd9Dr8FQEkNYomPR4cKNLGcCbAFB3VcE/mp zpiw+BgbKA0QxOu3C+zUfmqvbg6IGbzWs+VBRhNXB1AuvNp3dNuB0W806cj5og5em9d6lC SVlG62SbqgB4qQcXVl5vwUPX7IqbHJMXUD5/69cIKnUghJPKfVkSY16WwVGmTJRMMcx32G ZwK/yXDJBrp3+0pJyqA8PugcNZSYE2Da7o49dSR1VbFckwQLmHpwR0wj9f+VdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704460245; 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=81Fww0XlQjcuUxbY6MdSaG64Eh8B8UWLHw7i5zCr2js=; b=Nfzc1WzqZcXPxZunQZSvWshCKUbmQcx4heAsmEOtiiOJeK0uB8p/+kDRSNSIb9R4yQ0OnG IODysDE8rUaEnLSR1b+n7h6/D8bbhyNypYGoxjACGxNjvazHzBTrCdbTmqCG7EeM+pZfsQ weweYRKl7mmzCcX1eQzVTOtSnL6g+J7UpyLJhDvosebwPUzOmvdp3ZtkZTQKmNpO6Hp/jJ ic1+/nLtqBwytM+2Ey7Or1RzfFuCXTppWKiEu2N/h6bY/l1/EhsZRX0kcKs7Ks3qjOo6uM 1eJUsSuWFof6Upy4MPaqBSIkldFP8u8S5RjUKQUbBiSbHmbrOuI2bo4TqkpMbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704460245; a=rsa-sha256; cv=none; b=qkhUU1IThpNYVWhK8tYolIb9q8k/IUINRerm/VxZFmm9e1b3IvNMsjhf0+zpn6wN4NRtRG kl1VWyJ4Ozul2JUAsJd+3BGK/Tdg7CqF8X86kTKPN1kFx/B4H29oVFy71HN7c/87C2B9lw XKTaR7SaEZQatNxvDf0seKNeYEgpchBhtDjN372KmKdhi0xeT6DLLDYUCKF0FEATFXC8ty MXi/Z0+Wk4zVu237N2mRbKhZKsmTN16bcngBl0V+ucwSCaph8HDLDdrOljx5x3Nr/LJXB3 x3KHzUkpuvkrPAxGK/CQ34dKEc6np5amZl7D4efVDKdPmjvcHibMifLdMqW//Q== 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 4T63jd0MHwzy2J; Fri, 5 Jan 2024 13:10:45 +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 405DAiFC013892; Fri, 5 Jan 2024 13:10:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405DAiv4013889; Fri, 5 Jan 2024 13:10:44 GMT (envelope-from git) Date: Fri, 5 Jan 2024 13:10:44 GMT Message-Id: <202401051310.405DAiv4013889@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: 6d08faea5121 - main - sysutils/signon-ui: 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: 6d08faea51214414969d21706dead305e9eab673 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d08faea51214414969d21706dead305e9eab673 commit 6d08faea51214414969d21706dead305e9eab673 Author: Tobias C. Berner AuthorDate: 2024-01-05 13:09:08 +0000 Commit: Tobias C. Berner CommitDate: 2024-01-05 13:09:08 +0000 sysutils/signon-ui: flavorize for Qt5 and Qt6 --- net-im/kaccounts-integration/Makefile | 4 ++-- sysutils/signon-ui/Makefile | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index 3a1a65869cae..f3b99dec617a 100644 --- a/net-im/kaccounts-integration/Makefile +++ b/net-im/kaccounts-integration/Makefile @@ -1,6 +1,6 @@ PORTNAME= kaccounts-integration DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,7 +10,7 @@ WWW= https://projects.kde.org/projects/kdereview/kaccounts-integration LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \ libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libsignon-qt5.so:sysutils/signond@qt5 -RUN_DEPENDS= signon-ui:sysutils/signon-ui +RUN_DEPENDS= signon-ui:sysutils/signon-ui@qt5 USES= cmake compiler:c++11-lang gettext-tools pkgconfig kde:5 \ qt:5 tar:xz diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile index 77140d2dc5a1..8f697ddbc76f 100644 --- a/sysutils/signon-ui/Makefile +++ b/sysutils/signon-ui/Makefile @@ -3,9 +3,10 @@ PORTNAME= signon-ui # > git rev-list 0.17+15.10.20150810-0ubuntu1.. --count DISTVERSION= 0.17-355 DISTVERSIONSUFFIX= -g4368bb7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT} +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Component for handling accounts-sso user interactions @@ -14,13 +15,16 @@ WWW= https://gitlab.com/accounts-sso/signon-ui LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +LIB_DEPENDS= libaccounts-${FLAVOR}.so:net-im/libaccounts-qt@${FLAVOR} \ libnotify.so:devel/libnotify \ - libsignon-qt5.so:sysutils/signond@qt5 \ + libsignon-${FLAVOR}.so:sysutils/signond@${FLAVOR} \ libproxy.so:net/libproxy USES= compiler:c++11-lang gettext-runtime gl gnome pkgconfig python \ - qmake qt:5 tar:bz2 + qmake qt:${FLAVOR:S/qt//} tar:bz2 USE_GL= gl USE_GNOME= gdkpixbuf2 glib20 USE_QT= core dbus declarative gui location network webchannel webengine widgets xml \