This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 0b98e8a6a85a45c1eb76035c73605bdd895c5f33 Author: Markus Koschany <[email protected]> Date: Thu Jun 11 13:15:45 2015 +0200 Readd java2d.pmoffscreen=false to launcher script. This should correct graphical glitches while using the scrolling feature. Add netbeans-platform-launcher.patch again and include /usr/lib/jni on the search path. --- debian/patches/netbeans-ide-launcher.patch | 16 +++++++++++++++- debian/patches/netbeans-platform-launcher.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch index 5889eb7..22a4c0d 100644 --- a/debian/patches/netbeans-ide-launcher.patch +++ b/debian/patches/netbeans-ide-launcher.patch @@ -3,9 +3,23 @@ Date: Wed, 10 Jun 2015 14:30:38 +0200 Subject: netbeans ide launcher --- + ide/launcher/netbeans.conf | 2 +- ide/launcher/unix/netbeans | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) + 2 files changed, 5 insertions(+), 6 deletions(-) +diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf +index fa3afde..1ace6bb 100644 +--- a/ide/launcher/netbeans.conf ++++ b/ide/launcher/netbeans.conf +@@ -43,7 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.0.2" + # Concurrent Mark & Sweep garbage collector. + # (see http://wiki.netbeans.org/FaqGCPauses) + # +-netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true" ++netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dsun.java2d.pmoffscreen=false" + + # Default location of JDK: + # (set by installer or commented out if launcher should decide) diff --git a/ide/launcher/unix/netbeans b/ide/launcher/unix/netbeans index 8218c36..afc9d38 100644 --- a/ide/launcher/unix/netbeans diff --git a/debian/patches/netbeans-platform-launcher.patch b/debian/patches/netbeans-platform-launcher.patch new file mode 100644 index 0000000..f3170c1 --- /dev/null +++ b/debian/patches/netbeans-platform-launcher.patch @@ -0,0 +1,21 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 11 Jun 2015 13:15:21 +0200 +Subject: netbeans-platform launcher + +--- + o.n.bootstrap/launcher/unix/nbexec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/o.n.bootstrap/launcher/unix/nbexec b/o.n.bootstrap/launcher/unix/nbexec +index 97b6bf8..7df4142 100644 +--- a/o.n.bootstrap/launcher/unix/nbexec ++++ b/o.n.bootstrap/launcher/unix/nbexec +@@ -467,7 +467,7 @@ while [ "$restart" ] ; do + # + delete_new_clusters_file + rm -f "${restart_file}" +- eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -classpath "\"$cp\"" \ ++ eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -Djava.library.path="/usr/lib/jni" -classpath "\"$cp\"" \ + "$jargs" org.netbeans.Main "$args" '<&0' '&' + PID=$! + trap "kill $PID" EXIT diff --git a/debian/patches/series b/debian/patches/series index 2961058..9d642e4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ netbeans-libs.jaxb.patch netbeans-xml.jaxb.api.patch netbeans-build.patch netbeans-ide-launcher.patch +netbeans-platform-launcher.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
