Attachment 211499 Details for Bug 243998 – patch files instead of sed replacements

[patch] patch files instead of sed replacements

patch-graphics_qgis-ltr__txt2tags_2.diff (text/plain), 6.27 KB, created by Rainer Hurling on 2020-02-09 11:08:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2020-02-09 11:08:22 UTC

Size: 6.27 KB

patch

obsolete

>diff -urN qgis-ltr.orig/files/patch-cmake_Txt2Tags.cmake qgis-ltr/files/patch-cmake_Txt2Tags.cmake
>--- qgis-ltr.orig/files/patch-cmake_Txt2Tags.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-cmake_Txt2Tags.cmake	2020-02-09 11:59:04.152761000 +0100
>@@ -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}"
>+       )
>diff -urN qgis-ltr.orig/files/patch-doc_INSTALL.html qgis-ltr/files/patch-doc_INSTALL.html
>--- qgis-ltr.orig/files/patch-doc_INSTALL.html	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-doc_INSTALL.html	2020-02-09 11:59:04.154076000 +0100
>@@ -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>
>+ 
>+-
>++
>+ </BODY></HTML>
>diff -urN qgis-ltr.orig/files/patch-doc_INSTALL.t2t qgis-ltr/files/patch-doc_INSTALL.t2t
>--- qgis-ltr.orig/files/patch-doc_INSTALL.t2t	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-doc_INSTALL.t2t	2020-02-09 11:59:04.155408000 +0100
>@@ -0,0 +1,20 @@
>+--- doc/INSTALL.t2t.orig	2020-02-09 10:55:48 UTC
>++++ doc/INSTALL.t2t
>+@@ -11,7 +11,7 @@ Building QGIS from source - step by step
>+ %! 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
>diff -urN qgis-ltr.orig/files/patch-doc_news.html qgis-ltr/files/patch-doc_news.html
>--- qgis-ltr.orig/files/patch-doc_news.html	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-doc_news.html	2020-02-09 11:59:04.156733000 +0100
>@@ -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>
>+ 
>+ 
>+-
>++
>+ </BODY></HTML>
>diff -urN qgis-ltr.orig/files/patch-doc_news.t2t qgis-ltr/files/patch-doc_news.t2t
>--- qgis-ltr.orig/files/patch-doc_news.t2t	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-doc_news.t2t	2020-02-09 11:59:04.158036000 +0100
>@@ -0,0 +1,11 @@
>+--- doc/news.t2t.orig	2020-02-09 10:55:48 UTC
>++++ doc/news.t2t
>+@@ -10,7 +10,7 @@ Change history for the QGIS Project
>+ %! 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
>+ % -------------------
>diff -urN qgis-ltr.orig/files/patch-scripts_release.pl qgis-ltr/files/patch-scripts_release.pl
>--- qgis-ltr.orig/files/patch-scripts_release.pl	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-scripts_release.pl	2020-02-09 11:59:04.161175000 +0100
>@@ -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" );
>diff -urN qgis-ltr.orig/files/patch-scripts_update-news.pl qgis-ltr/files/patch-scripts_update-news.pl
>--- qgis-ltr.orig/files/patch-scripts_update-news.pl	1970-01-01 01:00:00.000000000 +0100
>+++ qgis-ltr/files/patch-scripts_update-news.pl	2020-02-09 11:59:04.162460000 +0100
>@@ -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
>+

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 243998: 211496 | 211499