This is an automated email from the git hooks/post-receive script. jzobel-guest pushed a commit to branch master in repository netbeans.
commit fdba90e2f18a92c7abdcf3989cbe9190ad35caf0 Author: Joachim Zobel <[email protected]> Date: Fri Oct 25 18:47:10 2013 +0200 Moved workarounds to seperate patch file --- .../netbeans~ide-launcher-7.0.1workarounds.patch | 44 ++++++++++++++++++++ debian/patches/netbeans~ide-launcher.patch | 43 +------------------ debian/patches/series | 2 + 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch b/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch new file mode 100644 index 0000000..e3294e0 --- /dev/null +++ b/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch @@ -0,0 +1,44 @@ +Patches that hopefully can be removed after 7.0.1 +--- a/netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans ++++ b/netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans +@@ -174,6 +174,11 @@ + netbeans_default_options="-J-XX:MaxPermSize=384m ${netbeans_default_options}" + fi + ++# "Fixes" #698514 by working around. ++# This should be removed after 7.0.1. ++netbeans_default_options="${netbeans_default_options} \ ++ --cp:a /usr/share/java/svnClientAdapter.jar" ++ + launchNbexec() { + nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do + if expr "$X" : "/.*" >/dev/null; then +@@ -195,6 +200,28 @@ + fi + } + ++# Workaround for #720684, which is a broken openjdk-6 ++# with a hard to fix bug. See JDK-8021890. ++# This can be removed when openjdk-6 is no longer default ++if [ -z "$netbeans_jdkhome" ] ; then ++ # if $netbeans_jdkhome has been set, we respect the choice ++ # Otherwise we check for the broken jdk ++ java -version 2>&1 | grep -i "openjdk" | grep "IcedTea6" > /dev/null ++ if [ $? = "0" ] ; then ++ # We try to find a java 7 jdk ++ # since we depend on java-7 there should be one ++ java_candidate=`update-alternatives --list java |\ ++ grep "java-7" |\ ++ head -1` ++ if [ -n "$java_candidate" ] ; then ++ netbeans_jdkhome=`echo $java_candidate | sed 's#/jre/bin/java$##'` ++ else ++ echo "No suitable JDK found." ++ exit; ++ fi ++ fi ++fi ++ + # in case of macosx, the apple.laf.useScreenMenuBar property should be ideally in the Info.plist file + # but it doesn't get propagated into the executed java VM. + case "`uname`" in diff --git a/debian/patches/netbeans~ide-launcher.patch b/debian/patches/netbeans~ide-launcher.patch index e453131..4465add 100644 --- a/debian/patches/netbeans~ide-launcher.patch +++ b/debian/patches/netbeans~ide-launcher.patch @@ -45,48 +45,7 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans # #68373: look for userdir, but do not modify "$@" -@@ -161,6 +174,11 @@ - netbeans_default_options="-J-XX:MaxPermSize=384m ${netbeans_default_options}" - fi - -+# "Fixes" #698514 by working around. -+# This should be removed after 7.0.1. -+netbeans_default_options="${netbeans_default_options} \ -+ --cp:a /usr/share/java/svnClientAdapter.jar" -+ - launchNbexec() { - nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do - if expr "$X" : "/.*" >/dev/null; then -@@ -182,6 +200,28 @@ - fi - } - -+# Workaround for #720684, which is a broken openjdk-6 -+# with a hard to fix bug. See JDK-8021890. -+# This can be removed when openjdk-6 is no longer default -+if [ -z "$netbeans_jdkhome" ] ; then -+ # if $netbeans_jdkhome has been set, we respect the choice -+ # Otherwise we check for the broken jdk -+ java -version 2>&1 | grep -i "openjdk" | grep "IcedTea6" > /dev/null -+ if [ $? = "0" ] ; then -+ # We try to find a java 7 jdk -+ # since we depend on java-7 there should be one -+ java_candidate=`update-alternatives --list java |\ -+ grep "java-7" |\ -+ head -1` -+ if [ -n "$java_candidate" ] ; then -+ netbeans_jdkhome=`echo $java_candidate | sed 's#/jre/bin/java$##'` -+ else -+ echo "No suitable JDK found." -+ exit; -+ fi -+ fi -+fi -+ - # in case of macosx, the apple.laf.useScreenMenuBar property should be ideally in the Info.plist file - # but it doesn't get propagated into the executed java VM. - case "`uname`" in -@@ -194,7 +234,7 @@ +@@ -194,7 +207,7 @@ --branding nb \ --clusters '"$netbeans_clusters"' \ -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \ diff --git a/debian/patches/series b/debian/patches/series index ca75a42..094dc35 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,8 @@ netbeans~svnclient.patch netbeans~o.a.tools.ant.patch netbeans~no-test-clean.patch netbeans~ide-launcher.patch +#netbeans~ide-launcher-7.0.1workarounds.patch +netbeans~ide-launcher-7.0.1workarounds.patch netbeans~updatecenters.patch netbeans~build.patch netbeans~cluster-properties.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
