From c2700e87eb8f3043b972b83e7382523fccd6a43f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Fri, 13 Oct 2023 18:22:04 +0200 Subject: [PATCH] update dto 8.0 - https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-8.0 --- .gitignore | 1 + ...a244b592445962cdd15ca33f80449f9aa2ea.patch | 60 ------------------- java-runtime-decompiler.spec | 12 ++-- sources | 2 +- systemJasm.patch | 2 +- systemJasmG.patch | 2 +- systemJcoder.patch | 2 +- systemJcoderG.patch | 2 +- 8 files changed, 13 insertions(+), 70 deletions(-) delete mode 100644 2b99a244b592445962cdd15ca33f80449f9aa2ea.patch diff --git a/.gitignore b/.gitignore index 5c6e117..60c8c51 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /java-runtime-decompiler-7.1.tar.gz /java-runtime-decompiler-7.2.tar.gz /java-runtime-decompiler-7.3.tar.gz +/java-runtime-decompiler-8.0.tar.gz diff --git a/2b99a244b592445962cdd15ca33f80449f9aa2ea.patch b/2b99a244b592445962cdd15ca33f80449f9aa2ea.patch deleted file mode 100644 index 1b258f8..0000000 --- a/2b99a244b592445962cdd15ca33f80449f9aa2ea.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 2b99a244b592445962cdd15ca33f80449f9aa2ea -Author: Jiri -Date: Tue Jul 11 10:16:41 2023 +0200 - - isTreatAllTabsAsOneBatch returns false in jrd mode and is not shown - -diff --git a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java b/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java -index 3e87e6d..a8db71a 100644 ---- a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java -+++ b/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java -@@ -574,18 +574,20 @@ public class TextWithControls extends JPanel - } - }); - advanced.add(setMethod); -- JCheckBox treatAllAsOne = new JCheckBox("Treat all tabs in this window as single batch"); -- Container parent = getParentWindow(); -- if (parent != null) { -- treatAllAsOne.addActionListener(new ActionListener() { -- @Override -- public void actionPerformed(ActionEvent actionEvent) { -- setTreatAllTabsAsOneBatch(treatAllAsOne.isSelected()); -- repaintMenu(menu); -- } -- }); -- treatAllAsOne.setSelected(isTreatAllTabsAsOneBatch()); -- advanced.add(treatAllAsOne); -+ if (getParentWindow()!=null) { -+ JCheckBox treatAllAsOne = new JCheckBox("Treat all tabs in this window as single batch"); -+ Container parent = getParentWindow(); -+ if (parent != null) { -+ treatAllAsOne.addActionListener(new ActionListener() { -+ @Override -+ public void actionPerformed(ActionEvent actionEvent) { -+ setTreatAllTabsAsOneBatch(treatAllAsOne.isSelected()); -+ repaintMenu(menu); -+ } -+ }); -+ treatAllAsOne.setSelected(isTreatAllTabsAsOneBatch()); -+ advanced.add(treatAllAsOne); -+ } - } - if (hasVm(classesAndMethodsProvider)) { - JCheckBox addToBoot = new JCheckBox( -@@ -908,10 +910,16 @@ public class TextWithControls extends JPanel - } - - private void setTreatAllTabsAsOneBatch(boolean selected) { -+ if (getParentWindow() == null) { -+ return ; -+ } - getParentWindow().setTreatAllTabsAsOneBatch(selected); - } - - private boolean isTreatAllTabsAsOneBatch() { -+ if (getParentWindow() == null) { -+ return false; -+ } - return getParentWindow().isTreatAllTabsAsOneBatch(); - } - diff --git a/java-runtime-decompiler.spec b/java-runtime-decompiler.spec index 4ec9aaa..3e3ddc6 100644 --- a/java-runtime-decompiler.spec +++ b/java-runtime-decompiler.spec @@ -1,7 +1,7 @@ Summary: Application for extraction and decompilation of JVM byte code Name: java-runtime-decompiler -Version: 7.3 -Release: 3%{?dist} +Version: 8.0 +Release: 1%{?dist} License: GPLv3 URL: https://github.com/pmikova/java-runtime-decompiler Source0: https://github.com/pmikova/%{name}/archive/%{name}-%{version}.tar.gz @@ -22,7 +22,6 @@ Patch61: systemJcoder7.patch Patch62: systemJcoderG.patch Patch63: systemJcoderG7.patch Patch7: removeMultilineSpotbugs.patch -Patch8: 2b99a244b592445962cdd15ca33f80449f9aa2ea.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -93,7 +92,7 @@ Requires: %{name} = %{version}-%{release} This package provides bindings and requirements to CFR decompiler for %{name}. %package asmtools-plugin -Requires: openjdk-asmtools >= 8.0.b02.ea-0.3.20230113 +Requires: openjdk-asmtools >= 8.0.b09 Summary: asmtools disassembler and assembler plugin for %{name} Requires: %{name} = %{version}-%{release} @@ -124,7 +123,6 @@ This package provides bindings and requirements to asmtools7 disassembler and as %patch62 -p0 %patch63 -p0 %patch7 -p1 -%patch8 -p1 %build pushd runtime-decompiler @@ -230,6 +228,10 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.json %license LICENSE %changelog +* Fri Oct 13 2023 Fedora Release Engineering - 8.0-1 +- update dto 8.0 +- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-8.0 + * Thu Jul 20 2023 Fedora Release Engineering - 7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 2e91c7f..4ae273d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (java-runtime-decompiler-7.3.tar.gz) = dc45ee8fa53d3f3f6479f9d2d8978a714731d1cb333fe4e15321564bc049d6cde90e2e618d304df24bbcb6dec23cca6cb5373e867c8ec45212746b344e65a1e2 +SHA512 (java-runtime-decompiler-8.0.tar.gz) = 0cc785efe5d678a4882ede71639c15d0d8c5496eab13fb6079b0030b1dca0c3b272401bddabd470a9830037d9978cecd46bc431b172f89bc32ec877e416e23d0 diff --git a/systemJasm.patch b/systemJasm.patch index eff068f..dc2991d 100644 --- a/systemJasm.patch +++ b/systemJasm.patch @@ -6,7 +6,7 @@ - "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/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJasmG.patch b/systemJasmG.patch index 0171e99..81b6665 100644 --- a/systemJasmG.patch +++ b/systemJasmG.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JasmGDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JasmGDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJcoder.patch b/systemJcoder.patch index cf6ce68..bd2690a 100644 --- a/systemJcoder.patch +++ b/systemJcoder.patch @@ -6,7 +6,7 @@ - "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/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJcoderG.patch b/systemJcoderG.patch index 85d8a63..4e07a9c 100644 --- a/systemJcoderG.patch +++ b/systemJcoderG.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JcoderGDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JcoderGDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools"