File netbeans-6.8~40-ide-launcher.patch of Package netbeans

Overview Repositories Revisions Requests Users Attributes Meta

File netbeans-6.8~40-ide-launcher.patch of Package netbeans (Revision 178f88578d03525e9573dd34d0906df9)

Currently displaying revision 178f88578d03525e9573dd34d0906df9 , Show latest

diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/ide/launcher/unix/netbeans netbeans-6.7.1.new/ide/launcher/unix/netbeans
--- netbeans-6.8/ide/launcher/unix/netbeans	2009-07-27 15:43:48.000000000 +0400
+++ netbeans-6.8.new/ide/launcher/unix/netbeans	2009-07-27 15:56:36.000000000 +0400
@@ -38,6 +38,17 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
+# The Startup Notification Protocol Specification established by freedesktop.org
+# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid
+# possible reuse by some process started later by this process, e.g. when a browser
+# will be started after clicking a hyperlink in the NetBeans.
+if [ ! -z $DESKTOP_STARTUP_ID ] ; then
+    # Save a value for later using in the NB_DESKTOP_STARTUP_ID
+    NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID
+
+    unset DESKTOP_STARTUP_ID
+fi
+
 #
 # resolve symlinks
 #
@@ -54,16 +65,18 @@
     fi
 done
 
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
+# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.8/bin
 
 if [ -f "$progdir"/../etc/netbeans.conf ] ; then
     . "$progdir"/../etc/netbeans.conf
 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
 
 
 # #68373: look for userdir, but do not modify "$@"
@@ -195,7 +208,6 @@
             --branding nb \
             --clusters '"$netbeans_clusters"' \
             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
             ${netbeans_default_options} \
             '"$@"'
         ;;

Places

File netbeans-6.8~40-ide-launcher.patch of Package netbeans (Revision 178f88578d03525e9573dd34d0906df9)

Places