This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit bc4808a0070e031065a352852d9d41344abede14 Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 12 11:14:40 2015 +0200 Removed 0005-java7-compilation.patch (fixed upstream) --- debian/changelog | 1 + debian/patches/0005-java7-compilation.patch | 245 ---------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 246 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca174a5..659bd64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium * Team upload. * New upstream release (Closes: #706633, #750464, #760930) - Refreshed the patches + - Removed 0005-java7-compilation.patch (fixed upstream) - Depend on libjline2-java instead of building an embedded copy of jline * The package has been adopted by the Java Team (Closes: #754935) * Adapted debian/orig-tar.sh for Scala 2.11 diff --git a/debian/patches/0005-java7-compilation.patch b/debian/patches/0005-java7-compilation.patch deleted file mode 100644 index 314bd22..0000000 --- a/debian/patches/0005-java7-compilation.patch +++ /dev/null @@ -1,245 +0,0 @@ -Subject: update ComboBox.scala and ListView.scala to address FTBFS - with java7 -Origin: https://github.com/scala/scala/tree/java7 -Forwarded: not-needed - ---- a/src/swing/scala/swing/ComboBox.scala -+++ b/src/swing/scala/swing/ComboBox.scala -@@ -9,7 +9,7 @@ - package scala.swing - - import event._ --import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer} -+import javax.swing.{JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer} - import java.awt.event.ActionListener - - object ComboBox { -@@ -118,10 +118,10 @@ - implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString) - implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString) - -- def newConstantModel[A](items: Seq[A]): ComboBoxModel = { -- new AbstractListModel with ComboBoxModel { -+ def newConstantModel[A](items: Seq[A]): ComboBoxModel[A] = { -+ new AbstractListModel[A] with ComboBoxModel[A] { - private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0) -- def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef] -+ def getSelectedItem = selected.asInstanceOf[AnyRef] - def setSelectedItem(a: Any) { - if ((selected != null && selected != a) || - selected == null && a != null) { -@@ -129,7 +129,7 @@ - fireContentsChanged(this, -1, -1) - } - } -- def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef] -+ def getElementAt(n: Int) = items(n).asInstanceOf[A] - def getSize = items.size - } - } -@@ -157,7 +157,7 @@ - * @see javax.swing.JComboBox - */ - class ComboBox[A](items: Seq[A]) extends Component with Publisher { -- override lazy val peer: JComboBox = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin -+ override lazy val peer: JComboBox[A] = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin - - object selection extends Publisher { - def index: Int = peer.getSelectedIndex -@@ -182,7 +182,8 @@ - * of the component to its own defaults _after_ the renderer has been - * configured. That's Swing's principle of most suprise. - */ -- def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer) -+ def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer.asInstanceOf[ListCellRenderer[A]]) -+ // def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer) - def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) } - - /* XXX: currently not safe to expose: -@@ -201,8 +202,9 @@ - peer.setEditor(editor(this).comboBoxPeer) - } - -- def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue) -+ def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue) - def prototypeDisplayValue_=(v: Option[A]) { -- peer.setPrototypeDisplayValue((v map toAnyRef).orNull) -+ peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A]) - } - } -+ ---- a/build.xml -+++ b/build.xml -@@ -364,13 +364,6 @@ - - <fail if="has.unsupported.jdk" message="JDK ${ant.java.version} is not supported by this build!"/> - -- <if><isset property="has.java7"/><then> -- <echo level="warning"> You are using JDK7 for this build. -- While this will be able to build most of Scala, it will not build the Swing project. -- You will be unable to create a distribution. -- </echo> -- </then></if> -- - <!-- Allow this to be overridden simply --> - <property name="sbt.latest.version" value="0.12.2"/> - -@@ -1195,7 +1188,7 @@ - <target name="quick.partest" depends="quick.scalap, quick.comp, asm.done"> - <staged-build with="locker" stage="quick" project="partest" version="partest"/> </target> - -- <target name="quick.swing" depends="quick.actors, quick.lib" if="has.java6"> -+ <target name="quick.swing" depends="quick.actors, quick.lib"> - <staged-build with="locker" stage="quick" project="swing"/> </target> - - <target name="quick.plugins" depends="quick.comp"> -@@ -1246,7 +1239,7 @@ - <staged-pack project="library"/></target> - - <target name="pack.actors" depends="quick.lib"> <staged-pack project="actors"/> </target> -- <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target> -+ <target name="pack.swing" depends="quick.swing"> <staged-pack project="swing"/> </target> - <target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target> - - <target name="pack.comp" depends="quick.comp, asm.done"> -@@ -1393,11 +1386,9 @@ - <make-bundle name="scala-reflect" version="${osgi.version.number}" /> - <make-bundle name="scala-compiler" version="${osgi.version.number}" /> - <make-plugin-bundle name="continuations" version="${osgi.version.number}" /> -+ <make-bundle name="scala-swing" version="${osgi.version.number}"/> - <touch file="${build-osgi.dir}/bundles.complete" verbose="no"/> - -- <if><isset property="has.java6"/><then> -- <make-bundle name="scala-swing" version="${osgi.version.number}"/></then> -- </if> - <stopwatch name="osgi.bundle.timer" action="total"/></then> - </if> - </target> ---- a/src/swing/scala/swing/ListView.scala -+++ b/src/swing/scala/swing/ListView.scala -@@ -24,18 +24,18 @@ - val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION) - } - -- def wrap[A](c: JList) = new ListView[A] { -+ def wrap[A](c: JList[A]) = new ListView[A] { - override lazy val peer = c - } - - object Renderer { -- def wrap[A](r: ListCellRenderer): Renderer[A] = new Wrapped[A](r) -+ def wrap[A](r: ListCellRenderer[A]): Renderer[A] = new Wrapped[A](r) - - /** - * Wrapper for <code>javax.swing.ListCellRenderer<code>s - */ -- class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] { -- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = { -+ class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] { -+ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = { - Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent]) - } - } -@@ -55,8 +55,8 @@ - * </code> - */ - def apply[A,B](f: A => B)(implicit renderer: Renderer[B]): Renderer[A] = new Renderer[A] { -- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = -- renderer.componentFor(list, isSelected, focused, f(a), index) -+ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = -+ renderer.componentFor(list.asInstanceOf[ListView[_ <: B]], isSelected, focused, f(a), index) - } - } - -@@ -69,11 +69,11 @@ - * @see javax.swing.ListCellRenderer - */ - abstract class Renderer[-A] { -- def peer: ListCellRenderer = new ListCellRenderer { -- def getListCellRendererComponent(list: JList, a: Any, index: Int, isSelected: Boolean, focused: Boolean) = -- componentFor(ListView.wrap[A](list), isSelected, focused, a.asInstanceOf[A], index).peer -+ def peer: ListCellRenderer[_ >: A] = new ListCellRenderer[A] { -+ def getListCellRendererComponent(list: JList[_ <: A], a: A, index: Int, isSelected: Boolean, focused: Boolean) = -+ componentFor(ListView.wrap[A](list.asInstanceOf[JList[A]]), isSelected, focused, a, index).peer - } -- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component -+ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component - } - - /** -@@ -110,7 +110,7 @@ - /** - * Configures the component before returning it. - */ -- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = { -+ def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = { - preConfigure(list, isSelected, focused, a, index) - configure(list, isSelected, focused, a, index) - component -@@ -123,10 +123,10 @@ - * that renders the string returned from an item's <code>toString</code>. - */ - implicit object GenericRenderer extends Renderer[Any] { -- override lazy val peer: ListCellRenderer = new DefaultListCellRenderer -- def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = { -- val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent] -- Component.wrap(c) -+ override lazy val peer: ListCellRenderer[Any] = (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]] -+ def componentFor(list: ListView[_ <: Any], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = { -+ val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused) -+ Component.wrap(c.asInstanceOf[JComponent]) - } - } - } -@@ -142,34 +142,34 @@ - */ - class ListView[A] extends Component { - import ListView._ -- override lazy val peer: JList = new JList with SuperMixin -+ override lazy val peer: JList[A] = new JList[A] with SuperMixin - - def this(items: Seq[A]) = { - this() - listData = items - } - -- protected class ModelWrapper(val items: Seq[A]) extends AbstractListModel { -- def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef] -+ protected class ModelWrapper[A](val items: Seq[A]) extends AbstractListModel[A] { -+ def getElementAt(n: Int) = items(n) - def getSize = items.size - } - - def listData: Seq[A] = peer.getModel match { -- case model: ModelWrapper => model.items -- case model @ _ => new Seq[A] { selfSeq => -+ case model: ModelWrapper[A] => model.items -+ case model => new Seq[A] { selfSeq => - def length = model.getSize - def iterator = new Iterator[A] { - var idx = 0 - def next = { idx += 1; apply(idx-1) } - def hasNext = idx < selfSeq.length - } -- def apply(n: Int) = model.getElementAt(n).asInstanceOf[A] -+ def apply(n: Int): A = model.getElementAt(n) - } - } - - def listData_=(items: Seq[A]) { -- peer.setModel(new AbstractListModel { -- def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef] -+ peer.setModel(new AbstractListModel[A] { -+ def getElementAt(n: Int) = items(n) - def getSize = items.size - }) - } -@@ -216,7 +216,7 @@ - def adjusting = peer.getSelectionModel.getValueIsAdjusting - } - -- def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getCellRenderer) -+ def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getCellRenderer.asInstanceOf[ListCellRenderer[A]]) - def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) } - - def fixedCellWidth = peer.getFixedCellWidth diff --git a/debian/patches/series b/debian/patches/series index e08191d..6d1d9fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 0001-Define-system-locations.patch 0002-Use-system-ant-contrib.jar.patch 0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch -0005-java7-compilation.patch 0006-ignore-pax-exam-dependencies.patch 0007-ignore-partest.patch 0008-disable-lib-fetching.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
