From 800c44427e48d5062f9e0514e2ce1405b9ee3fd25f7f91c0206a1ae7c4f8c988 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 12 Oct 2024 19:39:15 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=118

---
 encoding.patch            | 12 ++++++++++++
 java8-compatibility.patch |  6 ++----
 xmlgraphics-fop.changes   |  3 +++
 xmlgraphics-fop.spec      |  8 +++++---
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 encoding.patch

diff --git a/encoding.patch b/encoding.patch
new file mode 100644
index 0000000..0ad62f9
--- /dev/null
+++ b/encoding.patch
@@ -0,0 +1,12 @@
+diff -urEwbB fop-2.10/fop/build.xml fop-2.10/fop/build.xml
+--- fop-2.10/fop/build.xml	2024-10-11 13:58:44.468271086 +0200
++++ fop-2.10/fop/build.xml	2024-10-11 14:04:37.160704185 +0200
+@@ -185,7 +186,7 @@
+     <javac fork="${javac.fork}"
+       debug="${javac.debug}"
+       deprecation="${javac.deprecation}"
+-      optimize="${javac.optimize}"
++      optimize="${javac.optimize}" encoding="utf-8"
+       source="${javac.source}" target="${javac.target}"/>
+   </presetdef>
+   
diff --git a/java8-compatibility.patch b/java8-compatibility.patch
index d44888e..2c90fd1 100644
--- a/java8-compatibility.patch
+++ b/java8-compatibility.patch
@@ -13,13 +13,11 @@ diff -urEwbB fop-2.10/fop/build.xml fop-2.10/fop/build.xml
    <property name="javac.fork" value="no"/>
    <property name="junit.fork" value="yes"/>
    <property name="junit.haltonfailure" value="off"/>
-@@ -185,8 +186,8 @@
-     <javac fork="${javac.fork}"
+@@ -186,7 +187,7 @@
        debug="${javac.debug}"
        deprecation="${javac.deprecation}"
--      optimize="${javac.optimize}"
+       optimize="${javac.optimize}" encoding="utf-8"
 -      source="${javac.source}" target="${javac.target}"/>
-+      optimize="${javac.optimize}" encoding="utf-8"
 +      release="${javac.release}" source="${javac.source}" target="${javac.target}"/>
    </presetdef>
    
diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes
index 0275f46..aa84864 100644
--- a/xmlgraphics-fop.changes
+++ b/xmlgraphics-fop.changes
@@ -81,6 +81,9 @@ Sat Oct 12 16:27:41 UTC 2024 - Fridrich Strba <fstrba@suse.com>
   * xmlgraphics-fop-cli.patch
   * fop-2.5-QDox-2.0.patch -> fop-2.10-QDox-2.0.patch
     + rediff
+- Added patches:
+  * encoding.patch
+    + specify encoding utf-8 to fix build with some versions of JDK
 - Adapt the scripts to the fact that javapackages-tools do not
   require the JAVA_HOME to be set any more
 
diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec
index bb22b39..c1df7c6 100644
--- a/xmlgraphics-fop.spec
+++ b/xmlgraphics-fop.spec
@@ -38,11 +38,12 @@ Source12:       %{name}-fontlist.xml
 Patch1:         xmlgraphics-fop-cli.patch
 Patch2:         hyphenation-more-stack.patch
 Patch3:         fix-javadoc-java8.patch
-Patch4:         java8-compatibility.patch
+Patch4:         encoding.patch
 # PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024
 Patch5:         reproducible-build-manifest.patch
 Patch6:         fop-2.10-QDox-2.0.patch
 Patch7:         reproducible.patch
+Patch8:         java8-compatibility.patch
 BuildRequires:  ant >= 1.9.15
 BuildRequires:  apache-pdfbox >= 2.0.23
 BuildRequires:  bouncycastle
@@ -82,12 +83,13 @@ find -name "*.jar" | xargs -t rm
 %patch -P 1 -p1 -b .cli
 %patch -P 2 -p1
 %patch -P 3 -p1
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
 %patch -P 4 -p1
-%endif
 %patch -P 5 -p1
 %patch -P 6 -p1
 %patch -P 7 -p1
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+%patch -P 8 -p1
+%endif
 
 # Replace keyword "VERSION" in XML files with the real one:
 for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do