!6 Fix build failure caused by batik upgrade to 1.17
From: @starlet-dx Reviewed-by: @cherry530 Signed-off-by: @cherry530
This commit is contained in:
commit
000a1c3592
27
Update-to-newer-batik.patch
Normal file
27
Update-to-newer-batik.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From d5b0798c2b6bd1aa8c65e5c744beb5d5096d1e54 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Simon Steiner <ssteiner@apache.org>
|
||||||
|
Date: Tue, 15 Jan 2019 14:18:05 +0000
|
||||||
|
Subject: [PATCH] Update to newer batik
|
||||||
|
|
||||||
|
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1851362 13f79535-47bb-0310-9956-ffa450edef68
|
||||||
|
|
||||||
|
Origin:
|
||||||
|
https://github.com/apache/xmlgraphics-fop/commit/d5b0798c2b6bd1aa8c65e5c744beb5d5096d1e54
|
||||||
|
---
|
||||||
|
.../java/org/apache/fop/svg/SVGUtilities.java | 2 +-
|
||||||
|
fop/lib/batik-all-1.11.0-SNAPSHOT.jar | Bin 4292764 -> 4288813 bytes
|
||||||
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java b/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java
|
||||||
|
index d75aa209988..31d39d96efc 100644
|
||||||
|
--- a/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java
|
||||||
|
+++ b/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
import org.w3c.dom.Element;
|
||||||
|
|
||||||
|
import org.apache.batik.anim.dom.SVGDOMImplementation;
|
||||||
|
-import org.apache.batik.util.XMLConstants;
|
||||||
|
+import org.apache.batik.constants.XMLConstants;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Some utilities for creating svg DOM documents and elements.
|
||||||
6
fop.spec
6
fop.spec
@ -1,6 +1,6 @@
|
|||||||
Name: fop
|
Name: fop
|
||||||
Version: 2.2
|
Version: 2.2
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Formatter for printing XSL-driven XML Files
|
Summary: Formatter for printing XSL-driven XML Files
|
||||||
License: BSD and Apache-2.0 and MIT and Apache-1.1
|
License: BSD and Apache-2.0 and MIT and Apache-1.1
|
||||||
URL: https://xmlgraphics.apache.org/fop
|
URL: https://xmlgraphics.apache.org/fop
|
||||||
@ -14,6 +14,7 @@ Patch0001: Disable-javadoc-doclint.patch
|
|||||||
Patch0002: Port-to-QDox-2.0.patch
|
Patch0002: Port-to-QDox-2.0.patch
|
||||||
Patch0003: Allow-javascript-in-javadoc.patch
|
Patch0003: Allow-javascript-in-javadoc.patch
|
||||||
Patch0004: Non-free-colour-profile-was-removed.patch
|
Patch0004: Non-free-colour-profile-was-removed.patch
|
||||||
|
Patch0005: Update-to-newer-batik.patch
|
||||||
BuildRequires: ant apache-commons-io apache-commons-logging avalon-framework
|
BuildRequires: ant apache-commons-io apache-commons-logging avalon-framework
|
||||||
BuildRequires: batik fontbox javapackages-local junit qdox servlet
|
BuildRequires: batik fontbox javapackages-local junit qdox servlet
|
||||||
BuildRequires: xmlunit xmlgraphics-commons >= 1.5
|
BuildRequires: xmlunit xmlgraphics-commons >= 1.5
|
||||||
@ -82,6 +83,9 @@ install -D -p -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 08 2023 yaoxin <yao_xin001@hoperun.com> - 2.2-6
|
||||||
|
- Fix build failure caused by batik upgrade to 1.17
|
||||||
|
|
||||||
* Mon Jan 18 2021 caodongxia <caodongxia@huawei.com> - 2.2-5
|
* Mon Jan 18 2021 caodongxia <caodongxia@huawei.com> - 2.2-5
|
||||||
- Modify license information.
|
- Modify license information.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user