From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Kei Kebreau <kkebreau@posteo.net>
Cc: "Ricardo Wurmus" <rekado@elephly.net>,
"Gábor Boskovits" <boskovits@gmail.com>,
33041@debbugs.gnu.org
Subject: [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Wed, 14 Jul 2021 09:34:40 -0400 [thread overview]
Message-ID: <871r81ow7j.fsf_-_@gmail.com> (raw)
In-Reply-To: <87o8j1xs96.fsf@posteo.net> (Kei Kebreau's message of "Thu, 10 Dec 2020 16:31:33 -0500")
Hi,
Kei Kebreau <kkebreau@posteo.net> writes:
> Hi all,
>
> I came across this bug and had some time to attempt to make the
> suggested changes. Please find the updated patch attached and let me
> know if it still works as intended.
[...]
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index e298fd9537..deaa9e1fcd 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -892,7 +892,10 @@ machine.")))
> (string-append part "-src"))
> part))
> '("jdk" "hotspot" "corba"
> - "langtools" "jaxp" "jaxws")))
> + "jaxp" "jaxws")))
> + (with-directory-excursion "openjdk"
> + (invoke "tar" "xvf" (assoc-ref inputs "langtools-src"))
> + (rename-file "hg-checkout" "langtools"))
> (substitute* "patches/freetypeversion.patch"
> (("REQUIRED_FREETYPE_VERSION = 2.2.1")
> "REQUIRED_FREETYPE_VERSION = 2.10.1"))
> @@ -1136,7 +1139,9 @@ machine.")))
> (changeset "jdk6-b41")))
> (sha256
> (base32
> - "1x52wd67fynbbd9ild6fb4wvba3f5hhwk03qdjfazd0a1qr37z3d"))))
> + "1x52wd67fynbbd9ild6fb4wvba3f5hhwk03qdjfazd0a1qr37z3d"))
> + (patches
> + (search-patches "icedtea-6-javadoc-reproducibility.patch"))))
> ("jaxp-src"
> ,(origin
> (method hg-fetch)
> diff --git a/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch b/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch
> new file mode 100644
> index 0000000000..dd472a9c66
> --- /dev/null
> +++ b/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch
> @@ -0,0 +1,25 @@
> +# HG changeset patch
> +# User Gábor Boskovits <boskovits@gmail.com>
> +# Date 1539456874 -7200
> +# Sat Oct 13 20:54:34 2018 +0200
> +# Node ID 6e5f716a659247888c104f66c58bf40fb959c8a4
> +# Parent 06656286f572cbf716397b9d983f8dee7d94f913
> +Make javadoc respect SOURCE_DATE_EPOCH.
> +
> +diff -r 06656286f572 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
> +--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Mon Aug 22 10:53:55 2016 -0700
> ++++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Wed Dec 09 21:40:00 2020 -0500
> +@@ -396,6 +396,12 @@
> + */
> + public String today() {
> + Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
> +- return calendar.getTime().toString();
> ++ Date date=calendar.getTime();
> ++ String epoch=System.getenv("SOURCE_DATE_EPOCH");
> ++ if(epoch != null) {
> ++ long unixtime=Long.parseLong(epoch);
> ++ date=new Date(unixtime*1000L);
> ++ }
> ++ return date.toString();
> + }
> + }
I tried this patch but it didn't work for me:
--8<---------------cut here---------------start------------->8---
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicyHelper.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicyHelper.html
116c116
< Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
> Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicy.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicy.html
129c129
< Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
> Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.html
102c102
< Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
> Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.html
102c102
< Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
> Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/THREAD_POLICY_ID.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/THREAD_POLICY_ID.html
102c102
< Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
> Wednesday, July 14, 2021 12:14:11 AM GMT</div>
--8<---------------cut here---------------end--------------->8---
Could you retest it to validate it's working as expected?
Thank you,
Maxim
next prev parent reply other threads:[~2021-07-14 13:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-14 19:06 [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible Gábor Boskovits
2018-10-17 7:58 ` Danny Milosavljevic
2020-05-14 17:58 ` Ricardo Wurmus
2020-05-14 18:22 ` Gábor Boskovits
2020-12-10 21:31 ` Kei Kebreau
2021-07-14 13:34 ` Maxim Cournoyer [this message]
2024-03-07 22:24 ` bug#33041: " Vagrant Cascadian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871r81ow7j.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=33041@debbugs.gnu.org \
--cc=boskovits@gmail.com \
--cc=kkebreau@posteo.net \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.