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

Collapse All | Expand All

(-)qgis/Makefile (-12 / +26 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/graphics/qgis/Makefile 405724 2016-01-10 16:55:26Z bapt $
2
# $FreeBSD: head/graphics/qgis/Makefile 405724 2016-01-10 16:55:26Z bapt $
3
3
4
PORTNAME=	qgis
4
PORTNAME=	qgis
5
PORTVERSION=	2.12.2
5
PORTVERSION=	2.12.3
6
CATEGORIES=	graphics geography
6
CATEGORIES=	graphics geography
7
7
8
MAINTAINER=	rhurlin@gwdg.de
8
MAINTAINER=	rhurlin@gwdg.de
Lines 23-41 Link Here
23
23
24
USE_GITHUB=	yes
24
USE_GITHUB=	yes
25
GH_PROJECT=	${PORTNAME:tu}
25
GH_PROJECT=	${PORTNAME:tu}
26
GH_TAGNAME=	B403532
26
GH_TAGNAME=	99ac688
27
27
28
USES=		cpe bison cmake execinfo fortran gmake sqlite python
28
USES=		cpe bison cmake execinfo fortran gmake python sqlite
29
USE_QT4=	gui svg xml network sql designer testlib linguist_build \
29
USE_QT4=	gui svg xml network sql designer testlib linguist_build \
30
		qmake_build moc_build rcc_build uic_build
30
		qmake_build moc_build rcc_build uic_build
31
31
32
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
33
33
34
OPTIONS_DEFINE=		POSTGIS PYTHON GRASS SERVER DEBUG
34
OPTIONS_DEFINE=		PYTHON POSTGIS GRASS SERVER DEBUG
35
OPTIONS_DEFAULT=	POSTGIS PYTHON
35
OPTIONS_DEFAULT=	PYTHON POSTGIS
36
OPTIONS_SUB=		yes
36
OPTIONS_SUB=		yes
37
NO_OPTIONS_SORT=	yes
37
NO_OPTIONS_SORT=	yes
38
SERVER_DESC=	Enable QGIS server
38
SERVER_DESC=		Enable QGIS server
39
39
40
CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
40
CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
41
41
Lines 43-48 Link Here
43
CMAKE_ARGS+=	-Wno-dev
43
CMAKE_ARGS+=	-Wno-dev
44
.endif
44
.endif
45
45
46
DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE=Debug
47
DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE=Release
48
46
GRASS_BUILD_DEPENDS=	grass64:${PORTSDIR}/databases/grass
49
GRASS_BUILD_DEPENDS=	grass64:${PORTSDIR}/databases/grass
47
GRASS_RUN_DEPENDS=	grass64:${PORTSDIR}/databases/grass
50
GRASS_RUN_DEPENDS=	grass64:${PORTSDIR}/databases/grass
48
GRASS_CMAKE_ON=		-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.5
51
GRASS_CMAKE_ON=		-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.5
Lines 53-62 Link Here
53
POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
56
POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
54
POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
57
POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
55
58
56
SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
57
SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
58
SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
59
60
PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
59
PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
61
			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
60
			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
62
			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
61
			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
Lines 82-89 Link Here
82
PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
81
PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
83
PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
82
PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
84
83
85
DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE=Debug
84
SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
86
DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE=Release
85
SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
86
SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
87
87
88
.include <bsd.port.options.mk>
88
.include <bsd.port.options.mk>
89
89
Lines 99-103 Link Here
99
pre-patch:
99
pre-patch:
100
	@${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
100
	@${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
101
		${WRKSRC}/src/app/qgisapp.cpp
101
		${WRKSRC}/src/app/qgisapp.cpp
102
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
103
# [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23
104
# 'Hide shared library symbols by default on GCC and Clang',
105
# some layer properties are not visible on FreeBSD > 9.x
106
	@${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|#SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|g' \
107
		${WRKSRC}/src/analysis/CMakeLists.txt \
108
		${WRKSRC}/src/app/CMakeLists.txt \
109
		${WRKSRC}/src/core/CMakeLists.txt \
110
		${WRKSRC}/src/customwidgets/CMakeLists.txt \
111
		${WRKSRC}/src/gui/CMakeLists.txt \
112
		${WRKSRC}/src/plugins/CMakeLists.txt \
113
		${WRKSRC}/src/python/CMakeLists.txt \
114
		${WRKSRC}/src/server/CMakeLists.txt
115
.endif
102
116
103
.include <bsd.port.mk>
117
.include <bsd.port.mk>
(-)qgis/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 47b3c1d67af3a02c6c387036c032245e044d5bd65fd2c8c4da2bcc45ff86ccfd
1
SHA256 (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 550fc21c7a8c4b7a5f1997fdfcc338916a880050a94eee792218c61a12a7fd9e
2
SIZE (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 80837408
2
SIZE (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 80834484
(-)qgis/pkg-plist (-33 / +33 lines)
Lines 613-633 Link Here
613
include/qgis/ui_qgsquerybuilderbase.h
613
include/qgis/ui_qgsquerybuilderbase.h
614
include/qgis/ui_qgssublayersdialogbase.h
614
include/qgis/ui_qgssublayersdialogbase.h
615
lib/libqgis_analysis.so
615
lib/libqgis_analysis.so
616
lib/libqgis_analysis.so.2.12.2
616
lib/libqgis_analysis.so.2.12.3
617
lib/libqgis_app.so
617
lib/libqgis_app.so
618
lib/libqgis_app.so.2.12.2
618
lib/libqgis_app.so.2.12.3
619
lib/libqgis_core.so
619
lib/libqgis_core.so
620
lib/libqgis_core.so.2.12.2
620
lib/libqgis_core.so.2.12.3
621
lib/libqgis_gui.so
621
lib/libqgis_gui.so
622
lib/libqgis_gui.so.2.12.2
622
lib/libqgis_gui.so.2.12.3
623
lib/libqgis_networkanalysis.so
623
lib/libqgis_networkanalysis.so
624
lib/libqgis_networkanalysis.so.2.12.2
624
lib/libqgis_networkanalysis.so.2.12.3
625
%%SERVER%%lib/libqgis_server.so
625
%%SERVER%%lib/libqgis_server.so
626
%%SERVER%%lib/libqgis_server.so.2.12.2
626
%%SERVER%%lib/libqgis_server.so.2.12.3
627
%%GRASS%%lib/libqgisgrass6.so
627
%%GRASS%%lib/libqgisgrass6.so
628
%%GRASS%%lib/libqgisgrass6.so.2.12.2
628
%%GRASS%%lib/libqgisgrass6.so.2.12.3
629
%%PYTHON%%lib/libqgispython.so
629
%%PYTHON%%lib/libqgispython.so
630
%%PYTHON%%lib/libqgispython.so.2.12.2
630
%%PYTHON%%lib/libqgispython.so.2.12.3
631
lib/qgis/crssync
631
lib/qgis/crssync
632
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
632
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
633
%%GRASS%%lib/qgis/grass/modules/qgis.d.rast6
633
%%GRASS%%lib/qgis/grass/modules/qgis.d.rast6
Lines 664-670 Link Here
664
lib/qgis/plugins/libroadgraphplugin.so
664
lib/qgis/plugins/libroadgraphplugin.so
665
lib/qgis/plugins/libspatialiteprovider.so
665
lib/qgis/plugins/libspatialiteprovider.so
666
lib/qgis/plugins/libspatialqueryplugin.so
666
lib/qgis/plugins/libspatialqueryplugin.so
667
%%POSTGIS%%lib/qgis/plugins/libspitplugin.so
667
lib/qgis/plugins/libspitplugin.so
668
lib/qgis/plugins/libtopolplugin.so
668
lib/qgis/plugins/libtopolplugin.so
669
lib/qgis/plugins/libwcsprovider.so
669
lib/qgis/plugins/libwcsprovider.so
670
lib/qgis/plugins/libwfsprovider.so
670
lib/qgis/plugins/libwfsprovider.so
Lines 2015-2044 Link Here
2015
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/html_elems.py
2015
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/html_elems.py
2016
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/info_model.py
2016
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/info_model.py
2017
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/plugin.py
2017
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/plugin.py
2018
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/__init__.py
2018
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/__init__.py
2019
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/connector.py
2019
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/connector.py
2020
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/data_model.py
2020
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/data_model.py
2021
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/icons/postgis_elephant.png
2021
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/icons/postgis_elephant.png
2022
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/info_model.py
2022
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/info_model.py
2023
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugin.py
2023
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugin.py
2024
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py
2024
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py
2025
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
2025
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
2026
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml
2026
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml
2027
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml
2027
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml
2028
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml
2028
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml
2029
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml
2029
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml
2030
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml
2030
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml
2031
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml
2031
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml
2032
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml
2032
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml
2033
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml
2033
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml
2034
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml
2034
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml
2035
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml
2035
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml
2036
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml
2036
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml
2037
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py
2037
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py
2038
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py
2038
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py
2039
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py
2039
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py
2040
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py
2040
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py
2041
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
2041
%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
2042
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/__init__.py
2042
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/__init__.py
2043
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/connector.py
2043
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/connector.py
2044
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/data_model.py
2044
%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/data_model.py

Return to bug 206412