summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4a0ae70)
We need that to make reload on migration working.
gcc -O2 -g -o $@ vncterm.c -Wall -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
jar: tigervnc.org
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
rm -rf tigervnc VncViewer.jar
rsync -av --exclude .svn --exclude .svnignore tigervnc.org/ tigervnc
ln -s ../tigerpatches tigervnc/patches
I put patches for 1.2.0 to newtigerpatches subdir.
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.
+
Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
===================================================================
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;
@@ -27,11 +27,15 @@
package com.tigervnc.vncviewer;
public class VncViewer extends java.applet.Applet
implements java.lang.Runnable, WindowListener, ComponentListener {
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;
+ JSObject jswin;
+ String myid;
// Reference to this applet for inter-applet communication.
public static java.applet.Applet refApplet;
// Reference to this applet for inter-applet communication.
public static java.applet.Applet refApplet;
if (inSeparateFrame) {
vncFrame = new Frame("TigerVNC");
if (!inAnApplet) {
if (inSeparateFrame) {
vncFrame = new Frame("TigerVNC");
if (!inAnApplet) {
rfbThread = new Thread(this);
rfbThread.start();
rfbThread = new Thread(this);
rfbThread.start();
}
public void update(Graphics g) {
}
public void update(Graphics g) {
if (inAnApplet) {
showMessage("Disconnected");
if (inAnApplet) {
showMessage("Disconnected");
} else {
System.exit(0);
}
} else {
System.exit(0);
}
// vncContainer null, applet not inited,
// can not present the error to the user.
Thread.currentThread().stop();
// vncContainer null, applet not inited,
// can not present the error to the user.
Thread.currentThread().stop();
} else {
System.exit(1);
}
} else {
System.exit(1);
}
rfb.close();
if (inAnApplet) {
rfb.close();
if (inAnApplet) {
showMessage(str);
} else {
System.exit(1);
showMessage(str);
} else {
System.exit(1);
rfb.close();
if (inSeparateFrame)
vncFrame.dispose();
rfb.close();
if (inSeparateFrame)
vncFrame.dispose();
if (!inAnApplet) {
System.exit(0);
}
if (!inAnApplet) {
System.exit(0);
}
//
Index: new/java/src/com/tigervnc/vncviewer/Makefile
===================================================================
//
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 @@
--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
JAR = jar
ARCHIVE = VncViewer.jar
MANIFEST = MANIFEST.MF
username-param.patch
fix-tab-button.patch
set-trusted-lib.patch
username-param.patch
fix-tab-button.patch
set-trusted-lib.patch