From nobody Sun Apr 02 13:10:39 2023 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 4PqDsq55xVz43bh9; Sun, 2 Apr 2023 13:10:39 +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 4PqDsq4Gn2z3NDv; Sun, 2 Apr 2023 13:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680441039; 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=6m1/CXld/6ll8qLKRLo3+WSkfHJ2OGFhKZdDylwElWE=; b=IFsTndtAF+djZ8KPNTMk3U7mkAEPrwd/7QY8h+ejSe1B0AMTtUSJsZz2DeFIgX8kzDzA69 c7uBd8yWw/cQoiDzFOaj1MOhlEeNQdYauUw/XHXdbHHphqHSJDBnBXxV1PBE2CZppOQJEo WSMsgSxl6CZn5OE0T0NjEbtzTdEQ4FlNsWrvRfoh3uZYrO6OAxoq9rb68gFnkMXcs+NDFE kfgoUDEo7BsGs3ftJ2iF7WGzU0xYzJBzFMlV6QHgQ8qpRKalyuLP8ay8IxCXoJqSnE6LHU pGbD+U4C3cGV2Dt6Y1h2rboNY0GeEz1PMfPDR3uo5jkYdyU9o7UcC3ul/Iw1Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680441039; 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=6m1/CXld/6ll8qLKRLo3+WSkfHJ2OGFhKZdDylwElWE=; b=q9gHnxJNHzNHTEdvuW5bBrBMlr3MPuiBcbIIXMxloSYuHh45WrawAGEZfaiOn3LByoWYux DfZjAHCkgUB3OvoLbOkolQCPh+nFA300yEijuxeqZLsjaC7BlvCx/Wsh/ygp8ocUaZ1jYz qdkBPMtiNRbat0tRUsUzophOARrJ9WBNbBXNs/luhRqSBAi1nYnnEs5TTabbgK+Rn7JLRi tPYGVXA3Joh2fQyOclEnLycKFN58UJrKGqbTiGrlTAn36K4TqP2o5F9ctMsKZxnpk43VSj wT15wSlI95+YeVMO44WEDxEKnDVyVRIWGOBn9JRWs3nLxNSW9Iw4b4DI3Z2xzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680441039; a=rsa-sha256; cv=none; b=fFyCfq36hJXl9T1zIrxqo25xgusA9iRdMOVF3fYrIq7mSIvIWehRbK3rBY2v7pm0eIONRX lANC4OULv5QooHp1S9yev6/MHnq3A2k7b5AyJ+mrTIvNJp8zvXhXMhOJOWL+ozmNuWRw8/ 3B73g5rAb2Wv3L5vTTiO1MThFNw4yoyg2asWDP2Dh2AOP+GrGWnB30Yjb9dw+5S+VqHSLd c1d0dJwIABgabb63IRTznBdApMn0jT4A5pIpZwtmCOArjxaxgWudKy59fX2D9/uKTt9nn2 H0xNf6SukGepGEc5EgShbML67ayzkAqODxDZgrzcclBr64bCGpx05KFgQp/EhQ== 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 4PqDsq3KbKzJ7v; Sun, 2 Apr 2023 13:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 332DAdnb046218; Sun, 2 Apr 2023 13:10:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332DAdns046217; Sun, 2 Apr 2023 13:10:39 GMT (envelope-from git) Date: Sun, 2 Apr 2023 13:10:39 GMT Message-Id: <202304021310.332DAdns046217@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 12c193069e33 - main - devel/qt6-base: make CUPS support optional (but on by default). 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12c193069e336351eb9e0a37e0d845bc381baa91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=12c193069e336351eb9e0a37e0d845bc381baa91 commit 12c193069e336351eb9e0a37e0d845bc381baa91 Author: Alexey Dokuchaev AuthorDate: 2023-04-02 13:09:54 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-04-02 13:09:54 +0000 devel/qt6-base: make CUPS support optional (but on by default). --- devel/qt6-base/Makefile | 8 +++++--- devel/qt6-base/pkg-plist | 16 ++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 105a99f4f4d1..e4b9af3208e3 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= \ libatspi.so:accessibility/at-spi2-core \ libavahi-client.so:net/avahi-app \ libbrotlidec.so:archivers/brotli \ - libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdouble-conversion.so:devel/double-conversion \ libdrm.so:graphics/libdrm \ @@ -80,12 +79,15 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # zstd from base fails to compress files during the build (error 11: unsupported argument) BINARY_ALIAS= zstd=${LOCALBASE}/bin/zstd -#== Option handling +OPTIONS_DEFINE= CUPS OPTIONS_GROUP= SQL OPTIONS_GROUP_SQL= IBASE MYSQL ODBC PSQL SQLITE -OPTIONS_DEFAULT= SQLITE +OPTIONS_DEFAULT= CUPS SQLITE OPTIONS_SUB= yes +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CMAKE_OFF= -DFEATURE_cups=OFF + IBASE_DESC= InterBase database support IBASE_CMAKE_ON= -DFEATURE_sql_ibase=ON IBASE_CMAKE_OFF= -DFEATURE_sql_ibase=OFF diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index 4609ba9f9665..c7a06dabe10a 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -2909,16 +2909,16 @@ lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfig.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersion.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersionImpl.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportDependencies.cmake -lib/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets.cmake lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.cmake -lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginAdditionalTargetInfo.cmake -lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfig.cmake -lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersion.cmake -lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersionImpl.cmake -lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginAdditionalTargetInfo.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfig.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersion.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersionImpl.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets.cmake %%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake %%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake %%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake @@ -3600,7 +3600,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_PLUGINDIR%%/platforms/libqxcb.so %%QT_PLUGINDIR%%/platformthemes/libqgtk3.so %%QT_PLUGINDIR%%/platformthemes/libqxdgdesktopportal.so -%%QT_PLUGINDIR%%/printsupport/libcupsprintersupport.so +%%CUPS%%%%QT_PLUGINDIR%%/printsupport/libcupsprintersupport.so %%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite.so %%MYSQL%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlmysql.so %%ODBC%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlodbc.so