From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 10 May 2013 05:54:48 +0000 (+0200)
Subject: re-enable javascript-events.patch
X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=commitdiff_plain;h=085cabefd04698ba2324d78f5977c6dd8d0177ef;ds=sidebyside

re-enable javascript-events.patch

We need that to make reload on migration working.
---

diff --git a/Makefile b/Makefile
index cd1f9ff..debc1a2 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ vncterm: vncterm.c glyphs.h ${VNCLIB}
 	gcc -O2 -g -o $@ vncterm.c -Wall -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
 
 jar: tigervnc.org
+	if test ! -f /usr/share/icedtea-web/plugin.jar; then echo "please install package icedtea-netx-common"; exit 1; fi
 	rm -rf tigervnc VncViewer.jar
 	rsync -av --exclude .svn --exclude .svnignore  tigervnc.org/ tigervnc
 	ln -s ../tigerpatches tigervnc/patches
diff --git a/README b/README
index 9a8d385..dca2469 100644
--- a/README
+++ b/README
@@ -32,6 +32,10 @@ http://sourceforge.net/tracker/?func=detail&aid=3488166&group_id=254363&atid=112
 
 I put patches for 1.2.0 to newtigerpatches subdir.
 
+Note: javascript-events.patch requires JSObject, which is inside plugin.jar
+previously provided by sun-java-jdk. For wheezy/openjdk, we need to install
+package "icedtea-netx-common" which contains that file.
+
 TODO:
 =====
 
diff --git a/VncViewer.jar b/VncViewer.jar
index d228d91..2c750c5 100644
Binary files a/VncViewer.jar and b/VncViewer.jar differ
diff --git a/tigerpatches/javascript-events.patch b/tigerpatches/javascript-events.patch
index e9e76cd..e98ed36 100644
--- a/tigerpatches/javascript-events.patch
+++ b/tigerpatches/javascript-events.patch
@@ -1,7 +1,7 @@
 Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-24 15:39:36.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-24 16:08:09.000000000 +0100
+--- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java	2013-05-10 07:41:18.000000000 +0200
++++ new/java/src/com/tigervnc/vncviewer/VncViewer.java	2013-05-10 07:41:18.000000000 +0200
 @@ -27,11 +27,15 @@
  
  package com.tigervnc.vncviewer;
@@ -18,9 +18,9 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
  public class VncViewer extends java.applet.Applet
    implements java.lang.Runnable, WindowListener, ComponentListener {
  
-@@ -91,6 +95,9 @@
-   int debugStatsExcludeUpdates;
-   int debugStatsMeasureUpdates;
+@@ -94,6 +98,9 @@
+ 
+   String PVECert;
  
 +  JSObject jswin;
 +  String myid;
@@ -28,7 +28,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    // Reference to this applet for inter-applet communication.
    public static java.applet.Applet refApplet;
  
-@@ -104,6 +111,11 @@
+@@ -129,6 +136,11 @@
  
      refApplet = this;
  
@@ -40,7 +40,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
      if (inSeparateFrame) {
        vncFrame = new Frame("TigerVNC");
        if (!inAnApplet) {
-@@ -134,6 +146,9 @@
+@@ -159,6 +171,9 @@
  
      rfbThread = new Thread(this);
      rfbThread.start();
@@ -50,7 +50,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    }
  
    public void update(Graphics g) {
-@@ -936,6 +951,8 @@
+@@ -1002,6 +1017,8 @@
  
      if (inAnApplet) {
        showMessage("Disconnected");
@@ -59,7 +59,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
      } else {
        System.exit(0);
      }
-@@ -953,6 +970,8 @@
+@@ -1019,6 +1036,8 @@
        // vncContainer null, applet not inited,
        // can not present the error to the user.
        Thread.currentThread().stop();
@@ -68,7 +68,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
      } else {
        System.exit(1);
      }
-@@ -974,6 +993,8 @@
+@@ -1040,6 +1059,8 @@
        rfb.close();
  
      if (inAnApplet) {
@@ -77,7 +77,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
        showMessage(str);
      } else {
        System.exit(1);
-@@ -1043,6 +1064,9 @@
+@@ -1109,6 +1130,9 @@
        rfb.close();
      if (inSeparateFrame)
        vncFrame.dispose();
@@ -87,7 +87,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    }
  
    //
-@@ -1091,6 +1115,8 @@
+@@ -1157,6 +1181,8 @@
      if (!inAnApplet) {
        System.exit(0);
      }
@@ -98,17 +98,14 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    //
 Index: new/java/src/com/tigervnc/vncviewer/Makefile
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/Makefile	2011-01-24 15:39:36.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/Makefile	2011-01-24 16:08:09.000000000 +0100
-@@ -4,7 +4,10 @@
+--- new.orig/java/src/com/tigervnc/vncviewer/Makefile	2013-05-10 07:41:18.000000000 +0200
++++ new/java/src/com/tigervnc/vncviewer/Makefile	2013-05-10 07:43:17.000000000 +0200
+@@ -4,7 +4,7 @@
  
  CP = cp
  JC = javac
--JCFLAGS = -target 1.5 -classpath ../../../
-+# define java.ext.dirs, else plugin.jar (JSObject) is not found
-+# is there a better way to include that?
-+JCFLAGS = -target 1.5 -classpath ../../../ -Djava.ext.dirs=/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/
-+
+-JCFLAGS = -target 1.7 -classpath ../../../
++JCFLAGS = -target 1.7 -classpath ../../../ -Djava.ext.dirs=/usr/share/icedtea-web/
  JAR = jar
  ARCHIVE = VncViewer.jar
  MANIFEST = MANIFEST.MF
diff --git a/tigerpatches/series b/tigerpatches/series
index 144b68d..dc0b1db 100644
--- a/tigerpatches/series
+++ b/tigerpatches/series
@@ -6,3 +6,4 @@ fix-makefiles.patch
 username-param.patch
 fix-tab-button.patch
 set-trusted-lib.patch
+javascript-events.patch