Attachment 879431 Details for Bug 1081467 – fix

[patch] fix

0001-Port-to-objectweb-asm-5.0.1.patch (text/plain), 4.72 KB, created by Michal Srb on 2014-03-27 12:01:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2014-03-27 12:01:59 UTC

Size: 4.72 KB

patch

obsolete

>From 26e75e61e698d2ab133e168b6e5fcc784efdcaa6 Mon Sep 17 00:00:00 2001
>From: Michal Srb <msrb@redhat.com>
>Date: Thu, 27 Mar 2014 12:59:33 +0100
>Subject: [PATCH] Port to objectweb-asm 5.0.1
>
>---
> parboiled-port-to-objectweb-asm-5.0.1.patch | 54 +++++++++++++++++++++++++++++
> parboiled.spec                              |  9 +++--
> 2 files changed, 61 insertions(+), 2 deletions(-)
> create mode 100644 parboiled-port-to-objectweb-asm-5.0.1.patch
>
>diff --git a/parboiled-port-to-objectweb-asm-5.0.1.patch b/parboiled-port-to-objectweb-asm-5.0.1.patch
>new file mode 100644
>index 0000000..949bd0e
>--- /dev/null
>+++ b/parboiled-port-to-objectweb-asm-5.0.1.patch
>@@ -0,0 +1,54 @@
>+From 66129b1155188b4c2b1d3b34641a7118fd99eb51 Mon Sep 17 00:00:00 2001
>+From: Michal Srb <msrb@redhat.com>
>+Date: Thu, 27 Mar 2014 10:59:08 +0100
>+Subject: [PATCH] Port to objectweb-asm 5.0.1
>+
>+---
>+ .../src/main/java/org/parboiled/transform/ParserClassNode.java         | 2 ++
>+ parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java   | 3 ++-
>+ 2 files changed, 4 insertions(+), 1 deletion(-)
>+
>+diff --git a/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java b/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java
>+index 6534f24..3da751b 100644
>+--- a/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java
>++++ b/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java
>+@@ -26,6 +26,7 @@ import static org.parboiled.common.Preconditions.*;
>+ import org.objectweb.asm.Type;
>+ import org.objectweb.asm.tree.ClassNode;
>+ import org.objectweb.asm.tree.MethodNode;
>++import org.objectweb.asm.Opcodes;
>+ 
>+ import java.util.*;
>+ 
>+@@ -39,6 +40,7 @@ class ParserClassNode extends ClassNode {
>+     private Class<?> extendedClass;
>+ 
>+     public ParserClassNode(Class<?> parentClass) {
>++        super(Opcodes.ASM4);
>+         this.parentClass = checkArgNotNull(parentClass, "parentClass");
>+         parentType = Type.getType(parentClass);
>+     }
>+diff --git a/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java b/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java
>+index c60ef8a..8c023ca 100644
>+--- a/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java
>++++ b/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java
>+@@ -31,6 +31,7 @@ import org.objectweb.asm.tree.LabelNode;
>+ import org.objectweb.asm.tree.LocalVariableNode;
>+ import org.objectweb.asm.tree.MethodNode;
>+ import org.objectweb.asm.tree.analysis.BasicValue;
>++import org.objectweb.asm.Opcodes;
>+ import org.parboiled.BaseParser;
>+ import org.parboiled.common.StringUtils;
>+ import org.parboiled.support.Var;
>+@@ -71,7 +72,7 @@ class RuleMethod extends MethodNode {
>+ 
>+     public RuleMethod(Class<?> ownerClass, int access, String name, String desc, String signature, String[] exceptions,
>+                       boolean hasExplicitActionOnlyAnno, boolean hasDontLabelAnno, boolean hasSkipActionsInPredicates) {
>+-        super(access, name, desc, signature, exceptions);
>++        super(Opcodes.ASM4, access, name, desc, signature, exceptions);
>+         this.ownerClass = ownerClass;
>+         parameterCount = Type.getArgumentTypes(desc).length;
>+         hasCachedAnnotation = parameterCount == 0;
>+-- 
>+1.9.0
>+
>diff --git a/parboiled.spec b/parboiled.spec
>index 6a240be..c9cc893 100644
>--- a/parboiled.spec
>+++ b/parboiled.spec
>@@ -1,7 +1,7 @@
> %global scala_short_version 2.10
> Name:          parboiled
> Version:       1.1.6
>-Release:       2%{?dist}
>+Release:       3%{?dist}
> Summary:       Java/Scala library providing parsing of input text based on PEGs
> License:       ASL 2.0
> URL:           http://parboiled.org/
>@@ -13,6 +13,7 @@ Source2:       http://repo1.maven.org/maven2/org/parboiled/%{name}-java/%{versio
> Source3:       %{name}-pom.xml
> Source4:       http://repo1.maven.org/maven2/org/parboiled/%{name}-scala_%{scala_short_version}/%{version}/%{name}-scala_%{scala_short_version}-%{version}.pom
> Patch0:        %{name}-1.1.6-scala-use-antrun-plugin.patch
>+Patch1:        parboiled-port-to-objectweb-asm-5.0.1.patch
> 
> BuildRequires: java-devel
> 
>@@ -122,6 +123,7 @@ done
> </executions>"
> 
> %patch0 -p0
>+%patch1 -p1
> 
> cp -p %{SOURCE3} pom.xml
> sed -i "s|@VERSION@|%{version}|" pom.xml
>@@ -152,6 +154,9 @@ sed -i "s|@VERSION@|%{version}|" pom.xml
> %doc LICENSE
> 
> %changelog
>+* Thu Mar 27 2014 Michal Srb <msrb@redhat.com> - 1.1.6-3
>+- Port to objectweb-asm 5.0.1
>+
> * Thu Mar 20 2014 gil cattaneo <puntogil@libero.it> 1.1.6-2
> - add scala support
> 
>@@ -176,4 +181,4 @@ sed -i "s|@VERSION@|%{version}|" pom.xml
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
> * Tue Jun 12 2012 gil cattaneo <puntogil@libero.it> 1.0.2-1
>-- initial rpm
>\ No newline at end of file
>+- initial rpm
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1081467: 879431