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

Collapse All | Expand All

(-)Makefile (+12 lines)
Lines 156-161 Link Here
156
# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside)
156
# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside)
157
# https://github.com/qgis/QGIS/issues/33516
157
# https://github.com/qgis/QGIS/issues/33516
158
	@${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t
158
	@${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t
159
# Workaround, until QGIS project removes --encoding for txt2tags versions > 3.4
160
	@${REINPLACE_CMD} -e 's|ARGS --encoding=utf-8|ARGS|g' \
161
		${WRKSRC}/cmake/Txt2Tags.cmake
162
	@${REINPLACE_CMD} -e 's|txt2tags -\\-encoding=utf-8|txt2tags|' \
163
		${WRKSRC}/doc/INSTALL.html \
164
		${WRKSRC}/doc/news.html
165
	@${REINPLACE_CMD} -e 's|encoding: iso-8859-1|encoding: utf-8|g' \
166
		${WRKSRC}/doc/INSTALL.t2t \
167
		${WRKSRC}/doc/news.t2t
168
	@${REINPLACE_CMD} -e 's|txt2tags --encoding=utf-8|txt2tags|g' \
169
		${WRKSRC}/scripts/release.pl \
170
		${WRKSRC}/scripts/update-news.pl
159
171
160
pre-configure:
172
pre-configure:
161
	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
173
	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3

Return to bug 243996