View | Details | Raw Unified | Return to bug 211375 | Differences between
and this patch

Collapse All | Expand All

(-)devel/extra-cmake-modules/Makefile (-3 / +15 lines)
Lines 4-9 Link Here
4
PORTNAME=	extra-cmake-modules
4
PORTNAME=	extra-cmake-modules
5
PORTVERSION=	5.24.0
5
PORTVERSION=	5.24.0
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTREVISION=	1
7
CATEGORIES=	devel
8
CATEGORIES=	devel
8
9
9
MAINTAINER=	yuri@rawbw.com
10
MAINTAINER=	yuri@rawbw.com
Lines 16-35 Link Here
16
GH_ACCOUNT=	KDE
17
GH_ACCOUNT=	KDE
17
18
18
USES=		cmake
19
USES=		cmake
20
DOCS_USE=	QT5=help
21
TEST_USE=	QT5=buildtools_build,linguisttools_build,qmake_build
19
NO_ARCH=	yes
22
NO_ARCH=	yes
20
23
21
## options
24
## options
22
25
23
OPTIONS_DEFINE=	DOCS MANPAGES
26
OPTIONS_DEFINE=	DOCS HELP MANPAGES TEST
24
OPTIONS_DEFAULT=MANPAGES
27
OPTIONS_DEFAULT=HELP MANPAGES TEST # TEST=off fails: https://bugs.kde.org/show_bug.cgi?id=366110
28
OPTIONS_SUB=	yes
25
29
30
HELP_DESC=	Generate QtHelp documentation for installed modules
31
26
SPHINX_DEP=		sphinx-build:textproc/py-sphinx
32
SPHINX_DEP=		sphinx-build:textproc/py-sphinx
27
DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
33
DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
34
HELP_BUILD_DEPENDS=	${SPHINX_DEP}
28
MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
35
MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
29
DOCS_CMAKE_ON=		-DBUILD_HTML_DOCS:BOOL=ON
36
DOCS_CMAKE_ON=		-DBUILD_HTML_DOCS:BOOL=ON
30
DOCS_CMAKE_OFF=	        -DBUILD_HTML_DOCS:BOOL=OFF
37
DOCS_CMAKE_OFF=		-DBUILD_HTML_DOCS:BOOL=OFF
38
HELP_CMAKE_ON=		-DBUILD_QTHELP_DOCS:BOOL=ON
39
HELP_CMAKE_OFF=		-DBUILD_QTHELP_DOCS:BOOL=OFF
31
MANPAGES_CMAKE_ON=	-DBUILD_MAN_DOCS:BOOL=ON
40
MANPAGES_CMAKE_ON=	-DBUILD_MAN_DOCS:BOOL=ON
32
MANPAGES_CMAKE_OFF=	-DBUILD_MAN_DOCS:BOOL=OFF
41
MANPAGES_CMAKE_OFF=	-DBUILD_MAN_DOCS:BOOL=OFF
42
TEST_CMAKE_ON=		-DBUILD_TESTING:BOOL=ON
43
TEST_CMAKE_OFF=		-DBUILD_TESTING:BOOL=OFF
44
33
MANPAGES_PLIST_FILES=	\
45
MANPAGES_PLIST_FILES=	\
34
	man/man7/ecm-developer.7.gz \
46
	man/man7/ecm-developer.7.gz \
35
	man/man7/ecm-find-modules.7.gz \
47
	man/man7/ecm-find-modules.7.gz \
(-)devel/extra-cmake-modules/files/patch-CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- CMakeLists.txt.orig	2016-05-03 15:00:24 UTC
1
--- CMakeLists.txt.orig	2016-06-15 13:40:34 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -60,12 +60,12 @@ set(KDE_MODULES_INSTALL_DIR       ${SHAR
3
@@ -60,12 +60,12 @@ set(KDE_MODULES_INSTALL_DIR       ${SHAR
4
 set(MODULES_INSTALL_DIR           ${SHARE_INSTALL_DIR}/ECM/modules/)
4
 set(MODULES_INSTALL_DIR           ${SHARE_INSTALL_DIR}/ECM/modules/)
(-)devel/extra-cmake-modules/files/patch-cmake_FindQCollectionGenerator.cmake (+11 lines)
Line 0 Link Here
1
--- cmake/FindQCollectionGenerator.cmake.orig	2016-06-15 13:40:34 UTC
2
+++ cmake/FindQCollectionGenerator.cmake
3
@@ -58,6 +58,8 @@ find_program(QCollectionGenerator_EXECUT
4
         qcollectiongenerator
5
         qcollectiongenerator-qt4
6
         qcollectiongenerator-qt5
7
+    PATHS
8
+        ${CMAKE_INSTALL_PREFIX}/lib/qt5/bin
9
     DOC "Qt help collection generator"
10
 )
11
 
(-)devel/extra-cmake-modules/pkg-plist (+1 lines)
Lines 161-163 Link Here
161
%%PORTDOCS%%%%DOCSDIR%%/html/search.html
161
%%PORTDOCS%%%%DOCSDIR%%/html/search.html
162
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
162
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
163
%%PORTDOCS%%%%DOCSDIR%%/html/toolchain/Android.html
163
%%PORTDOCS%%%%DOCSDIR%%/html/toolchain/Android.html
164
%%HELP%%%%DOCSDIR%%/ExtraCMakeModules.qch

Return to bug 211375