[netbeans] 02/12: Refresh netbeans-ide-launcher.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 304f0d48447f0cf3f5e7de77bb2b045698bc04e2
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 27 00:06:59 2015 +0100

    Refresh netbeans-ide-launcher.patch
---
 debian/patches/netbeans-ide-launcher.patch | 65 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 66 insertions(+)

diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch
new file mode 100644
index 0000000..4f24ece
--- /dev/null
+++ b/debian/patches/netbeans-ide-launcher.patch
@@ -0,0 +1,65 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 27 Dec 2015 00:06:16 +0100
+Subject: netbeans ide launcher
+
+---
+ ide/launcher/netbeans.conf |  3 +--
+ ide/launcher/unix/netbeans | 10 ++++------
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
+index 3cdd3dc..96a12fc 100644
+--- a/ide/launcher/netbeans.conf
++++ b/ide/launcher/netbeans.conf
+@@ -43,8 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
+ # Concurrent Mark & Sweep garbage collector.
+ # (see http://wiki.netbeans.org/FaqGCPauses)
+ #
+-netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -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..acaa554 100644
+--- a/ide/launcher/unix/netbeans
++++ b/ide/launcher/unix/netbeans
+@@ -57,7 +57,7 @@ while [ -h "$PRG" ]; do
+     fi
+ done
+ 
+-progdir=`dirname "$PRG"`
++progdir=/usr/share/netbeans/8.1/bin
+ old=`pwd`
+ cd "$progdir"/..
+ basedir=`pwd`
+@@ -84,9 +84,9 @@ if [ -f "$basedir"/etc/netbeans.conf ] ; then
+ fi
+ 
+ # following should be done just in RPM or Solaris Launcher
+-# if [ -f /etc/netbeans.conf ] ; then
+-#     . /etc/netbeans.conf
+-# fi
++if [ -f /etc/netbeans.conf ] ; then
++    . /etc/netbeans.conf
++fi
+ 
+ export DEFAULT_USERDIR_ROOT
+ 
+@@ -236,7 +236,6 @@ case "`uname`" in
+             --branding nb \
+             --clusters '"$netbeans_clusters"' \
+             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
+-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
+             ${netbeans_default_options} \
+             '"$@"'
+         ;;
+@@ -246,7 +245,6 @@ case "`uname`" in
+             --branding nb \
+             --clusters '"$netbeans_clusters"' \
+             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
+-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
+             ${netbeans_default_options} \
+             '"$@"'
+         ;;
diff --git a/debian/patches/series b/debian/patches/series
index 6726c20..c09efd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ javaewah-version.patch
 netbeans-wildUpperBound.patch
 netbeans-com.sun.tools.hc.patch
 netbeans-CommandLineParser.patch
+netbeans-ide-launcher.patch

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