Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked
in at 2023-10-01 21:22:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scala"
Sun Oct 1 21:22:16 2023 rev:11 rq:1114251 version:2.10.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2023-09-11
21:28:31.442938309 +0200
+++ /work/SRC/openSUSE:Factory/.scala.new.28202/scala.changes 2023-10-01
21:22:53.697923479 +0200
@@ -1,0 +2,15 @@
+Fri Sep 29 06:45:12 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Allow building with jdk >= 9 too
+- Added patch:
+ * scala-2.10.7-jdk15.patch
+ + do not build pack200 ant task since Pack200 was removed in
+ jdk15
+ + implement a new method added in jdk15
+- Modified patches:
+ * scala-2.10.4-build_xml.patch
+ + do not try to instantiate the pack200 ant task
+ * scala-2.10.7-source6.patch -> scala-2.10.7-source8.patch
+ + build with source/target 8 levels
+
+-------------------------------------------------------------------
Old:
----
scala-2.10.7-source6.patch
New:
----
scala-2.10.7-jdk15.patch
scala-2.10.7-source8.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scala.spec ++++++
--- /var/tmp/diff_new_pack.ls8Joy/_old 2023-10-01 21:22:57.490060693 +0200
+++ /var/tmp/diff_new_pack.ls8Joy/_new 2023-10-01 21:22:57.490060693 +0200
@@ -57,23 +57,21 @@
# Stop scaladoc from trying to bundle non-existent resources that were
# removed due to being in object form only, whithout sources
Patch9: scala-2.10.6-scaladoc-resources.patch
-Patch10: scala-2.10.7-source6.patch
+Patch10: scala-2.10.7-source8.patch
Patch11: scala-2.10.7-lines.patch
Patch12: scala-2.10.7-java8compat.patch
+Patch13: scala-2.10.7-jdk15.patch
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: ant-junit
BuildRequires: aqute-bnd
BuildRequires: graphviz
-BuildRequires: java-devel >= 1.7
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: jline >= 2.10
BuildRequires: junit
-BuildConflicts: java >= 9
-BuildConflicts: java-devel >= 9
-BuildConflicts: java-headless >= 9
Requires: jansi
-Requires: java-headless >= 1.7
+Requires: java-headless >= 1.8
# Require full javapackages-tools since scripts use
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
@@ -115,7 +113,7 @@
Summary: The swing library for the Scala programming languages
Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
-Requires: java >= 1.7
+Requires: java >= 1.8
BuildArch: noarch
%if %{without bootstrap}
Obsoletes: %{base_name}-bootstrap-swing
@@ -154,9 +152,12 @@
%patch10 -p1 -b .source6
%patch11 -p1 -b .jdk11
%patch12 -p1 -b .java8compat
+%patch13 -p1 -b .jdk15
echo "starr.version=2.10.4\nstarr.use.released=0" > starr.number
+rm -f src/compiler/scala/tools/ant/Pack200Task.scala
+
pushd src
rm -rf jline
popd
++++++ scala-2.10.4-build_xml.patch ++++++
--- /var/tmp/diff_new_pack.ls8Joy/_old 2023-10-01 21:22:57.554063009 +0200
+++ /var/tmp/diff_new_pack.ls8Joy/_new 2023-10-01 21:22:57.558063154 +0200
@@ -55,7 +55,7 @@
<property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/>
<!-- Sets location of build folders -->
-@@ -181,91 +180,57 @@
+@@ -181,91 +180,54 @@
</target>
<target name="boot" depends="desired.jars.uptodate"
unless="lib.jars.uptodate">
@@ -182,9 +182,6 @@
+ <taskdef name="same"
+ classpathref="scalabootstrap.classpath"
+ classname="scala.tools.ant.Same"/>
-+ <taskdef name="pack200"
-+ classpathref="scalabootstrap.classpath"
-+ classname="scala.tools.ant.Pack200Task"/>
+
+ <typedef resource="aQute/bnd/ant/taskdef.properties"
+ classpath="/usr/share/java/aqute-bnd.jar" />
++++++ scala-2.10.7-jdk15.patch ++++++
--- scala-2.10.7/src/compiler/scala/tools/ant/antlib.xml 2023-09-28
18:35:06.147897841 +0200
+++ scala-2.10.7/src/compiler/scala/tools/ant/antlib.xml 2023-09-28
18:47:47.202949642 +0200
@@ -13,6 +13,4 @@
classname="scala.tools.ant.ScalaTool"/>
<taskdef name="same"
classname="scala.tools.ant.Same"/>
- <taskdef name="pack200"
- classname="scala.tools.ant.Pack200Task"/>
</antlib>
Only in scala-2.10.7/src/compiler/scala/tools/ant: Pack200Task.scala
--- scala-2.10.7/src/library/scala/collection/mutable/StringBuilder.scala
2023-09-28 18:35:06.187898108 +0200
+++ scala-2.10.7/src/library/scala/collection/mutable/StringBuilder.scala
2023-09-28 18:49:06.536809546 +0200
@@ -437,6 +437,14 @@
* @return the string assembled by this StringBuilder
*/
def result(): String = toString
+
+ /** Tests whether this builder is empty.
+ *
+ * This method is required for JDK15+ compatibility
+ *
+ * @return `true` if this builder contains nothing, `false` otherwise.
+ */
+ override def isEmpty: Boolean = underlying.length() == 0
}
object StringBuilder {
++++++ scala-2.10.7-source6.patch -> scala-2.10.7-source8.patch ++++++
--- /work/SRC/openSUSE:Factory/scala/scala-2.10.7-source6.patch 2019-12-17
13:30:09.543409317 +0100
+++ /work/SRC/openSUSE:Factory/.scala.new.28202/scala-2.10.7-source8.patch
2023-10-01 21:22:53.685923045 +0200
@@ -7,7 +7,7 @@
classpath="${@{project}-classes}"
includes="**/*.java"
- target="1.6" source="1.5"
-+ target="1.6" source="1.6"
++ target="1.8" source="1.8"
compiler="javac1.6"
includeantruntime="false" >
<compilerarg line="${javac.args} @{args}"/>
@@ -16,7 +16,7 @@
excludes="@{excludes}"
includeantruntime="false"
- target="1.6" source="1.5">
-+ target="1.6" source="1.6">
++ target="1.8" source="1.8">
<compilerarg line="${javac.args} @{args}"/>
<classpath refid="@{stage}.@{destproject}.build.path"/>
</javac>
