This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository visualvm.
commit 6281903a2b3a60f2cacff2624437a167a599dbe3 Author: Emmanuel Bourg <[email protected]> Date: Tue May 6 12:13:03 2014 +0200 Fixed the compilation errors with Java 8 --- debian/changelog | 1 + debian/patches/02-java8-compatibility.patch | 145 ++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 148 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa1312e..78ae786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ visualvm (1.3.7-1) UNRELEASED; urgency=medium - Removed the Ant compatibility patch - Depend on libnb-platform18-java instead of libnb-platform13-java - The license validation window is no longer displayed (Closes: #721178) + - Added a patch fixing the compilation errors with Java 8 * The IcedTea build harness is no longer used * Added an architecture specific package containing the native libraries * Install the application files in /usr/share/visualvm diff --git a/debian/patches/02-java8-compatibility.patch b/debian/patches/02-java8-compatibility.patch new file mode 100644 index 0000000..4eb0d93 --- /dev/null +++ b/debian/patches/02-java8-compatibility.patch @@ -0,0 +1,145 @@ +Description: Fixes compilation errors with Java 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/netbeans/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java ++++ b/netbeans/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java +@@ -359,18 +359,18 @@ + super.swap(a, b); + FlatProfileContainer.this.swap(a, b); + +- swap(timeInMcs0,a,b); +- swap(totalTimeInMcs0,a,b); ++ FlatProfileContainer.swap(timeInMcs0,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs0,a,b); + + if (collectingTwoTimeStamps) { +- swap(timeInMcs1,a,b); +- swap(totalTimeInMcs1,a,b); ++ FlatProfileContainer.swap(timeInMcs1,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs1,a,b); + } + +- swap(methodIds,a,b); ++ FlatProfileContainer.swap(methodIds,a,b); + + if (percent != null) { +- swap(percent,a,b); ++ FlatProfileContainer.swap(percent,a,b); + } + } + }).sort(sortOrder); +@@ -392,19 +392,19 @@ + super.swap(a, b); + FlatProfileContainer.this.swap(a, b); + +- swap(timeInMcs0,a,b); +- swap(totalTimeInMcs0,a,b); ++ FlatProfileContainer.swap(timeInMcs0,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs0,a,b); + + if (collectingTwoTimeStamps) { +- swap(timeInMcs1,a,b); +- swap(totalTimeInMcs1,a,b); ++ FlatProfileContainer.swap(timeInMcs1,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs1,a,b); + } + +- swap(methodIds,a,b); +- swap(nInvocations,a,b); ++ FlatProfileContainer.swap(methodIds,a,b); ++ FlatProfileContainer.swap(nInvocations,a,b); + + if (percent != null) { +- swap(percent,a,b); ++ FlatProfileContainer.swap(percent,a,b); + } + } + }).sort(sortOrder); +@@ -438,18 +438,18 @@ + super.swap(a, b); + FlatProfileContainer.this.swap(a, b); + +- swap(totalTimeInMcs0,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs0,a,b); + + if (collectingTwoTimeStamps) { +- swap(tpmBF,a,b); +- swap(totalTimeInMcs1,a,b); ++ FlatProfileContainer.swap(tpmBF,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs1,a,b); + } + +- swap(methodIds,a,b); +- swap(nInvocations,a,b); ++ FlatProfileContainer.swap(methodIds,a,b); ++ FlatProfileContainer.swap(nInvocations,a,b); + + if (percent != null) { +- swap(percent,a,b); ++ FlatProfileContainer.swap(percent,a,b); + } + } + }).sort(sortOrder); +@@ -467,14 +467,14 @@ + super.swap(a, b); + FlatProfileContainer.this.swap(a, b); + +- swap(totalTimeInMcs0,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs0,a,b); + + if (collectingTwoTimeStamps) { +- swap(tpmBF,a,b); +- swap(totalTimeInMcs1,a,b); ++ FlatProfileContainer.swap(tpmBF,a,b); ++ FlatProfileContainer.swap(totalTimeInMcs1,a,b); + } + +- swap(methodIds,a,b); ++ FlatProfileContainer.swap(methodIds,a,b); + } + }).sort(sortOrder); + } +@@ -508,18 +508,18 @@ + super.swap(a, b); + FlatProfileContainer.this.swap(a, b); + +- swap(timeInMcs0,a,b); ++ FlatProfileContainer.swap(timeInMcs0,a,b); + + if (collectingTwoTimeStamps) { +- swap(tpmBF,a,b); +- swap(timeInMcs1,a,b); ++ FlatProfileContainer.swap(tpmBF,a,b); ++ FlatProfileContainer.swap(timeInMcs1,a,b); + } + +- swap(methodIds,a,b); +- swap(nInvocations,a,b); ++ FlatProfileContainer.swap(methodIds,a,b); ++ FlatProfileContainer.swap(nInvocations,a,b); + + if (percent != null) { +- swap(percent,a,b); ++ FlatProfileContainer.swap(percent,a,b); + } + } + }).sort(sortOrder); +@@ -537,14 +537,14 @@ + super.swap(a, b); + FlatProfileContainer.this.swap(a, b); + +- swap(timeInMcs0,a,b); ++ FlatProfileContainer.swap(timeInMcs0,a,b); + + if (collectingTwoTimeStamps) { +- swap(tpmBF,a,b); +- swap(timeInMcs1,a,b); ++ FlatProfileContainer.swap(tpmBF,a,b); ++ FlatProfileContainer.swap(timeInMcs1,a,b); + } + +- swap(methodIds,a,b); ++ FlatProfileContainer.swap(methodIds,a,b); + } + }).sort(sortOrder); + } diff --git a/debian/patches/series b/debian/patches/series index a0d3d79..dd72e98 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01-gcc-settings.patch +02-java8-compatibility.patch 03-launcher.patch diff --git a/debian/rules b/debian/rules index bc31087..f8784f7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -export JAVA_HOME = $(firstword $(wildcard /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/default-java)) +export JAVA_HOME = /usr/lib/jvm/default-java export DEB_BUILD_HARDENING=1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
