Attachment 249350 Details for Bug 276821 – v1 (apply via `git am`)

[patch] v1 (apply via `git am`)

0001-devel-kf6-extra-cmake-modules-respect-port-options-i.patch (text/plain), 15.36 KB, created by Anton Saietskii on 2024-03-20 22:03:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Saietskii

Created: 2024-03-20 22:03:24 UTC

Size: 15.36 KB

patch

obsolete

>From f8040bb6ecd9e83e5aaba792ae2ca2be38b6982c Mon Sep 17 00:00:00 2001
>From: Anton Saietskii <vsasjason@gmail.com>
>Date: Wed, 20 Mar 2024 23:49:14 +0159
>Subject: [PATCH] devel/kf6-extra-cmake-modules: respect port options in plist
>
>This fixes packaging with all/any options disabled.
>
>While here:
> * Add LICENSE
> * Pet portlint/portclippy/portfmt/poudriere testport
> * Fix HELP option, make Qt 6 build-only dependency
> * Install docs under 'extra-cmake-modules' as in KF5
>---
> devel/kf6-extra-cmake-modules/Makefile        |  28 ++-
> .../files/patch-CMakeLists.txt                |  11 +
> ...patch-cmake_FindQCollectionGenerator.cmake |  10 +
> devel/kf6-extra-cmake-modules/pkg-plist       | 208 +-----------------
> 4 files changed, 45 insertions(+), 212 deletions(-)
> create mode 100644 devel/kf6-extra-cmake-modules/files/patch-CMakeLists.txt
> create mode 100644 devel/kf6-extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake
>
>diff --git a/devel/kf6-extra-cmake-modules/Makefile b/devel/kf6-extra-cmake-modules/Makefile
>index 5236b0a7ab31..50dc20c1cf7a 100644
>--- a/devel/kf6-extra-cmake-modules/Makefile
>+++ b/devel/kf6-extra-cmake-modules/Makefile
>@@ -1,19 +1,26 @@
> PORTNAME=	extra-cmake-modules
> DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	devel kde kde-frameworks
> 
>-COMMENT=	Extra modules and scripts for CMake
> MAINTAINER=	kde@FreeBSD.org
>+COMMENT=	Extra modules and scripts for CMake
> 
>-USES=		cmake kde:6 qt:6 shebangfix tar:xz \
>-		python:build
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/COPYING-CMAKE-SCRIPTS
>+
>+USES=		cmake kde:6 python:build shebangfix tar:xz
> USE_QT=		base
>-INSTALL_TARGET=	install
>+
> SHEBANG_FILES=	kde-modules/kde-git-commit-hooks/json-schema.py
> 
>-PORTDOCS=	html/*
>+CONFIGURE_ENV+=	CMAKE_PROGRAM_PATH="${LOCALBASE}/libexec/qt6"
>+
>+INSTALL_TARGET=	install # does not have install/strip target
> 
>-## options
>+NO_ARCH=	yes
>+
>+PORTDOCS=	html/*
> 
> OPTIONS_DEFINE=		DOCS HELP MANPAGES
> OPTIONS_DEFAULT=	HELP MANPAGES
>@@ -23,13 +30,12 @@ HELP_DESC=	Generate QtHelp documentation for installed modules
> 
> SPHINX_DEP=		sphinx-build:textproc/py-sphinx
> DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
>-HELP_BUILD_DEPENDS=	${SPHINX_DEP}
>-MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
> DOCS_CMAKE_BOOL=	BUILD_HTML_DOCS
>+HELP_BUILD_DEPENDS=	${SPHINX_DEP}
>+HELP_USES=		qt:6
>+HELP_USE=		QT=sqldriver-sqlite:build,tools:build
> HELP_CMAKE_BOOL=	BUILD_QTHELP_DOCS
>+MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
> MANPAGES_CMAKE_BOOL=	BUILD_MAN_DOCS
> 
>-CONFIGURE_ENV+=	CMAKE_PROGRAM_PATH="${LOCALBASE}/bin:${LOCALBASE}/lib/qt5/bin"
>-INSTALL_TARGET=	install # does not have install/strip target
>-
> .include <bsd.port.mk>
>diff --git a/devel/kf6-extra-cmake-modules/files/patch-CMakeLists.txt b/devel/kf6-extra-cmake-modules/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..0457e22005a7
>--- /dev/null
>+++ b/devel/kf6-extra-cmake-modules/files/patch-CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2024-03-20 21:23:20 UTC
>++++ CMakeLists.txt
>+@@ -44,7 +44,7 @@ set(KDE_MODULES_INSTALL_DIR       ${SHARE_INSTALL_DIR}
>+ set(MODULES_INSTALL_DIR           ${SHARE_INSTALL_DIR}/ECM/modules/)
>+ set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/)
>+ 
>+-set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/ECM
>++set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/extra-cmake-modules
>+     CACHE
>+     PATH
>+     "HTML and QtHelp documentation"
>diff --git a/devel/kf6-extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake b/devel/kf6-extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake
>new file mode 100644
>index 000000000000..55ee796b0064
>--- /dev/null
>+++ b/devel/kf6-extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake
>@@ -0,0 +1,10 @@
>+--- cmake/FindQCollectionGenerator.cmake.orig	2024-02-21 11:22:41 UTC
>++++ cmake/FindQCollectionGenerator.cmake
>+@@ -36,6 +36,7 @@ find_program(QCollectionGenerator_EXECUTABLE
>+         qcollectiongenerator
>+         qcollectiongenerator-qt4
>+         qcollectiongenerator-qt5
>++        qhelpgenerator
>+     DOC "Qt help collection generator"
>+ )
>+ 
>diff --git a/devel/kf6-extra-cmake-modules/pkg-plist b/devel/kf6-extra-cmake-modules/pkg-plist
>index 72ea2e4d99d1..33c0333441fc 100644
>--- a/devel/kf6-extra-cmake-modules/pkg-plist
>+++ b/devel/kf6-extra-cmake-modules/pkg-plist
>@@ -130,204 +130,10 @@ share/ECM/toolchain/deployment-file.json.in
> share/ECM/toolchain/generate-fastlane-metadata.py
> share/ECM/toolchain/hasMainSymbol.cmake
> share/ECM/toolchain/specifydependencies.cmake
>-share/doc/ECM/html/_sources/find-module/Find7Zip.rst.txt
>-share/doc/ECM/html/_sources/find-module/Find7z.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindCanberra.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindEGL.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindGLIB2.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindGperf.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindGradle.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindIcoTool.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindInotify.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindIsoCodes.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindKF5.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindLibExiv2.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindLibGit2.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindLibMount.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindLibcap.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindOpenEXR.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindPhoneNumber.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindPoppler.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindPulseAudio.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindQtWaylandScanner.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindSasl2.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindSeccomp.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindSharedMimeInfo.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindTaglib.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindUDev.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindWayland.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindWaylandProtocols.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindWaylandScanner.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindX11_XCB.rst.txt
>-share/doc/ECM/html/_sources/find-module/FindXCB.rst.txt
>-share/doc/ECM/html/_sources/find-module/Findepoxy.rst.txt
>-share/doc/ECM/html/_sources/find-module/Findgzip.rst.txt
>-share/doc/ECM/html/_sources/index.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDECMakeSettings.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEClangFormat.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDECompilerSettings.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEFrameworkCompilerSettings.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEGitCommitHooks.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEInstallDirs.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEInstallDirs5.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEInstallDirs6.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEMetaInfoPlatformCheck.rst.txt
>-share/doc/ECM/html/_sources/kde-module/KDEPackageAppTemplates.rst.txt
>-share/doc/ECM/html/_sources/manual/ecm-developer.7.rst.txt
>-share/doc/ECM/html/_sources/manual/ecm-find-modules.7.rst.txt
>-share/doc/ECM/html/_sources/manual/ecm-kde-modules.7.rst.txt
>-share/doc/ECM/html/_sources/manual/ecm-modules.7.rst.txt
>-share/doc/ECM/html/_sources/manual/ecm-toolchains.7.rst.txt
>-share/doc/ECM/html/_sources/manual/ecm.7.rst.txt
>-share/doc/ECM/html/_sources/module/CheckAtomic.rst.txt
>-share/doc/ECM/html/_sources/module/ECMAddAndroidApk.rst.txt
>-share/doc/ECM/html/_sources/module/ECMAddAppIcon.rst.txt
>-share/doc/ECM/html/_sources/module/ECMAddQch.rst.txt
>-share/doc/ECM/html/_sources/module/ECMAddQtDesignerPlugin.rst.txt
>-share/doc/ECM/html/_sources/module/ECMAddTests.rst.txt
>-share/doc/ECM/html/_sources/module/ECMCheckOutboundLicense.rst.txt
>-share/doc/ECM/html/_sources/module/ECMConfiguredInstall.rst.txt
>-share/doc/ECM/html/_sources/module/ECMCoverageOption.rst.txt
>-share/doc/ECM/html/_sources/module/ECMCreateQmFromPoFiles.rst.txt
>-share/doc/ECM/html/_sources/module/ECMDeprecationSettings.rst.txt
>-share/doc/ECM/html/_sources/module/ECMEnableSanitizers.rst.txt
>-share/doc/ECM/html/_sources/module/ECMFindModuleHelpers.rst.txt
>-share/doc/ECM/html/_sources/module/ECMFindQmlModule.rst.txt
>-share/doc/ECM/html/_sources/module/ECMGenerateDBusServiceFile.rst.txt
>-share/doc/ECM/html/_sources/module/ECMGenerateExportHeader.rst.txt
>-share/doc/ECM/html/_sources/module/ECMGenerateHeaders.rst.txt
>-share/doc/ECM/html/_sources/module/ECMGeneratePkgConfigFile.rst.txt
>-share/doc/ECM/html/_sources/module/ECMGeneratePriFile.rst.txt
>-share/doc/ECM/html/_sources/module/ECMGenerateQmlTypes.rst.txt
>-share/doc/ECM/html/_sources/module/ECMInstallIcons.rst.txt
>-share/doc/ECM/html/_sources/module/ECMMarkAsTest.rst.txt
>-share/doc/ECM/html/_sources/module/ECMMarkNonGuiExecutable.rst.txt
>-share/doc/ECM/html/_sources/module/ECMOptionalAddSubdirectory.rst.txt
>-share/doc/ECM/html/_sources/module/ECMPackageConfigHelpers.rst.txt
>-share/doc/ECM/html/_sources/module/ECMPoQmTools.rst.txt
>-share/doc/ECM/html/_sources/module/ECMQmlModule.rst.txt
>-share/doc/ECM/html/_sources/module/ECMQtDeclareLoggingCategory.rst.txt
>-share/doc/ECM/html/_sources/module/ECMQueryQt.rst.txt
>-share/doc/ECM/html/_sources/module/ECMSetupQtPluginMacroNames.rst.txt
>-share/doc/ECM/html/_sources/module/ECMSetupVersion.rst.txt
>-share/doc/ECM/html/_sources/module/ECMSourceVersionControl.rst.txt
>-share/doc/ECM/html/_sources/module/ECMUninstallTarget.rst.txt
>-share/doc/ECM/html/_sources/module/ECMUseFindModules.rst.txt
>-share/doc/ECM/html/_sources/module/ECMWinResolveSymlinks.rst.txt
>-share/doc/ECM/html/_sources/module/QtVersionOption.rst.txt
>-share/doc/ECM/html/_sources/toolchain/Android.rst.txt
>-share/doc/ECM/html/_static/_sphinx_javascript_frameworks_compat.js
>-share/doc/ECM/html/_static/basic.css
>-share/doc/ECM/html/_static/classic.css
>-share/doc/ECM/html/_static/default.css
>-share/doc/ECM/html/_static/doctools.js
>-share/doc/ECM/html/_static/documentation_options.js
>-share/doc/ECM/html/_static/ecm.css
>-share/doc/ECM/html/_static/file.png
>-share/doc/ECM/html/_static/jquery-3.6.0.js
>-share/doc/ECM/html/_static/jquery.js
>-share/doc/ECM/html/_static/kde-favicon.ico
>-share/doc/ECM/html/_static/language_data.js
>-share/doc/ECM/html/_static/minus.png
>-share/doc/ECM/html/_static/plus.png
>-share/doc/ECM/html/_static/pygments.css
>-share/doc/ECM/html/_static/searchtools.js
>-share/doc/ECM/html/_static/sidebar.js
>-share/doc/ECM/html/_static/sphinx_highlight.js
>-share/doc/ECM/html/_static/underscore-1.13.1.js
>-share/doc/ECM/html/_static/underscore.js
>-share/doc/ECM/html/find-module/Find7Zip.html
>-share/doc/ECM/html/find-module/Find7z.html
>-share/doc/ECM/html/find-module/FindCanberra.html
>-share/doc/ECM/html/find-module/FindEGL.html
>-share/doc/ECM/html/find-module/FindGLIB2.html
>-share/doc/ECM/html/find-module/FindGperf.html
>-share/doc/ECM/html/find-module/FindGradle.html
>-share/doc/ECM/html/find-module/FindIcoTool.html
>-share/doc/ECM/html/find-module/FindInotify.html
>-share/doc/ECM/html/find-module/FindIsoCodes.html
>-share/doc/ECM/html/find-module/FindKF5.html
>-share/doc/ECM/html/find-module/FindLibExiv2.html
>-share/doc/ECM/html/find-module/FindLibGit2.html
>-share/doc/ECM/html/find-module/FindLibMount.html
>-share/doc/ECM/html/find-module/FindLibcap.html
>-share/doc/ECM/html/find-module/FindOpenEXR.html
>-share/doc/ECM/html/find-module/FindPhoneNumber.html
>-share/doc/ECM/html/find-module/FindPoppler.html
>-share/doc/ECM/html/find-module/FindPulseAudio.html
>-share/doc/ECM/html/find-module/FindQtWaylandScanner.html
>-share/doc/ECM/html/find-module/FindSasl2.html
>-share/doc/ECM/html/find-module/FindSeccomp.html
>-share/doc/ECM/html/find-module/FindSharedMimeInfo.html
>-share/doc/ECM/html/find-module/FindTaglib.html
>-share/doc/ECM/html/find-module/FindUDev.html
>-share/doc/ECM/html/find-module/FindWayland.html
>-share/doc/ECM/html/find-module/FindWaylandProtocols.html
>-share/doc/ECM/html/find-module/FindWaylandScanner.html
>-share/doc/ECM/html/find-module/FindX11_XCB.html
>-share/doc/ECM/html/find-module/FindXCB.html
>-share/doc/ECM/html/find-module/Findepoxy.html
>-share/doc/ECM/html/find-module/Findgzip.html
>-share/doc/ECM/html/genindex.html
>-share/doc/ECM/html/index.html
>-share/doc/ECM/html/kde-module/KDECMakeSettings.html
>-share/doc/ECM/html/kde-module/KDEClangFormat.html
>-share/doc/ECM/html/kde-module/KDECompilerSettings.html
>-share/doc/ECM/html/kde-module/KDEFrameworkCompilerSettings.html
>-share/doc/ECM/html/kde-module/KDEGitCommitHooks.html
>-share/doc/ECM/html/kde-module/KDEInstallDirs.html
>-share/doc/ECM/html/kde-module/KDEInstallDirs5.html
>-share/doc/ECM/html/kde-module/KDEInstallDirs6.html
>-share/doc/ECM/html/kde-module/KDEMetaInfoPlatformCheck.html
>-share/doc/ECM/html/kde-module/KDEPackageAppTemplates.html
>-share/doc/ECM/html/manual/ecm-developer.7.html
>-share/doc/ECM/html/manual/ecm-find-modules.7.html
>-share/doc/ECM/html/manual/ecm-kde-modules.7.html
>-share/doc/ECM/html/manual/ecm-modules.7.html
>-share/doc/ECM/html/manual/ecm-toolchains.7.html
>-share/doc/ECM/html/manual/ecm.7.html
>-share/doc/ECM/html/module/CheckAtomic.html
>-share/doc/ECM/html/module/ECMAddAndroidApk.html
>-share/doc/ECM/html/module/ECMAddAppIcon.html
>-share/doc/ECM/html/module/ECMAddQch.html
>-share/doc/ECM/html/module/ECMAddQtDesignerPlugin.html
>-share/doc/ECM/html/module/ECMAddTests.html
>-share/doc/ECM/html/module/ECMCheckOutboundLicense.html
>-share/doc/ECM/html/module/ECMConfiguredInstall.html
>-share/doc/ECM/html/module/ECMCoverageOption.html
>-share/doc/ECM/html/module/ECMCreateQmFromPoFiles.html
>-share/doc/ECM/html/module/ECMDeprecationSettings.html
>-share/doc/ECM/html/module/ECMEnableSanitizers.html
>-share/doc/ECM/html/module/ECMFindModuleHelpers.html
>-share/doc/ECM/html/module/ECMFindQmlModule.html
>-share/doc/ECM/html/module/ECMGenerateDBusServiceFile.html
>-share/doc/ECM/html/module/ECMGenerateExportHeader.html
>-share/doc/ECM/html/module/ECMGenerateHeaders.html
>-share/doc/ECM/html/module/ECMGeneratePkgConfigFile.html
>-share/doc/ECM/html/module/ECMGeneratePriFile.html
>-share/doc/ECM/html/module/ECMGenerateQmlTypes.html
>-share/doc/ECM/html/module/ECMInstallIcons.html
>-share/doc/ECM/html/module/ECMMarkAsTest.html
>-share/doc/ECM/html/module/ECMMarkNonGuiExecutable.html
>-share/doc/ECM/html/module/ECMOptionalAddSubdirectory.html
>-share/doc/ECM/html/module/ECMPackageConfigHelpers.html
>-share/doc/ECM/html/module/ECMPoQmTools.html
>-share/doc/ECM/html/module/ECMQmlModule.html
>-share/doc/ECM/html/module/ECMQtDeclareLoggingCategory.html
>-share/doc/ECM/html/module/ECMQueryQt.html
>-share/doc/ECM/html/module/ECMSetupQtPluginMacroNames.html
>-share/doc/ECM/html/module/ECMSetupVersion.html
>-share/doc/ECM/html/module/ECMSourceVersionControl.html
>-share/doc/ECM/html/module/ECMUninstallTarget.html
>-share/doc/ECM/html/module/ECMUseFindModules.html
>-share/doc/ECM/html/module/ECMWinResolveSymlinks.html
>-share/doc/ECM/html/module/QtVersionOption.html
>-share/doc/ECM/html/search.html
>-share/doc/ECM/html/searchindex.js
>-share/doc/ECM/html/toolchain/Android.html
>-share/man/man7/ecm-developer.7.gz
>-share/man/man7/ecm-find-modules.7.gz
>-share/man/man7/ecm-kde-modules.7.gz
>-share/man/man7/ecm-modules.7.gz
>-share/man/man7/ecm-toolchains.7.gz
>-share/man/man7/ecm.7.gz
>+%%HELP%%%%DOCSDIR%%/ExtraCMakeModules.qch
>+%%MANPAGES%%share/man/man7/ecm-developer.7.gz
>+%%MANPAGES%%share/man/man7/ecm-find-modules.7.gz
>+%%MANPAGES%%share/man/man7/ecm-kde-modules.7.gz
>+%%MANPAGES%%share/man/man7/ecm-modules.7.gz
>+%%MANPAGES%%share/man/man7/ecm-toolchains.7.gz
>+%%MANPAGES%%share/man/man7/ecm.7.gz
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 276821: 248177 | 248178 | 248179 | 249350 | 249351 | 249352 | 249373