Page MenuHomeFreeBSD
Files F160261067

D23602.diff
No OneTemporary
Actions

D23602.diff
View Options

Index: head/graphics/qgis-ltr/Makefile
===================================================================
--- head/graphics/qgis-ltr/Makefile
+++ head/graphics/qgis-ltr/Makefile
@@ -148,9 +148,6 @@
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-ltr/files/patch-cmake_Txt2Tags.cmake
===================================================================
--- head/graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake
+++ head/graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake
@@ -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}"
+ )
Index: head/graphics/qgis-ltr/files/patch-doc_INSTALL.html
===================================================================
--- head/graphics/qgis-ltr/files/patch-doc_INSTALL.html
+++ head/graphics/qgis-ltr/files/patch-doc_INSTALL.html
@@ -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>
Index: head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t
===================================================================
--- head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t
+++ head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t
@@ -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\) &reg;
+ % 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
Index: head/graphics/qgis-ltr/files/patch-doc_news.html
===================================================================
--- head/graphics/qgis-ltr/files/patch-doc_news.html
+++ head/graphics/qgis-ltr/files/patch-doc_news.html
@@ -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>
Index: head/graphics/qgis-ltr/files/patch-doc_news.t2t
===================================================================
--- head/graphics/qgis-ltr/files/patch-doc_news.t2t
+++ head/graphics/qgis-ltr/files/patch-doc_news.t2t
@@ -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
+ % -------------------
Index: head/graphics/qgis-ltr/files/patch-scripts_release.pl
===================================================================
--- head/graphics/qgis-ltr/files/patch-scripts_release.pl
+++ head/graphics/qgis-ltr/files/patch-scripts_release.pl
@@ -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" );
Index: head/graphics/qgis-ltr/files/patch-scripts_update-news.pl
===================================================================
--- head/graphics/qgis-ltr/files/patch-scripts_update-news.pl
+++ head/graphics/qgis-ltr/files/patch-scripts_update-news.pl
@@ -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
+
Index: head/graphics/qgis/Makefile
===================================================================
--- head/graphics/qgis/Makefile
+++ head/graphics/qgis/Makefile
@@ -153,9 +153,6 @@
@${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/graphics/qgis/files/patch-cmake_Txt2Tags.cmake
===================================================================
--- head/graphics/qgis/files/patch-cmake_Txt2Tags.cmake
+++ head/graphics/qgis/files/patch-cmake_Txt2Tags.cmake
@@ -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}"
+ )
Index: head/graphics/qgis/files/patch-doc_INSTALL.html
===================================================================
--- head/graphics/qgis/files/patch-doc_INSTALL.html
+++ head/graphics/qgis/files/patch-doc_INSTALL.html
@@ -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>
Index: head/graphics/qgis/files/patch-doc_INSTALL.t2t
===================================================================
--- head/graphics/qgis/files/patch-doc_INSTALL.t2t
+++ head/graphics/qgis/files/patch-doc_INSTALL.t2t
@@ -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\) &reg;
+ % 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
Index: head/graphics/qgis/files/patch-doc_news.html
===================================================================
--- head/graphics/qgis/files/patch-doc_news.html
+++ head/graphics/qgis/files/patch-doc_news.html
@@ -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>
Index: head/graphics/qgis/files/patch-doc_news.t2t
===================================================================
--- head/graphics/qgis/files/patch-doc_news.t2t
+++ head/graphics/qgis/files/patch-doc_news.t2t
@@ -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
+ % -------------------
Index: head/graphics/qgis/files/patch-scripts_release.pl
===================================================================
--- head/graphics/qgis/files/patch-scripts_release.pl
+++ head/graphics/qgis/files/patch-scripts_release.pl
@@ -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" );
Index: head/graphics/qgis/files/patch-scripts_update-news.pl
===================================================================
--- head/graphics/qgis/files/patch-scripts_update-news.pl
+++ head/graphics/qgis/files/patch-scripts_update-news.pl
@@ -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
+

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 23, 4:20 PM (6 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34253461
Default Alt Text
D23602.diff (14 KB)

Event Timeline