openkylin
/
xmlgraphics-commons
mirror of https://gitee.com/openkylin/xmlgraphics-commons.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
luoyaoming 2024-05-07 11:00:03 +08:00
parent edf15c3d82
commit 44bfaeaa16
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
debian/patches/0001-XMPSchemaAdapter.java-Use-UTC-timezone-when-SOURCE_D.patch vendored
View File

@ -1,24 +1,25 @@
From 2146f4a44fbee1e3aef12e56ae3d904e793090cd Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 26 Feb 2021 19:10:10 +0000
Subject: [PATCH] XMPSchemaAdapter.java: Use UTC timezone when
SOURCE_DATE_EPOCH is set.
SOURCE_DATE_EPOCH specifies the timestamp, but needs to be rendered in
UTC timezone to ensure reproducible builds.
https://reproducible-builds.org/docs/source-date-epoch/
This is a follow-up to https://bugs.debian.org/978499 in apache fop,
as there is no way for fop itself to pass the timezone information for
some values.
---
.../java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java | 5 +++++
1 file changed, 5 insertions(+)
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 26 Feb 2021 19:10:10 +0000
Subject: [PATCH] XMPSchemaAdapter.java: Use UTC timezone when
SOURCE_DATE_EPOCH is set.
SOURCE_DATE_EPOCH specifies the timestamp, but needs to be rendered in
UTC timezone to ensure reproducible builds.
https://reproducible-builds.org/docs/source-date-epoch/
This is a follow-up to https://bugs.debian.org/978499 in apache fop,
as there is no way for fop itself to pass the timezone information for
some values.
---
src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java b/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
index 9a41eba..19811a8 100644
--- a/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
+++ b/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
@@ -157,6 +157,11 @@
@@ -157,6 +157,11 @@ public class XMPSchemaAdapter {
* @return the formatted date
*/
public static String formatISO8601Date(Date dt) {

17
debian/patches/XGC-133.patch vendored
View File

@ -1,12 +1,17 @@
Description: XGC-133: Fix test for Java 11
Author: Simon Steiner <simonsteiner1984@gmail.com>
From: Simon Steiner <simonsteiner1984@gmail.com>
Date: Tue, 7 May 2024 11:00:03 +0800
Subject: XGC-133: Fix test for Java 11
Bug: https://issues.apache.org/jira/browse/XGC-133
Reviewed-By: Mathieu Malaterre <malat@debian.org>
---
.../xmlgraphics/image/loader/CorruptImagesTestCase.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
Index: xmlgraphics-commons/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
===================================================================
--- xmlgraphics-commons.orig/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
+++ xmlgraphics-commons/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
diff --git a/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java b/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
index f05082a..99dd60e 100644
--- a/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
+++ b/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java
@@ -36,9 +36,14 @@ public class CorruptImagesTestCase {
ImageSessionContext sessionContext = imageContext.newSessionContext();