From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sat, 20 Apr 2013 13:51:02 +0000 (+0200)
Subject: disable javascript-events.patch
X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=commitdiff_plain;h=6b53b0de888be298f86369904560e6352a86e5ce

disable javascript-events.patch

We do not really use that, and the old netscape library is not
in openjdk (plugin.jar)
---

diff --git a/tigerpatches/fix-makefiles.patch b/tigerpatches/fix-makefiles.patch
new file mode 100644
index 0000000..de1fd32
--- /dev/null
+++ b/tigerpatches/fix-makefiles.patch
@@ -0,0 +1,13 @@
+Index: new/java/src/com/tigervnc/vncviewer/Makefile
+===================================================================
+--- new.orig/java/src/com/tigervnc/vncviewer/Makefile	2013-04-20 15:24:59.000000000 +0200
++++ new/java/src/com/tigervnc/vncviewer/Makefile	2013-04-20 15:31:48.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ CP = cp
+ JC = javac
+-JCFLAGS = -target 1.5 -classpath ../../../
++JCFLAGS = -target 1.7 -classpath ../../../
+ JAR = jar
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF
diff --git a/tigerpatches/series b/tigerpatches/series
index 7c47ff2..7cc3960 100644
--- a/tigerpatches/series
+++ b/tigerpatches/series
@@ -1,6 +1,7 @@
 #keydebug.patch
-javascript-events.patch
+#javascript-events.patch
 export-ctrl-alt-delete.patch
 trust-manager.patch
+fix-makefiles.patch
 username-param.patch
 fix-tab-button.patch
diff --git a/tigerpatches/trust-manager.patch b/tigerpatches/trust-manager.patch
index 0d4f109..5bbd9c6 100644
--- a/tigerpatches/trust-manager.patch
+++ b/tigerpatches/trust-manager.patch
@@ -9,8 +9,8 @@
 
 Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/X509Tunnel.java	2011-01-28 13:22:50.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/X509Tunnel.java	2011-01-28 13:26:51.000000000 +0100
+--- new.orig/java/src/com/tigervnc/vncviewer/X509Tunnel.java	2013-04-20 15:24:59.000000000 +0200
++++ new/java/src/com/tigervnc/vncviewer/X509Tunnel.java	2013-04-20 15:28:55.000000000 +0200
 @@ -26,13 +26,23 @@
  import javax.net.ssl.*;
  import java.security.*;
@@ -99,8 +99,8 @@ Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java
  }
 Index: new/java/src/com/tigervnc/vncviewer/RfbProto.java
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/RfbProto.java	2011-01-28 13:22:50.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/RfbProto.java	2011-01-28 13:26:51.000000000 +0100
+--- new.orig/java/src/com/tigervnc/vncviewer/RfbProto.java	2013-04-20 15:24:59.000000000 +0200
++++ new/java/src/com/tigervnc/vncviewer/RfbProto.java	2013-04-20 15:28:55.000000000 +0200
 @@ -411,7 +411,8 @@
      }
  
@@ -113,18 +113,18 @@ Index: new/java/src/com/tigervnc/vncviewer/RfbProto.java
  
 Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-28 13:26:16.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-28 13:26:51.000000000 +0100
-@@ -95,6 +95,8 @@
+--- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java	2013-04-20 15:28:42.000000000 +0200
++++ new/java/src/com/tigervnc/vncviewer/VncViewer.java	2013-04-20 15:29:55.000000000 +0200
+@@ -91,6 +91,8 @@
    int debugStatsExcludeUpdates;
    int debugStatsMeasureUpdates;
  
 +  String PVECert;
 +
-   JSObject jswin;
-   String myid;
+   // Reference to this applet for inter-applet communication.
+   public static java.applet.Applet refApplet;
  
-@@ -278,7 +280,7 @@
+@@ -263,7 +265,7 @@
  	fatalError(e.toString(), e);
        }
      }
@@ -133,7 +133,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    }
  
    //
-@@ -314,7 +316,7 @@
+@@ -299,7 +301,7 @@
    // If the rfbThread is being stopped, ignore any exceptions,
    // otherwise rethrow the exception so it can be handled.
    //
@@ -142,7 +142,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    void processNormalProtocol() throws Exception {
      try {
        vc.processNormalProtocol();
-@@ -857,6 +859,11 @@
+@@ -842,6 +844,11 @@
  
      // SocketFactory.
      socketFactory = readParameter("SocketFactory", false);
@@ -154,7 +154,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    }
  
    //
-@@ -1010,7 +1017,7 @@
+@@ -991,7 +998,7 @@
    }
  
    synchronized public void fatalError(String str, Exception e) {
@@ -163,7 +163,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
      if (rfb != null && rfb.closed()) {
        // Not necessary to show error message if the error was caused
        // by I/O problems after the rfb.close() method call.
-@@ -1108,11 +1115,11 @@
+@@ -1084,11 +1091,11 @@
    public void enableInput(boolean enable) {
      vc.enableInput(enable);
    }
@@ -177,7 +177,7 @@ Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
    public void componentResized(ComponentEvent e) {
      if (e.getComponent() == vncFrame) {
        if (options.autoScale) {
-@@ -1124,11 +1131,11 @@
+@@ -1100,11 +1107,11 @@
        }
      }
    }