Attachment 245974 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

qgis.patch (text/plain), 3.69 KB, created by Martin Birgmeier on 2023-10-29 16:02:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Birgmeier

Created: 2023-10-29 16:02:37 UTC

Size: 3.69 KB

patch

obsolete

>diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
>index f3ce0f39b2f4..f1acf31cefca 100644
>--- a/graphics/qgis/Makefile
>+++ b/graphics/qgis/Makefile
>@@ -12,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/doc/LICENSE
> 
> BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
> 		opencl>=0:devel/opencl \
>+		${LOCALBASE}/bin/flex:textproc/flex \
> 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
>@@ -123,6 +124,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
> 		-DHAVE_PGCONFIG=1 \
> 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
> 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
>+		-DFLEX_EXECUTABLE=/usr/local/bin/flex \
> 		-DPython_EXECUTABLE=${PYTHON_CMD} \
> 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
> 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
>@@ -149,9 +151,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 +172,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/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