Drop upstreamed patches
Julian Wollrath
7 years ago
| 0 | From: Julian Wollrath <jwollrath@web.de> | |
| 1 | Date: Fri, 26 Dec 2014 17:19:57 +0100 | |
| 2 | Subject: Remove non-existing 'one 1.md' from tests/config.ld | |
| 3 | ||
| 4 | --- | |
| 5 | tests/config.ld | 2 +- | |
| 6 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 7 | ||
| 8 | diff --git a/tests/config.ld b/tests/config.ld | |
| 9 | index 22b4983..08621bc 100644 | |
| 10 | --- a/tests/config.ld | |
| 11 | +++ b/tests/config.ld | |
| 12 | @@ -2,4 +2,4 @@ format='markdown' | |
| 13 | project = 'Basic Example' | |
| 14 | file = {'types.lua','classes.lua'} | |
| 15 | use_markdown_titles=true | |
| 16 | -topics = {'one 1.md','two.md'} | |
| 17 | +topics = {'two.md'} |
| 0 | From: Enrico Tassi <gareuselesinge@debian.org> | |
| 1 | Date: Mon, 17 Aug 2015 14:39:14 +0200 | |
| 2 | Subject: Fix broken template (missing closing bracket) | |
| 3 | ||
| 4 | --- | |
| 5 | ldoc/html/ldoc_ltp.lua | 2 +- | |
| 6 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 7 | ||
| 8 | diff --git a/ldoc/html/ldoc_ltp.lua b/ldoc/html/ldoc_ltp.lua | |
| 9 | index 07c8a84..7033ad5 100644 | |
| 10 | --- a/ldoc/html/ldoc_ltp.lua | |
| 11 | +++ b/ldoc/html/ldoc_ltp.lua | |
| 12 | @@ -65,7 +65,7 @@ return [==[ | |
| 13 | # for kind, mods, type in ldoc.kinds() do | |
| 14 | # if ldoc.allowed_in_contents(type,module) then | |
| 15 | <h2>$(kind)</h2> | |
| 16 | -<ul class="$(kind=='Topics' and '' or 'nowrap'"> | |
| 17 | +<ul class="$(kind=='Topics' and '' or 'nowrap')"> | |
| 18 | # for mod in mods() do local name = ldoc.module_name(mod) | |
| 19 | # if mod.name == this_mod then | |
| 20 | <li><strong>$(name)</strong></li> |
| 0 | From: Enrico Tassi <gareuselesinge@debian.org> | |
| 1 | Date: Tue, 18 Aug 2015 11:18:01 +0200 | |
| 2 | Subject: make system date override-able via --date | |
| 3 | ||
| 4 | --- | |
| 5 | ldoc.lua | 5 +++++ | |
| 6 | 1 file changed, 5 insertions(+) | |
| 7 | ||
| 8 | diff --git a/ldoc.lua b/ldoc.lua | |
| 9 | index ccdb65e..528c42c 100644 | |
| 10 | --- a/ldoc.lua | |
| 11 | +++ b/ldoc.lua | |
| 12 | @@ -62,6 +62,7 @@ ldoc, a documentation generator for Lua, vs 1.4.3 | |
| 13 | -M,--merge allow module merging | |
| 14 | -S,--simple no return or params, no summary | |
| 15 | -O,--one one-column output layout | |
| 16 | + --date (default system) use this date in generated doc | |
| 17 | --dump debug output dump | |
| 18 | --filter (default none) filter output as Lua data (e.g pl.pretty.dump) | |
| 19 | --tags (default none) show all references to given tags, comma-separated | |
| 20 | @@ -782,7 +783,11 @@ ldoc.modules = module_list | |
| 21 | ldoc.title = ldoc.title or args.title | |
| 22 | ldoc.project = ldoc.project or args.project | |
| 23 | ldoc.package = args.package:match '%a+' and args.package or nil | |
| 24 | +if args.date == 'system' then | |
| 25 | ldoc.updatetime = os.date("%Y-%m-%d %H:%M:%S") | |
| 26 | +else | |
| 27 | +ldoc.updatetime = args.date | |
| 28 | +end | |
| 29 | ||
| 30 | local html = require 'ldoc.html' | |
| 31 |
| 0 | This patch is a tweaked version of the git commit | |
| 1 | 707484790e63359d2216a05a8ae8750ed5af304b by JojoBoulix <pagth@passoire.fr> | |
| 2 | ||
| 3 | Honour the SOURCE_DATE_EPOCH environment variable | |
| 4 | ||
| 5 | When the environment variable SOURCE_DATE_EPOCH is set, use it as the epoch of | |
| 6 | the date to be written in the output. This allows to build reproducibly | |
| 7 | packages depending on LDoc to build their documentation, without any change to | |
| 8 | their code and build process. | |
| 9 | ||
| 10 | See https://reproducible-builds.org/specs/source-date-epoch/ | |
| 11 | ||
| 12 | Index: lua-ldoc-1.4.3/ldoc.lua | |
| 13 | =================================================================== | |
| 14 | --- lua-ldoc-1.4.3.orig/ldoc.lua | |
| 15 | +++ lua-ldoc-1.4.3/ldoc.lua | |
| 16 | @@ -783,10 +783,14 @@ ldoc.modules = module_list | |
| 17 | ldoc.title = ldoc.title or args.title | |
| 18 | ldoc.project = ldoc.project or args.project | |
| 19 | ldoc.package = args.package:match '%a+' and args.package or nil | |
| 20 | -if args.date == 'system' then | |
| 21 | -ldoc.updatetime = os.date("%Y-%m-%d %H:%M:%S") | |
| 22 | +if os.getenv("SOURCE_DATE_EPOCH") == nil then | |
| 23 | + if args.date == 'system' then | |
| 24 | + ldoc.updatetime = os.date("%Y-%m-%d %H:%M:%S") | |
| 25 | + else | |
| 26 | + ldoc.updatetime = args.date | |
| 27 | + end | |
| 28 | else | |
| 29 | -ldoc.updatetime = args.date | |
| 30 | + ldoc.updatetime = os.date("!%Y-%m-%d %H:%M:%S",os.getenv("SOURCE_DATE_EPOCH")) | |
| 31 | end | |
| 32 | ||
| 33 | local html = require 'ldoc.html' |