Attachment 172984 Details for Bug 211375 – patch

[patch] patch

extra-cmake-modules.patch (text/plain), 2.86 KB, created by Yuri Victorovich on 2016-07-26 02:35:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-07-26 02:35:27 UTC

Size: 2.86 KB

patch

obsolete

>Index: devel/extra-cmake-modules/Makefile
>===================================================================
>--- devel/extra-cmake-modules/Makefile	(revision 419060)
>+++ devel/extra-cmake-modules/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	extra-cmake-modules
> PORTVERSION=	5.24.0
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	yuri@rawbw.com
>@@ -16,20 +17,24 @@
> GH_ACCOUNT=	KDE
> 
> USES=		cmake
>+DOCS_USE=	QT5=help
>+TEST_USE=	QT5=buildtools_build,linguisttools_build,qmake_build
> NO_ARCH=	yes
> 
> ## options
> 
>-OPTIONS_DEFINE=	DOCS MANPAGES
>-OPTIONS_DEFAULT=MANPAGES
>+OPTIONS_DEFINE=	DOCS MANPAGES TEST
>+OPTIONS_DEFAULT=MANPAGES TEST # TEST=off fails: https://bugs.kde.org/show_bug.cgi?id=366110
> 
> SPHINX_DEP=		sphinx-build:textproc/py-sphinx
> DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
> MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
> DOCS_CMAKE_ON=		-DBUILD_HTML_DOCS:BOOL=ON
>-DOCS_CMAKE_OFF=	        -DBUILD_HTML_DOCS:BOOL=OFF
>+DOCS_CMAKE_OFF=		-DBUILD_HTML_DOCS:BOOL=OFF
> MANPAGES_CMAKE_ON=	-DBUILD_MAN_DOCS:BOOL=ON
> MANPAGES_CMAKE_OFF=	-DBUILD_MAN_DOCS:BOOL=OFF
>+TEST_CMAKE_ON=		-DBUILD_TESTING:BOOL=ON
>+TEST_CMAKE_OFF=		-DBUILD_TESTING:BOOL=OFF
> MANPAGES_PLIST_FILES=	\
> 	man/man7/ecm-developer.7.gz \
> 	man/man7/ecm-find-modules.7.gz \
>Index: devel/extra-cmake-modules/files/patch-CMakeLists.txt
>===================================================================
>--- devel/extra-cmake-modules/files/patch-CMakeLists.txt	(revision 419060)
>+++ devel/extra-cmake-modules/files/patch-CMakeLists.txt	(working copy)
>@@ -1,4 +1,4 @@
>---- CMakeLists.txt.orig	2016-05-03 15:00:24 UTC
>+--- CMakeLists.txt.orig	2016-06-15 13:40:34 UTC
> +++ CMakeLists.txt
> @@ -60,12 +60,12 @@ set(KDE_MODULES_INSTALL_DIR       ${SHAR
>  set(MODULES_INSTALL_DIR           ${SHARE_INSTALL_DIR}/ECM/modules/)
>Index: devel/extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake
>===================================================================
>--- devel/extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake	(nonexistent)
>+++ devel/extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake	(working copy)
>@@ -0,0 +1,11 @@
>+--- cmake/FindQCollectionGenerator.cmake.orig	2016-06-15 13:40:34 UTC
>++++ cmake/FindQCollectionGenerator.cmake
>+@@ -58,6 +58,8 @@ find_program(QCollectionGenerator_EXECUT
>+         qcollectiongenerator
>+         qcollectiongenerator-qt4
>+         qcollectiongenerator-qt5
>++    PATHS
>++        ${CMAKE_INSTALL_PREFIX}/lib/qt5/bin
>+     DOC "Qt help collection generator"
>+ )
>+ 
>
>Property changes on: devel/extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 211375: 172984 | 172985 | 173057 | 173058 | 173628