mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

textproc/txt2tags: Update to 3.4, fix graphics/qgis and graphics/qgis-ltr with this newest version

Browse Source 
- Use python3 only [1]
    - Fix graphics/qgis and graphics/qgis-ltr with txt2tags-3.4 (remove --css-sugar --css-inside) [2][3]

Changelog:

    https://github.com/txt2tags/txt2tags/blob/v3/CHANGELOG.md

  [1] txt2tags v3 can use python2 too. But, only graphics/qgis* uses it and depends on python3. I want to avoid adding dependencies. And python2 is dead, isn't it? ;)
  [2] https://github.com/txt2tags/txt2tags#feature-differences-between-versions
  [3] https://github.com/qgis/QGIS/issues/33516

PR:	243368
Reviewed by:	tcberner
Approved by:	Rainer Hurling (qgis maintainter), tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D23188
This commit is contained in:
Loïc Bartoletti 2020-01-23 15:40:10 +00:00
parent e6b5f3c394
commit 494657b275
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=523934
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/qgis-ltr/Makefile
View File

@ -148,6 +148,9 @@ CXX= clang++${LLVM_DEFAULT}
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

3
graphics/qgis/Makefile
View File

@ -153,6 +153,9 @@ post-patch:
@${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

16
textproc/txt2tags/Makefile
View File

@ -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 @@ COMMENT= Convert simply formatted text into markup (e.g., HTML)
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 @@ PORTEXAMPLES= *
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-EXAMPLES-on:
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>

6
textproc/txt2tags/distinfo
View File

@ -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