From nobody Fri Jan 05 12:57:40 2024 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 4T63QY3sv4z573RD; Fri, 5 Jan 2024 12:57:41 +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 4T63QY16L0z4XPq; Fri, 5 Jan 2024 12:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704459461; 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=wPHfRzrKNsGWW2lHe6MG3uYb8IEa6RsP+Xf0UhUlHgk=; b=hYHGLHhs3i4knvFybn1I9g3ybxUZNc9tQ/28lu8k8fL8QojPkyAuqGMKNhOaToGS3FdkJY 7VzNHzEn9EnFmnUje5DQX1L+74CqtKUr3xkr28PJLMYO7Bi1ZOTV3la5A9QdQpa5sh1E3O kubqkCpWTTT0Qf9pRCUdKqWpDdqQzFd8vuATbCEFNZFE2ehT08mBaUcY+VuPERdZIeCpHv EyMKxdyFfONAPZgMJTWzfN9dn/GYyQCwt1eE3n/iszpLfNGTUpp3Imxx/I9OV2LntIiljc AKm1iDDwzG5LGUnJn46R8xzcrb5tWBJir8xf+T/4ETLpyifkAtyoJUdFcq3k4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704459461; 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=wPHfRzrKNsGWW2lHe6MG3uYb8IEa6RsP+Xf0UhUlHgk=; b=cDGLpPuel1rawthkkecN3+Ia+2HgwZLrJ29KZTi05LR8qqEeIfmvTZcjJUyQ6A6pqOAUKn IM9AnsnvWwHY79Zk7QgJeu/itKqXnxqOWcAwraRrjc14wvkSvGR01Af+bFiFw+JtUMDyt4 21D+MGVNQkfvUDjEj1/hJxF254/l4AjgL0dPLJsMkjKUVlOBySe+/y6oo2wEEkgjjv44jN Us5NEOh+sXPKdGlFdcH5QMLa68GKX9PiKDpVEWD04/MlrCXjjY8StAenw6c9vkJWPnsoUY e0BfXdHRQWgaKyEuhjmfSWItrCDO1eiNYPL+6NNM5pZ61axDUMmPfUXx+XW+pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704459461; a=rsa-sha256; cv=none; b=p7fZ20AwWsGMdDd7yGb5Mr9qco8gNCetILpdG/0mTO6dHyvhGcfCiiuR0wsx34+J+3vKVw PMg73PSxMJOZP1WgmZ74eC04jMvtJurMatKxfnl4h3/pUyc/6OJCPK052Y0g+UC5ZoBBzv VjQ4cbftvZmQFRCIiNcKR3TahdX6wNfgNzDjU+WO3iEPlAq9UgTlqBjZ8+OXAfdsoOOlm6 bGI7Po5YWiuzheyOH+IdMU0of6BRPjmKCLxTzR6UYIIfZ7Q4hupa+4Lq76nDbXNWXL4JMx fdlb3pggTLA+u/Nx80EymZLa8YY1xbYZcXzEM/Lp9JoNRR0oQn4o/+lgeYqLMg== 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 4T63QY02VKzyNc; Fri, 5 Jan 2024 12:57:41 +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 405Cvexm085385; Fri, 5 Jan 2024 12:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405Cvepv085382; Fri, 5 Jan 2024 12:57:40 GMT (envelope-from git) Date: Fri, 5 Jan 2024 12:57:40 GMT Message-Id: <202401051257.405Cvepv085382@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: 7941e944cbb0 - main - sysutils/signon-plugin-oauth2: flavorize for Qt5 and Qt6 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7941e944cbb0eead91c8cc5eedc5ec84f3cbf739 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7941e944cbb0eead91c8cc5eedc5ec84f3cbf739 commit 7941e944cbb0eead91c8cc5eedc5ec84f3cbf739 Author: Tobias C. Berner AuthorDate: 2024-01-05 12:34:40 +0000 Commit: Tobias C. Berner CommitDate: 2024-01-05 12:57:25 +0000 sysutils/signon-plugin-oauth2: flavorize for Qt5 and Qt6 - switch to fork [1] [1] https://gitlab.com/nicolasfella/signon-plugin-oauth2/-/tree/qt6 --- sysutils/signon-plugin-oauth2/Makefile | 18 ++++++++++++------ sysutils/signon-plugin-oauth2/distinfo | 6 +++--- x11/plasma6-plasma-desktop/Makefile | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile index 99f1d89537e3..9f5ed241e90e 100644 --- a/sysutils/signon-plugin-oauth2/Makefile +++ b/sysutils/signon-plugin-oauth2/Makefile @@ -1,27 +1,33 @@ PORTNAME= signon-plugin-oauth2 DISTVERSION= 0.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils kde DISTNAME= archive DIST_SUBDIR= KDE/${GL_ACCOUNT} +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Signon OAuth 1.0 and 2.0 plugin for accounts-sso WWW= https://gitlab.com/accounts-sso/signon-plugin-oauth2 -LIB_DEPENDS= libsignon-qt5.so:sysutils/signond@qt5 +FLAVORS= qt5 qt6 +FLAVOR?= qt5 -USES= compiler:c++11-lang pkgconfig python qmake qt:5 -USE_QT= core network testlib \ +LIB_DEPENDS= libsignon-qt${FLAVOR:S/qt//}.so:sysutils/signond@${FLAVOR} + +USES= compiler:c++11-lang pkgconfig python qmake qt:${FLAVOR:S/qt//} +_USE_QT_qt5= core network testlib \ buildtools:build qmake:build +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} USE_LDCONFIG= ${PREFIX}/lib/signon QMAKE_ENV= PREFIX=${PREFIX} # gitlab variables USE_GITLAB= yes -GL_ACCOUNT= accounts-sso -GL_TAGNAME= 091887d09bb635fa31f69ed16d384563cddc8009 +GL_ACCOUNT= nicolasfella +GL_TAGNAME= fab698862466994a8fdc9aa335c87b4f05430ce6 # Fix for Qt5-5.13: # oauth2plugin.cpp:133:9: error: 'addQueryItem' is deprecated [-Werror,-Wdeprecated-declarations] diff --git a/sysutils/signon-plugin-oauth2/distinfo b/sysutils/signon-plugin-oauth2/distinfo index 143ada737dc0..4128647a65cb 100644 --- a/sysutils/signon-plugin-oauth2/distinfo +++ b/sysutils/signon-plugin-oauth2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626330369 -SHA256 (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-091887d09bb635fa31f69ed16d384563cddc8009_GL0.tar.gz) = 4ac679bead32d2cbafc902b66cc84e5ada38e977ad583a1bc55c106f18c2e04c -SIZE (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-091887d09bb635fa31f69ed16d384563cddc8009_GL0.tar.gz) = 41112 +TIMESTAMP = 1704457883 +SHA256 (KDE/nicolasfella/nicolasfella-signon-plugin-oauth2-fab698862466994a8fdc9aa335c87b4f05430ce6_GL0.tar.gz) = 5a1298cc49f504503f54f20f0f5f685e43f541244a654dd3da58951f43782625 +SIZE (KDE/nicolasfella/nicolasfella-signon-plugin-oauth2-fab698862466994a8fdc9aa335c87b4f05430ce6_GL0.tar.gz) = 41352 diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile index f3d8e5f60c3d..b8561ce724c9 100644 --- a/x11/plasma6-plasma-desktop/Makefile +++ b/x11/plasma6-plasma-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME= plasma-desktop DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma COMMENT= KDE Plasma Desktop @@ -11,7 +12,7 @@ BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libicuuc.so:devel/icu \ - liboauth2plugin.so:sysutils/signon-plugin-oauth2 \ + liboauth2plugin.so:sysutils/signon-plugin-oauth2@qt6 \ libwayland-client.so:graphics/wayland \ libxcb-util.so:x11/xcb-util \ libxkbcommon.so:x11/libxkbcommon \