Attachment 245991 Details for Bug 274793 – patch to find the right sed and to use grass8 instead of grass7

[patch] patch to find the right sed and to use grass8 instead of grass7

patch-findgrass (text/plain), 4.93 KB, created by Martin Birgmeier on 2023-10-30 10:35:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Birgmeier

Created: 2023-10-30 10:35:02 UTC

Size: 4.93 KB

patch

obsolete

>diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
>index f3ce0f39b2f4..5e2095367df3 100644
>--- a/graphics/qgis/Makefile
>+++ b/graphics/qgis/Makefile
>@@ -32,6 +32,9 @@ BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
>+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} < 1300000 )
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
>+.endif
> LIB_DEPENDS=	libdraco.so:archivers/draco \
> 		libexiv2.so:graphics/exiv2 \
> 		libexpat.so:textproc/expat2 \
>@@ -128,6 +131,9 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
> 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
> 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
> 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
>+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} < 1300000 )
>+CMAKE_ARGS+=	-DFLEX_EXECUTABLE=/usr/local/bin/flex
>+.endif
> CMAKE_ON=	USE_OPENCL WITH_ASTYLE WITH_BINDINGS WITH_COPC \
> 		WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT \
> 		WITH_INTERNAL_LAZPERF WITH_POSTGRESQL
>@@ -149,9 +155,9 @@ NO_OPTIONS_SORT=	yes
> OPTIONS_SUB=		yes
> SERVER_DESC=		Enable QGIS server
> 
>-GRASS_BUILD_DEPENDS=	grass7:databases/grass7
>+GRASS_BUILD_DEPENDS=	grass8:databases/grass8
> GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
>-GRASS_CMAKE_BOOL=	WITH_GRASS7
>+GRASS_CMAKE_BOOL=	WITH_GRASS8
> SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
> SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
> 
>@@ -170,9 +176,6 @@ post-patch:
> 		${WRKSRC}/src/core/CMakeLists.txt
> .endif
> 
>-pre-configure:
>-	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
>-
> post-install:
> 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
> 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
>diff --git a/graphics/qgis/files/patch-cmake-FindGRASS.cmake b/graphics/qgis/files/patch-cmake-FindGRASS.cmake
>new file mode 100644
>index 000000000000..a095b96b01fa
>--- /dev/null
>+++ b/graphics/qgis/files/patch-cmake-FindGRASS.cmake
>@@ -0,0 +1,17 @@
>+--- ./cmake/FindGRASS.cmake.ORIG	2023-10-27 14:02:22.000000000 +0200
>++++ ./cmake/FindGRASS.cmake	2023-10-29 15:40:10.971356000 +0100
>+@@ -159,11 +159,9 @@
>+ 
>+ IF (UNIX)
>+     IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>+-        IF (GRASS_FIND_VERSION EQUAL 7)
>+-              FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
>+-                  LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
>+-              ENDFOREACH(VERSION_MINOR)
>+-        ENDIF (GRASS_FIND_VERSION EQUAL 7)
>++        FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
>++            LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
>++        ENDFOREACH(VERSION_MINOR)
>+     ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>+         FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
>+             FOREACH (PATH /usr/lib64 /usr/lib)
>diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
>index 85f4b90bee15..7565df5c1c58 100644
>--- a/graphics/qgis/pkg-plist
>+++ b/graphics/qgis/pkg-plist
>@@ -2364,17 +2364,17 @@ lib/libqgis_native.so
> lib/libqgis_native.so.%%DISTVERSION%%
> %%SERVER%%lib/libqgis_server.so
> %%SERVER%%lib/libqgis_server.so.%%DISTVERSION%%
>-%%GRASS%%lib/libqgisgrass7.so
>-%%GRASS%%lib/libqgisgrass7.so.%%DISTVERSION%%
>+%%GRASS%%lib/libqgisgrass8.so
>+%%GRASS%%lib/libqgisgrass8.so.%%DISTVERSION%%
> lib/libqgispython.so
> lib/libqgispython.so.%%DISTVERSION%%
> %%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qgis_customwidgets.py
> lib/qgis/crssync
>-%%GRASS%%lib/qgis/grass/bin/qgis.g.browser7
>-%%GRASS%%lib/qgis/grass/modules/qgis.d.rast7
>-%%GRASS%%lib/qgis/grass/modules/qgis.g.info7
>-%%GRASS%%lib/qgis/grass/modules/qgis.r.in7
>-%%GRASS%%lib/qgis/grass/modules/qgis.v.in7
>+%%GRASS%%lib/qgis/grass/bin/qgis.g.browser8
>+%%GRASS%%lib/qgis/grass/modules/qgis.d.rast8
>+%%GRASS%%lib/qgis/grass/modules/qgis.g.info8
>+%%GRASS%%lib/qgis/grass/modules/qgis.r.in8
>+%%GRASS%%lib/qgis/grass/modules/qgis.v.in8
> lib/qgis/pdal_wrench
> lib/qgis/plugins/libauthmethod_apiheader.so
> lib/qgis/plugins/libauthmethod_awss3.so
>@@ -2386,15 +2386,15 @@ lib/qgis/plugins/libauthmethod_oauth2.so
> lib/qgis/plugins/libauthmethod_pkcs12.so
> lib/qgis/plugins/libauthmethod_pkipaths.so
> lib/qgis/plugins/libplugin_geometrychecker.so
>-%%GRASS%%lib/qgis/plugins/libplugin_grass7.so
>+%%GRASS%%lib/qgis/plugins/libplugin_grass8.so
> lib/qgis/plugins/libplugin_offlineediting.so
> lib/qgis/plugins/libplugin_topology.so
> lib/qgis/plugins/libprovider_arcgisfeatureserver.so
> lib/qgis/plugins/libprovider_arcgismapserver.so
> lib/qgis/plugins/libprovider_delimitedtext.so
> lib/qgis/plugins/libprovider_gpx.so
>-%%GRASS%%lib/qgis/plugins/libprovider_grass7.so
>-%%GRASS%%lib/qgis/plugins/libprovider_grassraster7.so
>+%%GRASS%%lib/qgis/plugins/libprovider_grass8.so
>+%%GRASS%%lib/qgis/plugins/libprovider_grassraster8.so
> lib/qgis/plugins/libprovider_mdal.so
> lib/qgis/plugins/libprovider_mssql.so
> lib/qgis/plugins/libprovider_pdal.so

Actions: View | Diff

Attachments on bug 274793: 245974 | 245975 | 245991 | 245997 | 246655 | 247281