From 53f6f2ec07e5e540f2038ba9619c0c8252a92f92 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Tue, 31 May 2022 10:04:08 +0800 Subject: [PATCH] Fix the compilation fails due to the upgrade of objectweb-asm. (cherry picked from commit 129e4fd7140efd5bbed0939cec8091bdd54789dd) --- fix-compilation-fails.patch | 53 +++++++++++++++++++++++++++++++++++++ reflectasm.spec | 8 ++++-- 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 fix-compilation-fails.patch diff --git a/fix-compilation-fails.patch b/fix-compilation-fails.patch new file mode 100644 index 0000000..a4d5488 --- /dev/null +++ b/fix-compilation-fails.patch @@ -0,0 +1,53 @@ +From e3a88f6362f45476a5530b90a6b06635ca657ef1 Mon Sep 17 00:00:00 2001 +From: NathanSweet +Date: Sat, 11 Jan 2020 19:24:20 +0100 +Subject: [PATCH] Generate 1.6 classes (previously 1.1). + +--- + src/com/esotericsoftware/reflectasm/ConstructorAccess.java | 2 +- + src/com/esotericsoftware/reflectasm/FieldAccess.java | 2 +- + src/com/esotericsoftware/reflectasm/MethodAccess.java | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java +index eafbab1..3eb1da2 100644 +--- a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java ++++ b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java +@@ -90,7 +90,7 @@ public abstract class ConstructorAccess { + "com/esotericsoftware/reflectasm/ConstructorAccess"; + + ClassWriter cw = new ClassWriter(0); +- cw.visit(V1_1, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, superclassNameInternal, null); ++ cw.visit(V1_6, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, superclassNameInternal, null); + + insertConstructor(cw, superclassNameInternal); + insertNewInstance(cw, classNameInternal); +diff --git a/src/com/esotericsoftware/reflectasm/FieldAccess.java b/src/com/esotericsoftware/reflectasm/FieldAccess.java +index 075ba9a..ab7878f 100644 +--- a/src/com/esotericsoftware/reflectasm/FieldAccess.java ++++ b/src/com/esotericsoftware/reflectasm/FieldAccess.java +@@ -129,7 +129,7 @@ public abstract class FieldAccess { + String classNameInternal = className.replace('.', '/'); + + ClassWriter cw = new ClassWriter(0); +- cw.visit(V1_1, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, "com/esotericsoftware/reflectasm/FieldAccess", ++ cw.visit(V1_6, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, "com/esotericsoftware/reflectasm/FieldAccess", + null); + insertConstructor(cw); + insertGetObject(cw, classNameInternal, fields); +diff --git a/src/com/esotericsoftware/reflectasm/MethodAccess.java b/src/com/esotericsoftware/reflectasm/MethodAccess.java +index 983439f..3cc3393 100644 +--- a/src/com/esotericsoftware/reflectasm/MethodAccess.java ++++ b/src/com/esotericsoftware/reflectasm/MethodAccess.java +@@ -116,7 +116,7 @@ public abstract class MethodAccess { + + ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); + MethodVisitor mv; +- cw.visit(V1_1, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, "com/esotericsoftware/reflectasm/MethodAccess", ++ cw.visit(V1_6, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, "com/esotericsoftware/reflectasm/MethodAccess", + null); + { + mv = cw.visitMethod(ACC_PUBLIC, "", "()V", null, null); +-- +2.30.0 + diff --git a/reflectasm.spec b/reflectasm.spec index a30c5be..aa8b8ce 100644 --- a/reflectasm.spec +++ b/reflectasm.spec @@ -1,11 +1,12 @@ #Basic Information Name: reflectasm Version: 1.11.0 -Release: 8 +Release: 9 Summary: High performance Java library that provides reflection by using code generation License: BSD-3-Clause URL: https://github.com/EsotericSoftware/reflectasm Source0: https://github.com/EsotericSoftware/reflectasm/archive/%{name}-%{version}.tar.gz +Patch0: fix-compilation-fails.patch BuildArch: noarch #Dependency @@ -28,7 +29,7 @@ This package contains javadoc for %{name}. #Build sections %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -n %{name}-%{name}-%{version} -p1 find -name "*.class" -delete find -name "*.jar" -delete @@ -57,6 +58,9 @@ rm -r test/com/esotericsoftware/reflectasm/ClassLoaderTest.java %license license.txt %changelog +* Tue May 31 2022 yaoxin - 1.11.0-9 +- Fix the compilation fails due to the upgrade of objectweb-asm. + * Fri Dec 06 2019 openEuler Buildteam - 1.11.0-8 - Package init