[netbeans] 46/49: Refresh netbeans-wildUpperBound.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository netbeans.

commit 8297001e1108649587e73aa3d3bb15dd38a0c794
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 26 19:47:39 2015 +0100

    Refresh netbeans-wildUpperBound.patch
---
 debian/patches/netbeans-wildUpperBound.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/netbeans-wildUpperBound.patch b/debian/patches/netbeans-wildUpperBound.patch
new file mode 100644
index 0000000..6df3585
--- /dev/null
+++ b/debian/patches/netbeans-wildUpperBound.patch
@@ -0,0 +1,28 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 26 Dec 2015 19:47:10 +0100
+Subject: netbeans wildUpperBound
+
+Fix a FTBFS due to missing method wildUpperBound.
+
+Forwarded: not-needed
+---
+ java.source.base/src/org/netbeans/api/java/source/SourceUtils.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+index 66ed321..e666f42 100644
+--- a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
++++ b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+@@ -188,9 +188,9 @@ public class SourceUtils {
+             return info.getTypes().isAssignable(t.getUpperBound(), to)
+                     || info.getTypes().isAssignable(to, t.getUpperBound());
+         }
+-        if (from.getKind() == TypeKind.WILDCARD) {
+-            from = Types.instance(c).wildUpperBound((Type)from);
+-        }
++        //if (from.getKind() == TypeKind.WILDCARD) {
++        //    from = Types.instance(c).wildUpperBound((Type)from);
++        //}
+         return Check.instance(c).checkType(null, (Type)from, (Type)to).getKind() != TypeKind.ERROR;
+     }
+     
diff --git a/debian/patches/series b/debian/patches/series
index e0ed65f..551e0a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ netbeans-dlight.nativeexecution.patch
 netbeans-extexecution.impl.patch
 netbeans-svnclient.patch
 javaewah-version.patch
+netbeans-wildUpperBound.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git