From 82c25ec80a14a0a95eeaab00913ea9e7c10b206f Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Thu, 5 Aug 2021 15:29:26 +0200
Subject: [PATCH] Patched cfr and asmtools plugins to use system libraries

---
 java-runtime-decompiler.spec | 17 ++++++++++++++++-
 systemCfr.patch              | 14 ++++++++++++++
 systemJasm.patch             | 14 ++++++++++++++
 systemJcoder.patch           | 14 ++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 systemCfr.patch
 create mode 100644 systemJasm.patch
 create mode 100644 systemJcoder.patch

diff --git a/java-runtime-decompiler.spec b/java-runtime-decompiler.spec
index d5c5b8f..a605191 100644
--- a/java-runtime-decompiler.spec
+++ b/java-runtime-decompiler.spec
@@ -11,6 +11,11 @@ Source3: jrd.desktop
 Patch1: systemFernflower.patch
 Patch2: systemProcyon.patch
 Patch3: rsyntaxVersion.patch
+Patch4: systemCfr.patch
+Patch5: systemJasm.patch
+Patch6: systemJcoder.patch
+
+
 BuildArch: noarch
 BuildRequires: maven-local
 BuildRequires: byteman
@@ -50,6 +55,9 @@ This package contains the API documentation for %{name}.
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
 
 %build
 pushd runtime-decompiler
@@ -82,6 +90,12 @@ desktop-file-install --vendor="fedora"                     \
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/FernflowerDecompilerWrapper.json
 %config %{_sysconfdir}/%{name}/plugins/ProcyonDecompilerWrapper.java
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/ProcyonDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JcoderDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JcoderDecompilerWrapper.json
 %license LICENSE
 
 %dir %{_datadir}/applications
@@ -94,7 +108,8 @@ desktop-file-install --vendor="fedora"                     \
 * Thu Aug 02 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.beta2-1
 - updated to 5.0
 - removed jdk8 subpkg due to compiler api
-- todo: Cfr and asmtools plugins, man page
+- added Cfr and asmtools plugins
+- todo man page
 
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/systemCfr.patch b/systemCfr.patch
new file mode 100644
index 0000000..2a0a77d
--- /dev/null
+++ b/systemCfr.patch
@@ -0,0 +1,14 @@
+--- runtime-decompiler/src/plugins/CfrDecompilerWrapper.json
++++ runtime-decompiler/src/plugins/CfrDecompilerWrapper.json
+@@ -1,8 +1,8 @@
+ {
+   "Name": "Cfr",
+-  "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/CfrDecompilerWrapper.java",
++  "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/CfrDecompilerWrapper.java",
+   "DependencyURL": [
+-    "file://${HOME}/.m2/repository/org/benf/cfr/0.151/cfr-0.151.jar"
++    "file:/usr/share/java/CFR/cfr.jar"
+   ],
+   "DecompilerDownloadURL": "https://www.benf.org/other/cfr/faq.html"
+ }
+
diff --git a/systemJasm.patch b/systemJasm.patch
new file mode 100644
index 0000000..b5099af
--- /dev/null
+++ b/systemJasm.patch
@@ -0,0 +1,14 @@
+--- runtime-decompiler/src/plugins/JasmDecompilerWrapper.json	2018-11-12 15:25:47.000000000 +0100
++++ runtime-decompiler/src/plugins/JasmDecompilerWrapper.json	2019-01-16 12:13:37.317778036 +0100
+@@ -1,8 +1,8 @@
+ {
+   "Name": "jasm",
+-  "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JasmDecompilerWrapper.java",
++  "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JasmDecompilerWrapper.java",
+   "DependencyURL": [
+-    "file://${HOME}/.m2/repository/org/openjdk/asmtools/asmtools-core/7.0.b10-ea/asmtools-core-7.0.b10-ea.jar"
++    "file:/usr/share/java/openjdk-asmtools/asmtools-core.jar"
+   ],
+   "DecompilerDownloadURL": "https://github.com/openjdk/asmtools"
+ }
+
diff --git a/systemJcoder.patch b/systemJcoder.patch
new file mode 100644
index 0000000..1454b9e
--- /dev/null
+++ b/systemJcoder.patch
@@ -0,0 +1,14 @@
+--- runtime-decompiler/src/plugins/JcoderDecompilerWrapper.json	2018-11-12 15:25:47.000000000 +0100
++++ runtime-decompiler/src/plugins/JcoderDecompilerWrapper.json	2019-01-16 12:13:37.317778036 +0100
+@@ -1,8 +1,8 @@
+ {
+   "Name": "jcoder",
+-  "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JcoderDecompilerWrapper.java",
++  "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JcoderDecompilerWrapper.java",
+   "DependencyURL": [
+-    "file://${HOME}/.m2/repository/org/openjdk/asmtools/7.0.b10-ea/asmtools-core-7.0.b10-ea.jar"
++    "file:/usr/share/java/openjdk-asmtools/asmtools-core.jar"
+   ],
+   "DecompilerDownloadURL": "https://github.com/openjdk/asmtools"
+ }
+