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

Collapse All | Expand All

(-)qgis/files/patch-cmake_Txt2Tags.cmake (+20 lines)
Line 0 Link Here
1
--- cmake/Txt2Tags.cmake.orig	2019-12-06 12:02:59 UTC
2
+++ cmake/Txt2Tags.cmake
3
@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
4
     ADD_CUSTOM_COMMAND(
5
       OUTPUT ${_out}
6
       COMMAND ${TXT2TAGS_EXECUTABLE}
7
-      ARGS --encoding=utf-8 -o${_out} -t txt ${_in}
8
+      ARGS -o${_out} -t txt ${_in}
9
       DEPENDS ${_in}
10
       COMMENT "Building ${_out} from ${_in}"
11
       )
12
@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
13
     ADD_CUSTOM_COMMAND(
14
       OUTPUT ${_out}.html
15
       COMMAND ${TXT2TAGS_EXECUTABLE}
16
-      ARGS --encoding=utf-8 -o${_out}.html -t html ${_in}
17
+      ARGS -o${_out}.html -t html ${_in}
18
       DEPENDS ${_in}
19
       COMMENT "Building ${_out}.html from ${_in}"
20
       )
(-)qgis/files/patch-doc_INSTALL.html (+9 lines)
Line 0 Link Here
1
--- doc/INSTALL.html.orig	2019-12-06 12:02:59 UTC
2
+++ doc/INSTALL.html
3
@@ -3130,5 +3130,5 @@ The following people have contributed to this document
4
 
5
 </DIV>
6
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
7
-<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
8
+<!-- cmdline: txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
9
 </BODY></HTML>
(-)qgis/files/patch-doc_INSTALL.t2t (+20 lines)
Line 0 Link Here
1
--- doc/INSTALL.t2t.orig	2020-02-09 10:36:16 UTC
2
+++ doc/INSTALL.t2t
3
@@ -11,7 +11,7 @@ Building QGIS from source - step by step
4
 %! PostProc(html):  \(R\)   &reg;
5
 % Next line will replace tabs with 2 spaces in txt generated outputs
6
 %! PostProc(txt): '(?i)(\t)' '  '
7
-%! encoding: iso-8859-1
8
+%! encoding: utf-8
9
 %
10
 % Tex processing
11
 %
12
@@ -36,7 +36,7 @@ Building QGIS from source - step by step
13
 %! PostProc(tex): NEWPAGE  '\\newpage'
14
 % Give alternating table rows different colors and use a smaller font in tables (\tiny)
15
 %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
16
-%! encoding: iso-8859-1
17
+%! encoding: utf-8
18
 
19
 %! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
20
 % These are comments and will not be generated in any output
(-)qgis/files/patch-doc_news.html (+9 lines)
Line 0 Link Here
1
--- doc/news.html.orig	2019-12-06 12:02:59 UTC
2
+++ doc/news.html
3
@@ -3651,5 +3651,5 @@ July 6, 2002
4
 </DIV>
5
 
6
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
7
-<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/news.html -t html doc/news.t2t -->
8
+<!-- cmdline: txt2tags -odoc/news.html -t html doc/news.t2t -->
9
 </BODY></HTML>
(-)qgis/files/patch-doc_news.t2t (+11 lines)
Line 0 Link Here
1
--- doc/news.t2t.orig	2020-02-09 10:36:16 UTC
2
+++ doc/news.t2t
3
@@ -10,7 +10,7 @@ Change history for the QGIS Project
4
 %! PostProc(html): '(?i)(</pre>)' '\1</div>'
5
 % Next line will replace tabs with 2 spaces in txt generated outputs
6
 %! PostProc(txt): '(?i)(\t)' '  '
7
-%! encoding: iso-8859-1
8
+%! encoding: utf-8
9
 %
10
 % These are comments and will not be generated in any output
11
 % -------------------
(-)qgis/files/patch-scripts_release.pl (+13 lines)
Line 0 Link Here
1
--- scripts/release.pl.orig	2019-12-06 12:02:59 UTC
2
+++ scripts/release.pl
3
@@ -182,8 +182,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai
4
 unless( $dopoint ) {
5
 	run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr;
6
 	run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr;
7
-	run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
8
-	run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
9
+	run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
10
+	run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
11
 
12
 	run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
13
 	run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
(-)qgis/files/patch-scripts_update-news.pl (+13 lines)
Line 0 Link Here
1
--- scripts/update-news.pl.orig	2019-12-06 12:02:59 UTC
2
+++ scripts/update-news.pl
3
@@ -61,8 +61,8 @@ close $in;
4
 
5
 copy($tempfile, "doc/news.t2t");
6
 
7
-system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t";
8
-system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t";
9
+system "txt2tags -odoc/news.html -t html doc/news.t2t";
10
+system "txt2tags -oNEWS -t txt doc/news.t2t";
11
 
12
 =head1 NAME
13
 

Return to bug 243996