From nobody Fri May 19 05:37:58 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 4QMwbp6vD8z4BV43; Fri, 19 May 2023 05:37:58 +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 4QMwbp6KMgz3kD8; Fri, 19 May 2023 05:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684474678; 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=4YLL8rDfbWG3xN8ovTl1D4bkRveqVyCD1w2npT17jzs=; b=CclIAGsJaApj0y0fdf725EDiJR3uuKak1ZUlBS15huKh6HFN9bMs0nEumfaTLI3ZzAXcFO Pj99kD9sTGd4dd6H8KC5Qe+kSCMIZ87B1oxdmNefFSCEoRkYF/xC7iJh9mEwk/YLMsf7++ miKHPBVwt7wEarcyGvuB5LaMEwwPmosBiJYgXF27yZHhnIetTBHXOH82kX4Kr9F26/eh2R 9eSAyd7ORVZBN/t/vrp7UO6CasXec0niyzRnvwe8yZ0Kii/xiJdf3Cb6yadrf6FtqxaZDP xaAxbhsdn7mqconmPGK48U2j9h6VamKS9fl3RU70+ICgjmcm+LOtZ/+knUBRGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684474678; 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=4YLL8rDfbWG3xN8ovTl1D4bkRveqVyCD1w2npT17jzs=; b=K0FV/B6trlO9I8UYL2RWb+LrF3KEaJnNbBntA+8q6pABsb3R0uTylRzyt1DwjhjkkdEGA1 MD9+OSLV2uUuvfcNOdcVoGlpJQi6x+6I6UNnrIcV9jsrvgU45VF+DUMHIaRNrYfvnZEBP4 j4vR3cHHe7um7/e5FoyXFQTnOrj29TzHrPtp3k3HEUcBuWA1AXsHEj4dcB430Ay2t1mKnP P/T6xjb3YDwXzcgvKPNbRj6sWsUTnVqqSIGQUOBdFTER8MXi03A7kjXqVF9UJrSKoebYSU t0wKMlvy6gs6LqsgtU6xy9tby26LLpVyp8xYacDLJ3OTI527DHanVek7QWwVmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684474678; a=rsa-sha256; cv=none; b=wmu371RZXjoqkTwoLFsqMV0tEFZuO1Zq2vu+pF/dBt8wokfr5mcShzdcuqTnpLSARrCD/p Jquc5wm248m11hrX+wsFW4X68nu5Vm1vl7nPm5q7Q87PUK0G4OYNlITvgpT6Lk3fhMvgr3 sPO6o3BbMw0JpkDeDasePNmqDRQMBa4QhbfIMSgp/V5fdILoSfOX9eVBLBPyPsfREk2gHF ITKhsCt0TQOuS+ygeS1GoM+9HYuNoECcm/Kx/DRdCQC/YYApX3a0O/+DZk8UdR/WUztKoW ZLWSVOLlR8byu4zT+391kUSfDqNLeym+6OTnmZRndIXjC37OlQxn6sfHB0gHvg== 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 4QMwbp5NWTzGXB; Fri, 19 May 2023 05:37:58 +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 34J5bwxd053359; Fri, 19 May 2023 05:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34J5bw3t053358; Fri, 19 May 2023 05:37:58 GMT (envelope-from git) Date: Fri, 19 May 2023 05:37:58 GMT Message-Id: <202305190537.34J5bw3t053358@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: 0f24404c0a02 - main - devel/qt6-base: remove SQL options 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: 0f24404c0a0213603d0f270970394c5255c415cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f24404c0a0213603d0f270970394c5255c415cb commit 0f24404c0a0213603d0f270970394c5255c415cb Author: Tobias C. Berner AuthorDate: 2023-04-29 05:41:56 +0000 Commit: Tobias C. Berner CommitDate: 2023-05-19 05:36:45 +0000 devel/qt6-base: remove SQL options --- devel/qt6-base/Makefile | 37 +++++++------------------------------ devel/qt6-base/pkg-plist | 33 ++------------------------------- 2 files changed, 9 insertions(+), 61 deletions(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 0c45cbbf94b2..e15d9474c250 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -72,6 +72,12 @@ CMAKE_ON= QT_AVOID_CMAKE_ARCHIVING_API \ QT_FIND_ALL_PACKAGES_ALWAYS CMAKE_OFF= QT_FEATURE_eglfs \ QT_FEATURE_gssapi +# sql drivers are handled in the qt6-base-sqldriver port +CMAKE_OFF+= FEATURE_sql_mysql \ + FEATURE_sql_odbc \ + FEATURE_sql_psql \ + FEATURE_sql_sqlite + SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ ${WRKSRC}/mkspecs/features/uikit/devices.py \ ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ @@ -83,41 +89,12 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BINARY_ALIAS= zstd=${LOCALBASE}/bin/zstd OPTIONS_DEFINE= CUPS -OPTIONS_GROUP= SQL -OPTIONS_GROUP_SQL= IBASE MYSQL ODBC PSQL SQLITE -OPTIONS_DEFAULT= CUPS SQLITE +OPTIONS_DEFAULT= CUPS 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 -IBASE_USES= firebird:4.0 -IBASE_BROKEN= IBASE: fatal error: 'gen/iberror.h' file not found - -MYSQL_DESC= MySQL database support -MYSQL_CMAKE_ON= -DFEATURE_sql_mysql=ON -MYSQL_CMAKE_OFF= -DFEATURE_sql_mysql=OFF -MYSQL_USES= mysql - -ODBC_DESC= ODBC database support -ODBC_CMAKE_ON= -DFEATURE_sql_odbc=ON -ODBC_CMAKE_OFF= -DFEATURE_sql_odbc=OFF -ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC - -PSQL_DESC= PostgreSQL database support -PSQL_CMAKE_ON= -DFEATURE_sql_psql=ON -PSQL_CMAKE_OFF= -DFEATURE_sql_psql=OFF -PSQL_USES= pgsql - -SQLITE_DESC= Sqlite database support -SQLITE_CMAKE_ON= -DFEATURE_sql_sqlite=ON \ - -DQT_FEATURE_system_sqlite=ON -SQLITE_CMAKE_OFF= -DFEATURE_sql_sqlite=OFF -SQLITE_USES= sqlite:3 - .include .if ${ARCH} == "armv6" || ${ARCH} == "armv7" diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index c7a06dabe10a..e7d50074d235 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -2486,10 +2486,10 @@ lib/cmake/Qt6/FindLibproxy.cmake lib/cmake/Qt6/FindLibsystemd.cmake lib/cmake/Qt6/FindLibudev.cmake lib/cmake/Qt6/FindMtdev.cmake -%%MYSQL%%lib/cmake/Qt6/FindMySQL.cmake +lib/cmake/Qt6/FindMySQL.cmake lib/cmake/Qt6/FindOracle.cmake lib/cmake/Qt6/FindPPS.cmake -%%PSQL%%lib/cmake/Qt6/FindPostgreSQL.cmake +lib/cmake/Qt6/FindPostgreSQL.cmake lib/cmake/Qt6/FindSlog2.cmake lib/cmake/Qt6/FindTslib.cmake lib/cmake/Qt6/FindWrapAtomic.cmake @@ -2919,36 +2919,11 @@ lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.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 -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginAdditionalTargetInfo.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfig.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersion.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersionImpl.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake lib/cmake/Qt6Sql/Qt6SqlAdditionalTargetInfo.cmake lib/cmake/Qt6Sql/Qt6SqlConfig.cmake lib/cmake/Qt6Sql/Qt6SqlConfigVersion.cmake lib/cmake/Qt6Sql/Qt6SqlConfigVersionImpl.cmake lib/cmake/Qt6Sql/Qt6SqlDependencies.cmake -lib/cmake/Qt6Sql/Qt6SqlPlugins.cmake lib/cmake/Qt6Sql/Qt6SqlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Sql/Qt6SqlTargets.cmake lib/cmake/Qt6Sql/Qt6SqlVersionlessTargets.cmake @@ -3601,10 +3576,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_PLUGINDIR%%/platformthemes/libqgtk3.so %%QT_PLUGINDIR%%/platformthemes/libqxdgdesktopportal.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 -%%PSQL%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlpsql.so %%QT_PLUGINDIR%%/tls/libqcertonlybackend.so %%QT_PLUGINDIR%%/tls/libqopensslbackend.so %%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so