mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-24 09:25:01 +00:00
graphics/qgis-ltr, graphics/qgis: Fix build after textproc/txt2tags update
The FreeBSD package builder complains about encoding problems after [1]. This happens, because newer versions of textproc/txt2tags do not need the option '--encoding=utf-8' any more[2]. The patch is a workaround to remove such encoding entries from the QGIS port, until QGIS project changes upstream for newer txt2tags versions. While I'm here, replace sed commands by a patch file [3] [1] http://svnweb.freebsd.org/changeset/ports/525495 [2] https://github.com/txt2tags/txt2tags/blob/v3/CHANGELOG.md#35-2020-02-01 [3] https://reviews.freebsd.org/D23188#511597 PR: 243998, 243996 Submitted by: Rainer Hurling (maintainer) Reviewed by: lbartoletti Approved by: tcbernor (mentor) Differential Revision: https://reviews.freebsd.org/D23602
This commit is contained in:
parent
b16dee0b1d
commit
d0e1c0462a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=526917
@ -148,9 +148,6 @@ 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
|
||||
|
20
graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake
Normal file
20
graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake
Normal file
@ -0,0 +1,20 @@
|
||||
--- cmake/Txt2Tags.cmake.orig 2019-08-16 12:03:55 UTC
|
||||
+++ cmake/Txt2Tags.cmake
|
||||
@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_out}
|
||||
COMMAND ${TXT2TAGS_EXECUTABLE}
|
||||
- ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
|
||||
+ ARGS -o${_out} -t txt ${_in}
|
||||
DEPENDS ${_in}
|
||||
COMMENT "Building ${_out} from ${_in}"
|
||||
)
|
||||
@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_out}.html
|
||||
COMMAND ${TXT2TAGS_EXECUTABLE}
|
||||
- ARGS --encoding=utf-8 -o${_out}.html -t html ${_in}
|
||||
+ ARGS -o${_out}.html -t html ${_in}
|
||||
DEPENDS ${_in}
|
||||
COMMENT "Building ${_out}.html from ${_in}"
|
||||
)
|
9
graphics/qgis-ltr/files/patch-doc_INSTALL.html
Normal file
9
graphics/qgis-ltr/files/patch-doc_INSTALL.html
Normal file
@ -0,0 +1,9 @@
|
||||
--- doc/INSTALL.html.orig 2019-08-16 12:03:55 UTC
|
||||
+++ doc/INSTALL.html
|
||||
@@ -3113,5 +3113,5 @@ The following people have contributed to this document
|
||||
|
||||
</DIV>
|
||||
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
|
||||
-<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis-3.4/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis-3.4/doc/INSTALL.t2t -->
|
||||
+<!-- cmdline: txt2tags -o/home/fischer/src/qgis-3.4/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis-3.4/doc/INSTALL.t2t -->
|
||||
</BODY></HTML>
|
28
graphics/qgis-ltr/files/patch-doc_INSTALL.t2t
Normal file
28
graphics/qgis-ltr/files/patch-doc_INSTALL.t2t
Normal file
@ -0,0 +1,28 @@
|
||||
--- doc/INSTALL.t2t.orig 2019-08-16 12:03:55 UTC
|
||||
+++ doc/INSTALL.t2t
|
||||
@@ -4,14 +4,14 @@ Building QGIS from source - step by step
|
||||
|
||||
%! target : html
|
||||
%! style : style.css
|
||||
-%! Options : --toc --toc-level 2 --enum-title --css-sugar --css-inside
|
||||
+%! Options : --toc --toc-level 2 --enum-title
|
||||
%! preproc : TUT_URL https://qgis.org
|
||||
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
|
||||
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
|
||||
%! PostProc(html): \(R\) ®
|
||||
% Next line will replace tabs with 2 spaces in txt generated outputs
|
||||
%! PostProc(txt): '(?i)(\t)' ' '
|
||||
-%! encoding: iso-8859-1
|
||||
+%! encoding: utf-8
|
||||
%
|
||||
% Tex processing
|
||||
%
|
||||
@@ -36,7 +36,7 @@ Building QGIS from source - step by step
|
||||
%! PostProc(tex): NEWPAGE '\\newpage'
|
||||
% Give alternating table rows different colors and use a smaller font in tables (\tiny)
|
||||
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
|
||||
-%! encoding: iso-8859-1
|
||||
+%! encoding: utf-8
|
||||
|
||||
%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
|
||||
% These are comments and will not be generated in any output
|
9
graphics/qgis-ltr/files/patch-doc_news.html
Normal file
9
graphics/qgis-ltr/files/patch-doc_news.html
Normal file
@ -0,0 +1,9 @@
|
||||
--- doc/news.html.orig 2019-08-16 12:03:55 UTC
|
||||
+++ doc/news.html
|
||||
@@ -3447,5 +3447,5 @@ July 6, 2002
|
||||
</DIV>
|
||||
|
||||
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
|
||||
-<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build/doc/news.html -t html /home/fischer/src/qgis/doc/news.t2t -->
|
||||
+<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build/doc/news.html -t html /home/fischer/src/qgis/doc/news.t2t -->
|
||||
</BODY></HTML>
|
18
graphics/qgis-ltr/files/patch-doc_news.t2t
Normal file
18
graphics/qgis-ltr/files/patch-doc_news.t2t
Normal file
@ -0,0 +1,18 @@
|
||||
--- doc/news.t2t.orig 2019-08-16 12:03:55 UTC
|
||||
+++ doc/news.t2t
|
||||
@@ -4,13 +4,13 @@ Change history for the QGIS Project
|
||||
|
||||
%! target : html
|
||||
%! style : style.css
|
||||
-%! Options : --toc --toc-level 1 --enum-title --css-sugar --css-inside
|
||||
+%! Options : --toc --toc-level 1 --enum-title
|
||||
%! preproc : TUT_URL https://qgis.org
|
||||
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
|
||||
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
|
||||
% Next line will replace tabs with 2 spaces in txt generated outputs
|
||||
%! PostProc(txt): '(?i)(\t)' ' '
|
||||
-%! encoding: iso-8859-1
|
||||
+%! encoding: utf-8
|
||||
%
|
||||
% These are comments and will not be generated in any output
|
||||
% -------------------
|
13
graphics/qgis-ltr/files/patch-scripts_release.pl
Normal file
13
graphics/qgis-ltr/files/patch-scripts_release.pl
Normal file
@ -0,0 +1,13 @@
|
||||
--- scripts/release.pl.orig 2019-08-16 12:03:55 UTC
|
||||
+++ scripts/release.pl
|
||||
@@ -183,8 +183,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai
|
||||
unless( $dopoint ) {
|
||||
run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr;
|
||||
run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr;
|
||||
- run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
|
||||
- run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
|
||||
+ run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
|
||||
+ run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
|
||||
|
||||
run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
|
||||
run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
|
13
graphics/qgis-ltr/files/patch-scripts_update-news.pl
Normal file
13
graphics/qgis-ltr/files/patch-scripts_update-news.pl
Normal file
@ -0,0 +1,13 @@
|
||||
--- scripts/update-news.pl.orig 2019-08-16 12:03:55 UTC
|
||||
+++ scripts/update-news.pl
|
||||
@@ -61,8 +61,8 @@ close $in;
|
||||
|
||||
copy($tempfile, "doc/news.t2t");
|
||||
|
||||
-system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t";
|
||||
-system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t";
|
||||
+system "txt2tags -odoc/news.html -t html doc/news.t2t";
|
||||
+system "txt2tags -oNEWS -t txt doc/news.t2t";
|
||||
|
||||
=head1 NAME
|
||||
|
@ -153,9 +153,6 @@ 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
|
||||
|
20
graphics/qgis/files/patch-cmake_Txt2Tags.cmake
Normal file
20
graphics/qgis/files/patch-cmake_Txt2Tags.cmake
Normal file
@ -0,0 +1,20 @@
|
||||
--- cmake/Txt2Tags.cmake.orig 2019-12-06 12:02:59 UTC
|
||||
+++ cmake/Txt2Tags.cmake
|
||||
@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_out}
|
||||
COMMAND ${TXT2TAGS_EXECUTABLE}
|
||||
- ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
|
||||
+ ARGS -o${_out} -t txt ${_in}
|
||||
DEPENDS ${_in}
|
||||
COMMENT "Building ${_out} from ${_in}"
|
||||
)
|
||||
@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_out}.html
|
||||
COMMAND ${TXT2TAGS_EXECUTABLE}
|
||||
- ARGS --encoding=utf-8 -o${_out}.html -t html ${_in}
|
||||
+ ARGS -o${_out}.html -t html ${_in}
|
||||
DEPENDS ${_in}
|
||||
COMMENT "Building ${_out}.html from ${_in}"
|
||||
)
|
9
graphics/qgis/files/patch-doc_INSTALL.html
Normal file
9
graphics/qgis/files/patch-doc_INSTALL.html
Normal file
@ -0,0 +1,9 @@
|
||||
--- doc/INSTALL.html.orig 2019-12-06 12:02:59 UTC
|
||||
+++ doc/INSTALL.html
|
||||
@@ -3130,5 +3130,5 @@ The following people have contributed to this document
|
||||
|
||||
</DIV>
|
||||
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
|
||||
-<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
|
||||
+<!-- cmdline: txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
|
||||
</BODY></HTML>
|
28
graphics/qgis/files/patch-doc_INSTALL.t2t
Normal file
28
graphics/qgis/files/patch-doc_INSTALL.t2t
Normal file
@ -0,0 +1,28 @@
|
||||
--- doc/INSTALL.t2t.orig 2019-12-06 12:02:59 UTC
|
||||
+++ doc/INSTALL.t2t
|
||||
@@ -4,14 +4,14 @@ Building QGIS from source - step by step
|
||||
|
||||
%! target : html
|
||||
%! style : style.css
|
||||
-%! Options : --toc --toc-level 2 --enum-title --css-sugar --css-inside
|
||||
+%! Options : --toc --toc-level 2 --enum-title
|
||||
%! preproc : TUT_URL https://qgis.org
|
||||
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
|
||||
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
|
||||
%! PostProc(html): \(R\) ®
|
||||
% Next line will replace tabs with 2 spaces in txt generated outputs
|
||||
%! PostProc(txt): '(?i)(\t)' ' '
|
||||
-%! encoding: iso-8859-1
|
||||
+%! encoding: utf-8
|
||||
%
|
||||
% Tex processing
|
||||
%
|
||||
@@ -36,7 +36,7 @@ Building QGIS from source - step by step
|
||||
%! PostProc(tex): NEWPAGE '\\newpage'
|
||||
% Give alternating table rows different colors and use a smaller font in tables (\tiny)
|
||||
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
|
||||
-%! encoding: iso-8859-1
|
||||
+%! encoding: utf-8
|
||||
|
||||
%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
|
||||
% These are comments and will not be generated in any output
|
9
graphics/qgis/files/patch-doc_news.html
Normal file
9
graphics/qgis/files/patch-doc_news.html
Normal file
@ -0,0 +1,9 @@
|
||||
--- doc/news.html.orig 2019-12-06 12:02:59 UTC
|
||||
+++ doc/news.html
|
||||
@@ -3651,5 +3651,5 @@ July 6, 2002
|
||||
</DIV>
|
||||
|
||||
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
|
||||
-<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/news.html -t html doc/news.t2t -->
|
||||
+<!-- cmdline: txt2tags -odoc/news.html -t html doc/news.t2t -->
|
||||
</BODY></HTML>
|
18
graphics/qgis/files/patch-doc_news.t2t
Normal file
18
graphics/qgis/files/patch-doc_news.t2t
Normal file
@ -0,0 +1,18 @@
|
||||
--- doc/news.t2t.orig 2019-12-06 12:02:59 UTC
|
||||
+++ doc/news.t2t
|
||||
@@ -4,13 +4,13 @@ Change history for the QGIS Project
|
||||
|
||||
%! target : html
|
||||
%! style : style.css
|
||||
-%! Options : --toc --toc-level 1 --enum-title --css-sugar --css-inside
|
||||
+%! Options : --toc --toc-level 1 --enum-title
|
||||
%! preproc : TUT_URL https://qgis.org
|
||||
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
|
||||
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
|
||||
% Next line will replace tabs with 2 spaces in txt generated outputs
|
||||
%! PostProc(txt): '(?i)(\t)' ' '
|
||||
-%! encoding: iso-8859-1
|
||||
+%! encoding: utf-8
|
||||
%
|
||||
% These are comments and will not be generated in any output
|
||||
% -------------------
|
13
graphics/qgis/files/patch-scripts_release.pl
Normal file
13
graphics/qgis/files/patch-scripts_release.pl
Normal file
@ -0,0 +1,13 @@
|
||||
--- scripts/release.pl.orig 2019-12-06 12:02:59 UTC
|
||||
+++ scripts/release.pl
|
||||
@@ -182,8 +182,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai
|
||||
unless( $dopoint ) {
|
||||
run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr;
|
||||
run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr;
|
||||
- run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
|
||||
- run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
|
||||
+ run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
|
||||
+ run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
|
||||
|
||||
run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
|
||||
run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
|
13
graphics/qgis/files/patch-scripts_update-news.pl
Normal file
13
graphics/qgis/files/patch-scripts_update-news.pl
Normal file
@ -0,0 +1,13 @@
|
||||
--- scripts/update-news.pl.orig 2019-12-06 12:02:59 UTC
|
||||
+++ scripts/update-news.pl
|
||||
@@ -61,8 +61,8 @@ close $in;
|
||||
|
||||
copy($tempfile, "doc/news.t2t");
|
||||
|
||||
-system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t";
|
||||
-system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t";
|
||||
+system "txt2tags -odoc/news.html -t html doc/news.t2t";
|
||||
+system "txt2tags -oNEWS -t txt doc/news.t2t";
|
||||
|
||||
=head1 NAME
|
||||
|
Loading…
Reference in New Issue
Block a user