Page MenuHomeFreeBSD
Files F151957009

D23188.diff
No OneTemporary
Actions

D23188.diff
View Options

Index: head/graphics/qgis-ltr/Makefile
===================================================================
--- head/graphics/qgis-ltr/Makefile
+++ head/graphics/qgis-ltr/Makefile
@@ -148,6 +148,9 @@
post-patch:
@${REINPLACE_CMD} -e 's|markupsafe ||g' \
${WRKSRC}/python/ext-libs/CMakeLists.txt
+# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside)
+# https://github.com/qgis/QGIS/issues/33516
+ @${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t
pre-configure:
${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
Index: head/graphics/qgis/Makefile
===================================================================
--- head/graphics/qgis/Makefile
+++ head/graphics/qgis/Makefile
@@ -153,6 +153,9 @@
@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
${WRKSRC}/src/core/CMakeLists.txt
.endif
+# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside)
+# https://github.com/qgis/QGIS/issues/33516
+ @${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t
pre-configure:
${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
Index: head/textproc/txt2tags/Makefile
===================================================================
--- head/textproc/txt2tags/Makefile
+++ head/textproc/txt2tags/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= txt2tags
-PORTVERSION= 2.6
-PORTREVISION= 3
+PORTVERSION= 3.4
CATEGORIES= textproc
MAINTAINER= lbartoletti@FreeBSD.org
@@ -12,8 +11,8 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python:2.7 shebangfix
-SHEBANG_FILES= extras/html-update.sh txt2tags
+USES= python:3.6+ shebangfix
+SHEBANG_FILES= txt2tags.py
USE_GITHUB= yes
NO_BUILD= yes
NO_ARCH= yes
@@ -25,7 +24,7 @@
OPTIONS_DEFINE= DOCS EXAMPLES
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/txt2tags ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/txt2tags.py ${STAGEDIR}${PREFIX}/bin/txt2tags
do-install-EXAMPLES-on:
@cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
@@ -33,7 +32,10 @@
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/*/*.pdf ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+.for doc in markup rules userguide
+ @cd ${WRKSRC}/docs/${doc} && ${WRKSRC}/txt2tags.py ${doc}.t2t
+ ${INSTALL_DATA} ${WRKSRC}/docs/${doc}/${doc}.html ${STAGEDIR}${DOCSDIR}
+.endfor
.include <bsd.port.mk>
Index: head/textproc/txt2tags/distinfo
===================================================================
--- head/textproc/txt2tags/distinfo
+++ head/textproc/txt2tags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474656184
-SHA256 (txt2tags-txt2tags-2.6_GH0.tar.gz) = c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
-SIZE (txt2tags-txt2tags-2.6_GH0.tar.gz) = 4509515
+TIMESTAMP = 1577715579
+SHA256 (txt2tags-txt2tags-3.4_GH0.tar.gz) = 989c8cc0bc69c5b2acad92cc08e61786e06ee5093969c232adda2eb905f9a00d
+SIZE (txt2tags-txt2tags-3.4_GH0.tar.gz) = 252256

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 6:38 PM (1 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31363864
Default Alt Text
D23188.diff (3 KB)

Event Timeline