From nobody Fri Jul 21 18:14:39 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 4R6yPr1M7Tz4dcJt; Fri, 21 Jul 2023 18:14:40 +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 4R6yPr0wQlz3wXn; Fri, 21 Jul 2023 18:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689963280; 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=LsPIVsw+8iNG3Ib4LqmG9t1mNncFV71sKHlgKMdxNAc=; b=xuYRxFWIZb9ELaawPFsnQ6mWHIxCNOPpNSZJFpEHRoFWdd+o7zhSuzHYyMtP3/yCZz55OJ uoc5aDNWZxawMaQRJ8mB94gEleEjoeIsRogRiFAmsljLJ17a5GpqvQ8K0a1SGmT+PTIS/V 6hgSYk1OCWwh7tuykjDSznN577CQOmd7sQZsVgYfsiw5P+oZkdxLLSPmDOReT7lxlYORO7 cTDXMRXT9bq1/ng5akDVsl8Ndzqi9keZLmn+cjEG3pfNQ+legrAZQmPAJlnO6YFenxRZZ7 SkJZCyVAxB1afK8p85pfcaWROTF3psX/yUv5WdGiILeOutSrzdwDuY/d39ge0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689963280; 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=LsPIVsw+8iNG3Ib4LqmG9t1mNncFV71sKHlgKMdxNAc=; b=Lj+cH9fx9wmcgW09i+iTvNbS0b1H9Rcyayp/OwKx4i4NGOUxauHiMO7PZKz13aQCQnygwe xeKYvfrgJPMsqMsEC7oB1lvwALLjyEFRSGfa6TFgPYTkd3vcuzuMPoDXZhjeZBH5VQsuZa fQ/kjYJI/fEElp8x26qy/RDKMRaLz170qjitbWAEpFKebtHp1b1JwRnLnGyKLCRVGN1xB9 eQq7cAQvgwjMbYYmuax8hoetUov2AVrqeHtsHaOJjU4dHuXseSK2irzLOjTLNu60kOS+9N O5PS4jCaZJEWIlKdRbUMkmiyDrUvHMHxM0mzlm12coZysan0XLIoAQqvT4przw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689963280; a=rsa-sha256; cv=none; b=vKCM10/kDXmVMJzeUsQwFdqYF5EZQ4coeNO7vgX9YnDwdvfMBe934fRJ7MnPP2s85ItT/s abpJKJvsPlnOThExO9QdKiwoSHZaIVQ8DuK+OpsK2E6byXS3DdUZCb5i4aZQvDsEBMTflp x70CuneTGxeXnsckaW/jvJc4I8VlySkFrAmlbRGVJNKe75pgcKC67p7U7JVGfKS27pIhnV L2LncHKH/iwFfCjd5FcG8OWNcChLy62VMtOLlUYvSR2+rv3/uux9YDYZYY1FH8GQrOOowZ ClOp2g3KcSTdI+ot/ujZASJOdwAxa39zJ2yTMqtu3NoU28ad7Uzi8bwiADi0rw== 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 4R6yPr01HhzN2S; Fri, 21 Jul 2023 18:14:40 +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 36LIEduk074766; Fri, 21 Jul 2023 18:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LIEdTM074765; Fri, 21 Jul 2023 18:14:39 GMT (envelope-from git) Date: Fri, 21 Jul 2023 18:14:39 GMT Message-Id: <202307211814.36LIEdTM074765@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 8cd4394245db - main - deskutils/copyq: Fix wayland detection and remove qt5 runtime deps from qt6 flavor 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cd4394245dbc74a6bab678798c5d6e2ec053921 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cd4394245dbc74a6bab678798c5d6e2ec053921 commit 8cd4394245dbc74a6bab678798c5d6e2ec053921 Author: Jason E. Hale AuthorDate: 2023-07-21 18:02:17 +0000 Commit: Nuno Teixeira CommitDate: 2023-07-21 18:02:17 +0000 deskutils/copyq: Fix wayland detection and remove qt5 runtime deps from qt6 flavor PR: 272635 --- deskutils/copyq/Makefile | 18 ++++++++++-------- deskutils/copyq/distinfo | 4 +++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile index 4a8d24d6d5eb..525add058c7a 100644 --- a/deskutils/copyq/Makefile +++ b/deskutils/copyq/Makefile @@ -1,12 +1,13 @@ PORTNAME= copyq DISTVERSIONPREFIX= v DISTVERSION= 7.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils PKGNAMESUFFIX= -${FLAVOR} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch:-p1 # Fix build with Qt 6.5.x +PATCHFILES+= 8ae296bed45a7679712aff0cb2e2d0508330ad37.patch:-p1 # Fix cmake warnings MAINTAINER= eduardo@FreeBSD.org COMMENT= Qt${FLAVOR:S/qt//} based clipboard manager @@ -18,26 +19,27 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - +FLAVORS= qt5 qt6 +FLAVOR?= qt5 qt5_CONFLICTS_INSTALL= copyq-qt6 qt6_CONFLICTS_INSTALL= copyq-qt5 -USES= cmake compiler:c++17-lang gl kde:5 qt:${FLAVOR:S/qt//} xorg +USES= cmake compiler:c++17-lang gl kde:5 pkgconfig \ + qt:${FLAVOR:S/qt//} xorg USE_GITHUB= yes GH_ACCOUNT= hluk GH_PROJECT= CopyQ USE_GL= gl -USE_KDE= notifications # needed WITH_QT6, Extra CMake Modules (ECM) +_USE_KDE_qt5= ecm:build notifications +_USE_KDE_qt6= ecm:build +USE_KDE= ${_USE_KDE_${FLAVOR}} _USE_QT5= core dbus declarative gui network svg wayland widgets x11extras \ xml buildtools:build qmake:build _USE_QT6= base declarative svg wayland translations:build USE_QT= ${_USE_QT${FLAVOR:S/qt//}} USE_XORG= ice sm x11 xext xfixes xtst -_QT6_CMAKE_ARGS= -DQtWaylandScanner_EXECUTABLE=${PREFIX}/libexec/qt6/qtwaylandscanner \ - -DWITH_QT6:BOOL=TRUE +_QT6_CMAKE_ARGS= -DWITH_QT6:BOOL=TRUE CMAKE_ARGS= ${_QT${FLAVOR:S/qt//}_CMAKE_ARGS} PORTSCOUT= limit:^d\.d\. diff --git a/deskutils/copyq/distinfo b/deskutils/copyq/distinfo index 7c7a3eb50671..aec8b2f8dd90 100644 --- a/deskutils/copyq/distinfo +++ b/deskutils/copyq/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1689891691 +TIMESTAMP = 1689919063 SHA256 (hluk-CopyQ-v7.0.0_GH0.tar.gz) = 5898ba2025f8e9f61a4b4732e85adf3b1653fad20b5c1f1b0c879a7b72cd4d48 SIZE (hluk-CopyQ-v7.0.0_GH0.tar.gz) = 3323354 SHA256 (79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch) = 1e35ffd348245b2ca74671e17e38ea77888c589730da69974f6440923226872e SIZE (79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch) = 1734 +SHA256 (8ae296bed45a7679712aff0cb2e2d0508330ad37.patch) = 3b59ead404fed04a6296c5e7de3f8208837d8da805ec217f428076ebf9df0f2c +SIZE (8ae296bed45a7679712aff0cb2e2d0508330ad37.patch) = 4577