Accepting request 823403 from home:pmonrealgonzalez:branches:Java:packages

- Update to 1.7.7.1: * Release notes: https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md#rhino-1771 - Rebase patches: * rhino-addOrbitManifest.patch * rhino-build.patch - Remove pathes: * rhino-1.7R3-crosslink.patch * rhino-288467.patch * rhino-1.7-gcj.patch OBS-URL: https://build.opensuse.org/request/show/823403 OBS-URL: https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=48
2020-07-30 05:39:08 +00:00 · 2020-07-30 05:39:08 +00:00 · b068678f04
commit b068678f04
parent 1927494e68
13 changed files with 219 additions and 465 deletions
--- a/Rhino1_7_7_1_RELEASE.tar.gz
+++ b/Rhino1_7_7_1_RELEASE.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:277478f81c160953976c198beceab61a0b23b5d2633a84effd9236284aa301b1
+size 3002934
--- a/rhino-1.7-gcj.patch
+++ b/rhino-1.7-gcj.patch
@ -1,135 +0,0 @@
-Index: src/org/mozilla/javascript/FieldAndMethods.java
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ src/org/mozilla/javascript/FieldAndMethods.java	2012-01-13 11:42:37.110099483 +0100
-@@ -0,0 +1,84 @@
-+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ *
-+ * ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is Rhino code, released
-+ * May 6, 1999.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Norris Boyd
-+ *   Cameron McCormack
-+ *   Frank Mitchell
-+ *   Mike Shaver
-+ *   Kurt Westerfeld
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * the GNU General Public License Version 2 or later (the "GPL"), in which
-+ * case the provisions of the GPL are applicable instead of those above. If
-+ * you wish to allow use of your version of this file only under the terms of
-+ * the GPL and not to allow others to use your version of this file under the
-+ * MPL, indicate your decision by deleting the provisions above and replacing
-+ * them with the notice and other provisions required by the GPL. If you do
-+ * not delete the provisions above, a recipient may use your version of this
-+ * file under either the MPL or the GPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+package org.mozilla.javascript;
-+
-+import java.lang.reflect.*;
-+import java.util.*;
-+
-+public class FieldAndMethods extends NativeJavaMethod
-+{
-+    static final long serialVersionUID = -9222428244284796755L;
-+
-+    FieldAndMethods(Scriptable scope, MemberBox[] methods, Field field)
-+    {
-+        super(methods);
-+        this.field = field;
-+        setParentScope(scope);
-+        setPrototype(ScriptableObject.getFunctionPrototype(scope));
-+    }
-+
-+    @Override
-+    public Object getDefaultValue(Class<?> hint)
-+    {
-+        if (hint == ScriptRuntime.FunctionClass)
-+            return this;
-+        Object rval;
-+        Class<?> type;
-+        try {
-+            rval = field.get(javaObject);
-+            type = field.getType();
-+        } catch (IllegalAccessException accEx) {
-+            throw Context.reportRuntimeError1(
-+                "msg.java.internal.private", field.getName());
-+        }
-+        Context cx  = Context.getContext();
-+        rval = cx.getWrapFactory().wrap(cx, this, rval, type);
-+        if (rval instanceof Scriptable) {
-+            rval = ((Scriptable) rval).getDefaultValue(hint);
-+        }
-+        return rval;
-+    }
-+
-+    Field field;
-+    Object javaObject;
-+}
-Index: src/org/mozilla/javascript/JavaMembers.java
-===================================================================
--- src/org/mozilla/javascript/JavaMembers.java.orig	2011-05-09 20:04:34.000000000 +0200
-+++ src/org/mozilla/javascript/JavaMembers.java	2012-01-13 11:42:37.117099728 +0100
-@@ -909,41 +909,3 @@
-     MemberBox setter;
-     NativeJavaMethod setters;
- }
-
-class FieldAndMethods extends NativeJavaMethod
-{
-    static final long serialVersionUID = -9222428244284796755L;
-
-    FieldAndMethods(Scriptable scope, MemberBox[] methods, Field field)
-    {
-        super(methods);
-        this.field = field;
-        setParentScope(scope);
-        setPrototype(ScriptableObject.getFunctionPrototype(scope));
-    }
-
-    @Override
-    public Object getDefaultValue(Class<?> hint)
-    {
-        if (hint == ScriptRuntime.FunctionClass)
-            return this;
-        Object rval;
-        Class<?> type;
-        try {
-            rval = field.get(javaObject);
-            type = field.getType();
-        } catch (IllegalAccessException accEx) {
-            throw Context.reportRuntimeError1(
-                "msg.java.internal.private", field.getName());
-        }
-        Context cx  = Context.getContext();
-        rval = cx.getWrapFactory().wrap(cx, this, rval, type);
-        if (rval instanceof Scriptable) {
-            rval = ((Scriptable) rval).getDefaultValue(hint);
-        }
-        return rval;
-    }
-
-    Field field;
-    Object javaObject;
-}
--- a/rhino-1.7.7.1.pom
+++ b/rhino-1.7.7.1.pom
@ -0,0 +1,41 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
+
+  <groupId>org.mozilla</groupId>
+  <artifactId>rhino</artifactId>
+  <name>Mozilla Rhino</name>
+  <version>1.7.7.1</version>
+
+  <packaging>jar</packaging>
+  <description>
+      Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically
+      embedded into Java applications to provide scripting to end users.
+  </description>
+  <url>https://developer.mozilla.org/en/Rhino</url>
+
+  <licenses>
+    <license>
+      <name>Mozilla Public License, Version 2.0</name>
+      <url>http://www.mozilla.org/MPL/2.0/index.txt</url>
+    </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:git:git@github.com:mozilla/rhino.git</connection>
+    <developerConnection>scm:git:git@github.com:mozilla/rhino.git</developerConnection>
+    <url>git@github.com:mozilla/rhino.git</url>
+  </scm>
+
+  <organization>
+    <name>The Mozilla Foundation</name>
+    <url>http://www.mozilla.org</url>
+  </organization>
+</project>
--- a/rhino-1.7R3-crosslink.patch
+++ b/rhino-1.7R3-crosslink.patch
@ -1,11 +0,0 @@
-diff -up rhino1_7R3/build.xml~ rhino1_7R3/build.xml
--- rhino1_7R3/build.xml~	2011-05-09 20:04:38.000000000 +0300
-+++ rhino1_7R3/build.xml	2011-10-16 00:11:22.625045037 +0300
-@@ -220,6 +220,7 @@
-              destdir="${dist.dir}/javadoc"
-              version="true"
-              author="true"
-+             link="/usr/share/javadoc/java"
-              windowtitle="${Name}" />
-   </target>
- 
--- a/rhino-288467.patch
+++ b/rhino-288467.patch
@ -1,159 +0,0 @@
-Index: toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java
-===================================================================
--- toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java.orig	2009-11-16 15:55:49.986561156 +0100
-+++ toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java	2009-11-16 15:56:51.102061154 +0100
-@@ -42,6 +42,7 @@
- package org.mozilla.javascript.tools.debugger;
- 
- import javax.swing.*;
-+import javax.swing.filechooser.*;
- import javax.swing.text.*;
- import javax.swing.event.*;
- import javax.swing.table.*;
-@@ -333,7 +334,14 @@
-         statusBar = new JLabel();
-         statusBar.setText("Thread: ");
-         contentPane.add(statusBar, BorderLayout.SOUTH);
-        dlg = new JFileChooser();
-+        try {
-+            dlg = new JFileChooser();
-+        } catch (SecurityException e) {
-+            // Work around bug in JFileChooser when security is enforced.
-+            // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4802383
-+            dlg = new JFileChooser(new FileWrapper("."),
-+                                   new FileSystemViewWrapper());
-+        }
- 
-         javax.swing.filechooser.FileFilter filter =
-             new javax.swing.filechooser.FileFilter() {
-@@ -3592,7 +3600,130 @@
- 
-           default:
-             throw new IllegalArgumentException(String.valueOf(type));
-+        }
-+    }
-+}
-+
-+/**
-+ * A <code>FileSystemView</code> that ensures <code>File</code> objects
-+ * returned from methods are instances of <code>FileWrapper</code>.
-+ * This class is used to work around bugs in {@link JFileChooser}.
-+ */
-+class FileSystemViewWrapper extends FileSystemView {
- 
-+    private FileSystemView v = FileSystemView.getFileSystemView();
-+
-+    public File createFileObject(File dir, String filename) {
-+        return new FileWrapper(v.createFileObject(dir, filename));
-+    }
-+
-+    public File createFileObject(String path) {
-+        return new FileWrapper(v.createFileObject(path));
-+    }
-+
-+    public File createNewFolder(File containingDir) throws IOException {
-+        return new FileWrapper(v.createNewFolder(containingDir));
-+    }
-+
-+    public File getChild(File parent, String fileName) {
-+        return new FileWrapper(v.getChild(parent, fileName));
-+    }
-+
-+    public File getDefaultDirectory() {
-+        return new FileWrapper(v.getDefaultDirectory());
-+    }
-+
-+    public File[] getFiles(File dir, boolean useFileHiding) {
-+        File[] fs = v.getFiles(dir, useFileHiding);
-+        File[] ret = new File[fs.length];
-+        for (int i = 0; i < fs.length; i++) {
-+            ret[i] = new FileWrapper(fs[i]);
-         }
-+        return ret;
-+    }
-+
-+    public File getHomeDirectory() {
-+        return new FileWrapper(v.getHomeDirectory());
-+    }
-+
-+    public File getParentDirectory(File dir) {
-+        return new FileWrapper(v.getParentDirectory(dir));
-+    }
-+
-+    public File[] getRoots() {
-+        File[] fs = v.getRoots();
-+        File[] ret = new File[fs.length];
-+        for (int i = 0; i < fs.length; i++) {
-+            ret[i] = new FileWrapper(fs[i]);
-+        }
-+        return ret;
-+    }
-+
-+    public String getSystemDisplayName(File f) {
-+        return v.getSystemDisplayName(f);
-+    }
-+
-+    public Icon getSystemIcon(File f) {
-+        return getSystemIcon(f);
-+    }
-+
-+    public String getSystemTypeDescription(File f) {
-+        return v.getSystemTypeDescription(f);
-+    }
-+
-+    public boolean isComputerNode(File dir) {
-+        return v.isComputerNode(dir);
-+    }
-+
-+    public boolean isDrive(File dir) {
-+        return v.isDrive(dir);
-+    }
-+
-+    public boolean isFileSystem(File f) {
-+        return v.isFileSystem(f);
-+    }
-+
-+    public boolean isFileSystemRoot(File dir) {
-+        return v.isFileSystemRoot(dir);
-+    }
-+
-+    public boolean isFloppyDrive(File dir) {
-+        return v.isFloppyDrive(dir);
-+    }
-+
-+    public boolean isHiddenFile(File f) {
-+        return v.isHiddenFile(f);
-+    }
-+
-+    public boolean isParent(File folder, File file) {
-+        return v.isParent(folder, file);
-+    }
-+
-+    public boolean isRoot(File f) {
-+        return v.isRoot(f);
-+    }
-+
-+    public Boolean isTraversable(File f) {
-+        return v.isTraversable(f);
-+    }
-+}
-+
-+/**
-+ * A <code>File</code> that always returns <code>false</code> from
-+ * {@link #canWrite()}.  This class is used to work around bugs in
-+ * {@link JFileChooser}.
-+ */
-+class FileWrapper extends File {
-+
-+    public FileWrapper(File f) {
-+        this(f.toString());
-+    }
-+
-+    public FileWrapper(String pathname) {
-+        super(pathname);
-+    }
-+
-+    public boolean canWrite() {
-+        return false;
-     }
- }
--- a/rhino-addOrbitManifest.patch
+++ b/rhino-addOrbitManifest.patch
@ -1,23 +1,17 @@
-diff -up rhino1_7R3/src/manifest.fixManifest rhino1_7R3/src/manifest
--- rhino1_7R3/src/manifest.fixManifest	2011-05-09 20:04:34.000000000 +0200
-+++ rhino1_7R3/src/manifest	2011-09-14 17:46:28.331978606 +0200
-@@ -1,6 +1,31 @@
- Manifest-Version: 1.0
- Main-Class: org.mozilla.javascript.tools.shell.Main
-Implementation-Version: 1.7R2
-Implementation-Title: Mozilla Rhino 1.7R2
-+Implementation-Version: 1.7R3
-+Implementation-Title: Mozilla Rhino 1.7R3
+Index: src/manifest
+===================================================================
+--- src/manifest.orig
+++ src/manifest
+@@ -4,3 +4,28 @@ Implementation-Version: 1.7.7.1
+ Implementation-Title: Mozilla Rhino 1.7.7.1
 Implementation-Vendor: Mozilla Foundation
-Implementation-URL: http://www.mozilla.org/rhino
-\ Chybí znak konce řádku na konci souboru
-+Implementation-URL: http://www.mozilla.org/rhino
+ Implementation-URL: http://www.mozilla.org/rhino
 +Bundle-Vendor: %Bundle-Vendor.0
 +Bundle-Localization: plugin
 +Bundle-RequiredExecutionEnvironment: J2SE-1.5
 +Bundle-Name: %Bundle-Name.0
 +Bundle-SymbolicName: org.mozilla.javascript
-+Bundle-Version: 1.7.2.v201005080400
+Bundle-Version: 1.7.12
 +Export-Package: org.mozilla.classfile,org.mozilla.javascript,org.mozil
 + la.javascript.debug,org.mozilla.javascript.jdk13,org.mozilla.javascri
 + pt.jdk15,org.mozilla.javascript.optimizer,org.mozilla.javascript.rege
--- a/rhino-build.patch
+++ b/rhino-build.patch
@ -1,8 +1,6 @@
-Index: examples/Matrix.java
-===================================================================
--- examples/Matrix.java.orig	2011-05-09 20:04:38.000000000 +0200
-+++ examples/Matrix.java	2012-01-13 11:31:47.275360948 +0100
-@@ -249,7 +249,7 @@
+--- examples/Matrix.java
+++ examples/Matrix.java
+@@ -218,7 +218,7 @@ public class Matrix implements Scriptabl
      * Use the convenience method from Context that takes care of calling
      * toString, etc.
      */
@ -11,11 +9,9 @@ Index: examples/Matrix.java
         return "[object Matrix]";
     }
 
-Index: examples/PrimitiveWrapFactory.java
-===================================================================
--- examples/PrimitiveWrapFactory.java.orig	2011-05-09 20:04:38.000000000 +0200
-+++ examples/PrimitiveWrapFactory.java	2012-01-13 11:31:47.276360983 +0100
-@@ -57,7 +57,7 @@
+--- examples/PrimitiveWrapFactory.java
+++ examples/PrimitiveWrapFactory.java
+@@ -25,7 +25,7 @@ import org.mozilla.javascript.*;
 public class PrimitiveWrapFactory extends WrapFactory {
   @Override
   public Object wrap(Context cx, Scriptable scope, Object obj,
@ -24,11 +20,9 @@ Index: examples/PrimitiveWrapFactory.java
   {
     if (obj instanceof String || obj instanceof Number ||
         obj instanceof Boolean)
-Index: src/org/mozilla/javascript/WrapFactory.java
-===================================================================
--- src/org/mozilla/javascript/WrapFactory.java.orig	2011-05-09 20:04:34.000000000 +0200
-+++ src/org/mozilla/javascript/WrapFactory.java	2012-01-13 11:31:47.277361018 +0100
-@@ -75,7 +75,7 @@
+--- src/org/mozilla/javascript/WrapFactory.java
+++ src/org/mozilla/javascript/WrapFactory.java
+@@ -42,7 +42,7 @@ public class WrapFactory
      * @return the wrapped value.
      */
     public Object wrap(Context cx, Scriptable scope,
@ -37,11 +31,107 @@ Index: src/org/mozilla/javascript/WrapFactory.java
     {
         if (obj == null || obj == Undefined.instance
             || obj instanceof Scriptable)
-Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
-===================================================================
--- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.orig	2011-05-09 20:04:36.000000000 +0200
-+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2012-01-13 11:31:47.278361053 +0100
-@@ -67,7 +67,7 @@
+--- toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+++ toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+@@ -8,7 +8,7 @@
+ 
+   <target name="properties">
+     <property name="swing-ex-url" value="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip"/>
+-    <available file="downloaded/AbstractCellEditor.java"
+    <available file="treetable/AbstractCellEditor.java"
+                property="swing-ex-available"/>
+   </target>
+ 
+@@ -16,9 +16,9 @@
+     <!-- Download source from Sun's site, unzip it, remove
+          the files we don't need, and change the package
+     -->
+-    <mkdir dir="downloaded"/>
+-    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
+-    <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
+    <mkdir dir="treetable"/>
+    <get src="${swing-ex-url}" dest="treetable/swingExSrc.zip"/>
+    <unzip src="treetable/swingExSrc.zip" dest="downloaded/">
+       <patternset>
+           <include name="AbstractCellEditor.java"/>
+           <include name="JTreeTable.java"/>
+@@ -26,58 +26,58 @@
+           <include name="TreeTableModelAdapter.java"/>
+       </patternset>
+     </unzip>
+-    <replace file="downloaded/AbstractCellEditor.java">
+    <replace file="treetable/AbstractCellEditor.java">
+        <replacetoken>import java.awt.Component;</replacetoken>
+        <replacevalue>
+-package org.mozilla.javascript.tools.debugger.downloaded;
+package org.mozilla.javascript.tools.debugger.treetable;
+        </replacevalue>
+     </replace>
+-    <replace file="downloaded/AbstractCellEditor.java">
+    <replace file="treetable/AbstractCellEditor.java">
+        <replacetoken>import java.awt.event.*;</replacetoken>
+        <replacevalue></replacevalue>
+     </replace>
+-    <replace file="downloaded/AbstractCellEditor.java">
+    <replace file="treetable/AbstractCellEditor.java">
+        <replacetoken>import java.awt.AWTEvent;</replacetoken>
+        <replacevalue></replacevalue>
+     </replace>
+-    <replace file="downloaded/AbstractCellEditor.java">
+    <replace file="treetable/AbstractCellEditor.java">
+        <replacetoken>import java.io.Serializable;</replacetoken>
+        <replacevalue></replacevalue>
+     </replace>
+-    <replace file="downloaded/JTreeTable.java">
+    <replace file="treetable/JTreeTable.java">
+        <replacetoken>import javax.swing.*;</replacetoken>
+        <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+         package org.mozilla.javascript.tools.debugger.treetable;
+          import javax.swing.*;
+        </replacevalue>
+     </replace>
+-    <replace file="downloaded/JTreeTable.java">
+    <replace file="treetable/JTreeTable.java">
+        <replacetoken>class ListToTreeSelectionModelWrapper</replacetoken>
+        <replacevalue>public class ListToTreeSelectionModelWrapper</replacevalue>
+     </replace>
+-    <replace file="downloaded/JTreeTable.java">
+    <replace file="treetable/JTreeTable.java">
+        <replacetoken>ListSelectionModel getListSelectionModel</replacetoken>
+        <replacevalue>public ListSelectionModel getListSelectionModel</replacevalue>
+     </replace>
+-    <replace file="downloaded/JTreeTable.java">
+    <replace file="treetable/JTreeTable.java">
+        <replacetoken>import java.awt.Rectangle;</replacetoken>
+        <replacevalue></replacevalue>
+     </replace>
+-    <replace file="downloaded/TreeTableModel.java">
+    <replace file="treetable/TreeTableModel.java">
+        <replacetoken>import javax.swing.tree.TreeModel;</replacetoken>
+        <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+         package org.mozilla.javascript.tools.debugger.treetable;
+          import javax.swing.tree.TreeModel;
+        </replacevalue>
+     </replace>
+-    <replace file="downloaded/TreeTableModelAdapter.java">
+    <replace file="treetable/TreeTableModelAdapter.java">
+        <replacetoken>import javax.swing.JTree;</replacetoken>
+        <replacevalue>
+-         package org.mozilla.javascript.tools.debugger.downloaded;
+         package org.mozilla.javascript.tools.debugger.treetable;
+          import javax.swing.JTree;
+        </replacevalue>
+     </replace>
+-    <delete file="downloaded/swingExSrc.zip"/>
+    <delete file="treetable/swingExSrc.zip"/>
+   </target>
+ 
+   <target name="download" depends="properties,get-swing-ex"/>
+--- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
+@@ -36,7 +36,7 @@ public class JavaPolicySecurity extends
             return super.defineClass(name, data, 0, data.length, domain);
         }
 
@ -50,11 +140,9 @@ Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
             resolveClass(cl);
         }
     }
-Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
-===================================================================
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.orig	2011-05-09 20:04:38.000000000 +0200
-+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java	2012-01-13 11:31:47.282361193 +0100
-@@ -120,7 +120,7 @@
+--- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
+@@ -86,7 +86,7 @@ class Namespace extends IdScriptableObje
     }
 
     @Override
@ -63,11 +151,9 @@ Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
         return uri();
     }
 
-Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
-===================================================================
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.orig	2011-05-09 20:04:38.000000000 +0200
-+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java	2012-01-13 11:31:47.284361263 +0100
-@@ -150,7 +150,7 @@
+--- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
+@@ -116,7 +116,7 @@ final class QName extends IdScriptableOb
     }
 
     @Override
@ -76,11 +162,9 @@ Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
         return toString();
     }
 
-Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
-===================================================================
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.orig	2011-05-09 20:04:38.000000000 +0200
-+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java	2012-01-13 11:31:47.285361298 +0100
-@@ -165,7 +165,7 @@
+--- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
+@@ -105,7 +105,7 @@ abstract class XMLObjectImpl extends XML
     }
 
     @Override
--- a/rhino-component-info.xml
+++ b/rhino-component-info.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="">
-  <component id="rhino"
-             licenseType=""
-             version="@VERSION@"
-             tag="@TAG@"
-             description=""
-             
-             > 
-              
-    <artifact id="js.jar"/>
-
-
-    <export>
-      <include input="js.jar"/>
-
-    </export>
-  </component>
-</project>
--- a/rhino-js.pom
+++ b/rhino-js.pom
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>rhino</groupId>
-	<artifactId>js</artifactId>
-	<version>1.7R1</version>
-	<packaging>jar</packaging>
-	<name>Rhino</name>
-	<url>http://www.mozilla.org/rhino/</url>
-	<description>Rhino: JavaScript for Java</description>
-
-	<licenses>
-		<license>
-			<name>Mozilla Public License version 1.1</name>
-			<url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<scm>
-		<url>http://lxr.mozilla.org/mozilla/source/js/rhino/</url>
-	</scm>
-
-</project>
--- a/rhino.changes
+++ b/rhino.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jul 29 12:19:30 UTC 2020 - Pedro Monreal Gonzalez <pmonreal@suse.com>
+
+- Update to 1.7.7.1:
+  * Release notes:
+    https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md#rhino-1771
+- Rebase patches:
+  * rhino-addOrbitManifest.patch
+  * rhino-build.patch
+- Remove pathes:
+  * rhino-1.7R3-crosslink.patch
+  * rhino-288467.patch
+  * rhino-1.7-gcj.patch
+
 -------------------------------------------------------------------
 Sat Mar  2 13:08:27 UTC 2019 - Fridrich Strba <fstrba@suse.com>

--- a/rhino.pom
+++ b/rhino.pom
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>rhino</groupId>
-  <artifactId>rhino</artifactId>
-  <version>1.7R1</version>
-</project>
--- a/rhino.spec
+++ b/rhino.spec
@ -1,7 +1,7 @@
 #
 # spec file for package rhino
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@ -17,51 +17,29 @@
 #


-%define cvs_version     1_7R3
+%define scm_version 1_7_7_1
 Name:           rhino
-Version:        1.7R3
+Version:        1.7.7.1
 Release:        0
 Summary:        JavaScript for Java
-License:        MPL-1.1 OR GPL-2.0-or-later
+License:        MPL-2.0
 Group:          Development/Libraries/Java
-Url:            http://www.mozilla.org/rhino/
-# wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
-# unzip -q rhino%{cvs_version}.zip
-# find rhino%{cvs_version}/ -name '*jar' | xargs rm -rf
-# tar -czf rhino%{cvs_version}-suse.tar.gz rhino%{cvs_version}/
-Source0:        rhino%{cvs_version}-suse.tar.gz
+URL:            https://www.mozilla.org/rhino/
+Source0:        https://github.com/mozilla/rhino/archive/Rhino%{scm_version}_RELEASE.tar.gz
+Source1:        https://repo1.maven.org/maven2/org/mozilla/rhino/%{version}/rhino-%{version}.pom
 Source2:        rhino.script
 Source3:        rhino-debugger.script
 Source4:        rhino-idswitch.script
 Source5:        rhino-jsc.script
-Source6:        rhino-js.pom
-Source7:        rhino.pom
-Source8:        rhino-component-info.xml
 Patch0:         rhino-build.patch
 # Add OSGi metadata from Eclipse Orbit project
-# Rip out of MANIFEST.MF included in this JAR:
-# http://www.eclipse.org/downloads/download.php?r=1&file=/tools/orbit/downloads/drops/R20110523182458/repository/plugins/org.mozilla.javascript_1.7.2.v201005080400.jar
-Patch1:         %{name}-addOrbitManifest.patch
-Patch2:         %{name}-1.7R3-crosslink.patch
-Patch3:         rhino-288467.patch
-#PATCH-FIX-OPENSUSE: allow build under gcj
-Patch100:       rhino-1.7-gcj.patch
+Patch1:         rhino-addOrbitManifest.patch
 BuildRequires:  ant
-BuildRequires:  bea-stax-api
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
-BuildRequires:  xmlbeans-mini
-#!BuildIgnore:  antlr
-#!BuildIgnore:  antlr-java
-#!BuildIgnore:  xerces-j2
-#!BuildIgnore:  xerces-j2-bootstrap
-#!BuildIgnore:  xml-commons
-#!BuildIgnore:  xml-commons-apis
-#!BuildIgnore:  xml-commons-jaxp-1.3-apis
-#!BuildIgnore:  xml-commons-resolver
-Requires:       bea-stax-api
+BuildRequires:  sonatype-oss-parent
+Requires:       javapackages-tools
 Requires:       jline1
-Requires:       xmlbeans
 BuildArch:      noarch

 %description
@ -70,21 +48,16 @@ in Java. It is typically embedded into Java applications to provide
 scripting to end users.

 %package demo
-Summary:        JavaScript for Java
+Summary:        Examples for %{name}
 Group:          Development/Libraries/Java

 %description demo
-Rhino is an open-source implementation of JavaScript written entirely
-in Java. It is typically embedded into Java applications to provide
-scripting to end users.
+Examples for %{name}

 %prep
-# % setup -q -n %{name}%{cvs_version} -a 100
-%setup -q -n %{name}%{cvs_version}
-
-# Fix build
-sed -i -e '/.*<get.*src=.*>$/d' build.xml testsrc/build.xml \
-       toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
+%setup -q -n %{name}-Rhino%{scm_version}_RELEASE
+%patch0 -b .build
+%patch1 -b .fixManifest

 # Fix manifest
 sed -i -e '/^Class-Path:.*$/d' src/manifest
@ -92,13 +65,6 @@ sed -i -e '/^Class-Path:.*$/d' src/manifest
 # Add jpp release info to version
 sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties

-%setup -q -n %{name}%{cvs_version}
-%patch0  -b .build
-%patch1 -p1 -b .fixManifest
-%patch2 -p1 -b .crosslink
-%patch3  -b .sav3
-%patch100  -b .gjc
-
 %build
 %{ant} \
    -Dxbean.jar=$(build-classpath xmlbeans/xbean | cut -d ':' -f 1) \
@ -106,23 +72,30 @@ sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date
    -Dtarget-jvm=6 -Dsource-level=6 \
    deepclean jar copy-all

-export CLASSPATH=`pwd`/build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
-SOURCEPATH=`pwd`/build/%{name}%{cvs_version}/src
 pushd examples
-javac -sourcepath ${SOURCEPATH} -source 6 -target 6 *.java
-jar cvf ../build/%{name}%{cvs_version}/%{name}-examples.jar *.class
+
+export CLASSPATH=../build/%{name}%{version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
+SOURCEPATH=../build/%{name}%{version}/src
+%{javac} -sourcepath ${SOURCEPATH} -source 6 -target 6 *.java
+%{jar} cvf ../build/%{name}%{version}/%{name}-examples.jar *.class
+
 popd

 %install

+# man page
+mkdir -p %{buildroot}%{_mandir}/man1/
+install -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
+
 # jars
 mkdir -p %{buildroot}%{_javadir}
-cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}
+cp -a build/%{name}%{version}/js.jar %{buildroot}%{_javadir}
 ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar

 # pom
 mkdir -p %{buildroot}%{_mavenpomdir}
-cp -a %{SOURCE6} %{buildroot}%{_mavenpomdir}/js.pom
+cp -a %{SOURCE1} %{buildroot}%{_mavenpomdir}/js.pom
+cp -a %{SOURCE1} %{buildroot}%{_mavenpomdir}/rhino.pom
 %add_maven_depmap js.pom js.jar -a "org.mozilla:rhino"

 # scripts
@ -135,16 +108,19 @@ install -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/%{name}-jsc
 # examples
 mkdir -p %{buildroot}%{_datadir}/%{name}
 cp -a examples/* %{buildroot}%{_datadir}/%{name}
-cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
+cp -a build/%{name}%{version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
+
+find %{buildroot}%{_datadir}/%{name} -name '*.build' -delete

 %files
-%doc LICENSE.txt
+%license LICENSE.txt
 %attr(0755,root,root) %{_bindir}/%{name}
 %attr(0755,root,root) %{_bindir}/%{name}-debugger
 %attr(0755,root,root) %{_bindir}/%{name}-idswitch
 %attr(0755,root,root) %{_bindir}/%{name}-jsc
 %{_javadir}/*.jar
 %{_mavenpomdir}/*.pom
+%{_mandir}/man1/%{name}.1*
 %if %{defined _maven_repository}
 %config(noreplace) %{_mavendepmapfragdir}/%{name}
 %else
--- a/rhino1_7R3-suse.tar.gz
+++ b/rhino1_7R3-suse.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b4fd3070d9e3018aaf4b4047de252362efde5efc592f9f18c515c572979eae3
-size 1544431