Accepting request 1148666 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148666
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jeuclid?expand=0&rev=13

build.xml

@@ -122,7 +122,7 @@
   <property name="full.build.output.core" value="${package.name}/${build.output}" />
 
     <mkdir dir="${full.build.output.core}"/>
-    <javac destdir="${full.build.output.core}" debug="true" deprecation="true" optimize="false" source="6" target="6">
+    <javac destdir="${full.build.output.core}" debug="true" deprecation="true" optimize="false" source="8" target="8">
       <src>
         <pathelement location="${package.name}/src/main/java"/>
 
@@ -141,7 +141,7 @@
   <property name="package.name.mathviewer" value="jeuclid-mathviewer" />
   <property name="full.build.output.mathviewer" value="${package.name.mathviewer}/${build.output}" />
     <mkdir dir="${full.build.output.mathviewer}"/>
-    <javac destdir="${package.name.mathviewer}/${build.output}" debug="true" deprecation="true" optimize="false" source="6" target="6">
+    <javac destdir="${package.name.mathviewer}/${build.output}" debug="true" deprecation="true" optimize="false" source="8" target="8">
       <src>
         <pathelement location="${package.name.mathviewer}/src/main/java"/>
 
@@ -169,7 +169,7 @@
   <property name="full.build.output.cli" value="${package.name.cli}/${build.output}" />
 
     <mkdir dir="${full.build.output.cli}"/>
-    <javac destdir="${full.build.output.cli}" debug="true" deprecation="true" optimize="false" source="6" target="6">
+    <javac destdir="${full.build.output.cli}" debug="true" deprecation="true" optimize="false" source="8" target="8">
       <src>
         <pathelement location="${package.name.cli}/src/main/java"/>
 
@@ -195,7 +195,7 @@
   <property name="full.build.output.fop" value="${package.name.fop}/${build.output}" />
 
     <mkdir dir="${full.build.output.fop}"/>
-    <javac destdir="${full.build.output.fop}" debug="true" deprecation="true" optimize="false" source="6" target="6">
+    <javac destdir="${full.build.output.fop}" debug="true" deprecation="true" optimize="false" source="8" target="8">
       <src>
         <pathelement location="${package.name.fop}/src/main/java"/>
 

jeuclid-batik_1_10.patch

@@ -0,0 +1,15 @@
+Index: jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/elements/presentation/token/Mo.java
+===================================================================
+--- jeuclid-parent-3.1.9.orig/jeuclid-core/src/main/java/net/sourceforge/jeuclid/elements/presentation/token/Mo.java
++++ jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/elements/presentation/token/Mo.java
+@@ -45,9 +45,9 @@ import net.sourceforge.jeuclid.layout.Te
+ 
+ import org.apache.batik.dom.AbstractDocument;
+ import org.apache.batik.dom.events.DOMCustomEvent;
++import org.apache.batik.w3c.dom.events.CustomEvent;
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.Node;
+-import org.w3c.dom.events.CustomEvent;
+ import org.w3c.dom.events.Event;
+ import org.w3c.dom.events.EventListener;
+ import org.w3c.dom.events.EventTarget;

jeuclid-core-FreeHep.patch

@@ -1,11 +1,8 @@
---- jeuclid-parent-3.1.3/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java	2008-09-24 07:03:08.000000000 -0700
-+++ jeuclid-parent-3.1.3.new/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java	2008-11-24 19:04:21.000000000 -0800
-@@ -50,7 +50,7 @@
-     protected ConverterRegistry() {
-         ImageIODetector.detectConversionPlugins(this);
-         BatikDetector.detectConversionPlugins(this);
--        FreeHepDetector.detectConversionPlugins(this);
-+//        FreeHepDetector.detectConversionPlugins(this);
-     }
- 
-     /**
+Index: jeuclid-parent-3.1.9/jeuclid-core/src/main/resources/META-INF/services/net.sourceforge.jeuclid.converter.ConverterDetector
+===================================================================
+--- jeuclid-parent-3.1.9.orig/jeuclid-core/src/main/resources/META-INF/services/net.sourceforge.jeuclid.converter.ConverterDetector
++++ jeuclid-parent-3.1.9/jeuclid-core/src/main/resources/META-INF/services/net.sourceforge.jeuclid.converter.ConverterDetector
+@@ -1,3 +1,2 @@
+ net.sourceforge.jeuclid.converter.ImageIODetector
+ net.sourceforge.jeuclid.converter.BatikDetector
+-net.sourceforge.jeuclid.converter.FreeHepDetector

jeuclid-parent-3.1.3-src.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e089e2cc3bf9db3bb0600f73e7bd49f4d63983014957d1d700e1f1bbb71b3628
-size 3393719

jeuclid-parent-3.1.9-src.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80bddad60c02bb55d430cab78818c3a43223877c62bc71f1c7326e2ff8fbe362
+size 8858746

jeuclid-service-providers.patch

@@ -0,0 +1,17 @@
+Index: jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java
+===================================================================
+--- jeuclid-parent-3.1.9.orig/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java
++++ jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java
+@@ -52,10 +52,10 @@ public final class ConverterRegistry {
+      */
+     @SuppressWarnings("unchecked")
+     protected ConverterRegistry() {
+-        final Iterator<ConverterDetector> it = Service
++        final Iterator<Object> it = Service
+                 .providers(ConverterDetector.class);
+         while (it.hasNext()) {
+-            final ConverterDetector det = it.next();
++            final ConverterDetector det = (ConverterDetector) it.next();
+             det.detectConversionPlugins(this);
+         }
+     }

jeuclid.changes

@@ -1,3 +1,80 @@
+-------------------------------------------------------------------
+Wed Feb 21 11:58:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Tue Mar 22 16:35:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
+-------------------------------------------------------------------
+Wed Mar 16 11:52:48 UTC 2022 - David Anes <david.anes@suse.com>
+
+- Updated/rebased patches:
+  - jeuclid-core-FreeHep.patch (updated to use services file)
+  - jeuclid-batik_1_10.patch (rebased)
+  - jeuclid-service-providers.patch (added to prevent wrong 
+    typecasting)
+- Update to 3.1.9:
+  - Workaround for NPE in TextLayout()
+  - Support Content Math without namespace
+  - Added Italian Translation
+  - Improved Documentation
+- Update to 3.1.8:
+  - Operator streching now honors symmetric
+  - New extension for horizontal / vertical stretch
+  - Stretchy behaviour is reworked again
+- Update to 3.1.7:
+  - Reworked Token elements to support mglyhp in all cases.
+  - Reworked Stretchy operators.
+  - Fixed an error in mmultiscript containing whitespace.
+  - MathML 3.0 Testsuite is now available on the website.
+  - MathML 3.0 Testsuite can now be run internally.
+  - Basic SWT Widget is now implemented.
+  - Restored functionality to get null value for attributes. Fixes 
+    mfence
+  - Better support for foreign elements in JEuclid DOM Tree.
+- Update to 3.1.6:
+  - JEuclidView: add method to get bounds of layouted object.
+  - Provide Win32 MathViewer executable.
+  - Moved Resources from root namespace into net/sf/jeuclid.
+  - Internal DOM Tree is now in the MathML Namespace.
+  - jeuclid-core JAR file is now OSGi compatible.
+  - MathViewer: Add simple editor.
+  - MathViewer: PropertyPage: use optionName rather than toString 
+    for consistency with command line App.
+  - Changed internal JEuclid attributes to use optionName rather 
+    than toString for consistency with command line App.
+  - FOP: Added support for ImageConverter needed by newer fop.
+- Update to 3.1.5:
+  - Fixed NPE if mo has no parent.
+  - Font-Cache: repaired support for euler fonts.
+  - MathViewer: Add source view.
+  - jeuclid-core: Mouse position detection (presentation mathml).
+  - jeuclid-fop: Workaround for NPE if an image does not exist.
+- Update to 3.1.4:
+  - Added Regression tests for testsuite.
+  - Removed possible NPE in MGlyph handling.
+  - Better support for font styles.
+  - Added support for float sized fonts.
+  - Font-Caching and loading is now all done using lower case.
+  - Declared current branch as stable.
+
+-------------------------------------------------------------------
+Fri Nov  8 12:16:35 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Add xml-apis explicitely to the build classpath
+
+-------------------------------------------------------------------
+Sun Jan 20 22:36:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build against batik >= 1.10
+- Added patch:
+  * jeuclid-batik_1_10.patch
+    + org.w3c.dom.events.CustomEvent -> 
+      -> org.apache.batik.w3c.dom.events.CustomEvent
+
 -------------------------------------------------------------------
 Thu Dec  6 15:26:27 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 

jeuclid.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jeuclid
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           jeuclid
-Version:        3.1.3
+Version:        3.1.9
 Release:        0
 Summary:        MathML rendering solution
 # LGPL-2.1 is for the FreeHEP component only (see LICENSE.FreeHEP)
 License:        Apache-2.0 AND LGPL-2.1-only
 Group:          Development/Libraries/Java
-URL:            http://jeuclid.sourceforge.net/index.html
+URL:            https://jeuclid.sourceforge.net/index.html
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-parent-%{version}-src.zip
 #fedora specific build script based on debian
 Source1:        build.xml
@@ -37,14 +37,17 @@ Patch1:         AppleJavaExtensions.patch
 #removes OSX dep for the viewer
 Patch2:         MacOSX.patch
 Patch3:         jeuclid-commons-lang3.patch
+Patch4:         jeuclid-batik_1_10.patch
+# fixes casting the service provider
+Patch5:         jeuclid-service-providers.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-cli >= 1.1
 BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-logging
-BuildRequires:  batik >= 1.7
+BuildRequires:  batik >= 1.10
 BuildRequires:  desktop-file-utils
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
 BuildRequires:  jcip-annotations
 BuildRequires:  unzip
@@ -53,8 +56,8 @@ BuildRequires:  xml-commons-apis
 BuildRequires:  xmlgraphics-commons >= 1.3
 BuildRequires:  xmlgraphics-fop >= 0.95
 Requires:       apache-commons-logging
-Requires:       batik >= 1.7
-Requires:       java
+Requires:       batik >= 1.10
+Requires:       java >= 1.8
 Requires:       javapackages-tools
 Requires:       jcip-annotations
 Requires:       xmlgraphics-commons >= 1.3
@@ -155,12 +158,14 @@ touch -r NOTICE NOTICE.unix;
 mv NOTICE.unix NOTICE
 
 mkdir lib
-build-jar-repository -s -p lib jcip-annotations commons-logging xmlgraphics-commons batik-all xmlgraphics-fop.jar commons-cli commons-lang3
+build-jar-repository -s -p lib jcip-annotations commons-logging xmlgraphics-commons batik-all xmlgraphics-fop.jar commons-cli commons-lang3 xml-apis
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
 
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;