From 5e8b8730fe321f36c2a06e33ea2376c8ce3b5344 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Wed, 10 Jan 2018 11:46:51 +0100
Subject: [PATCH] change from submodule to tgz download and update to 3.2.0

since xtermjs does not ship the built version anymore in git
(starting with 3.0.0), we change it so that we have a download
target where we download the tarball from npm
---
 .gitmodules     |  3 ---
 Makefile        | 19 ++++++++++++-------
 src/www/main.js |  1 +
 xtermjs         |  1 -
 4 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 160000 xtermjs

diff --git a/.gitmodules b/.gitmodules
index a22f66b..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "xtermjs"]
-	path = xtermjs
-	url = ../mirror_xterm.js
diff --git a/Makefile b/Makefile
index f16e464..ad348ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,10 @@
 include defines.mk
 
-XTERMJSDIR=xtermjs
+XTERMJSVER=3.2.0
+XTERMJSTGZ=xterm-${XTERMJSVER}.tgz
+XTERMJSDIR=package
+XTERMDATA = ${XTERMJSDIR}/dist/
+
 SRCDIR=src
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -13,7 +17,7 @@ all: ${DEB}
 
 .PHONY: deb
 deb: ${DEB}
-${DEB}: | submodule
+${DEB}: ${XTERMDATA}
 	rm -rf ${SRCDIR}.tmp
 	cp -rpa ${SRCDIR} ${SRCDIR}.tmp
 	cp -a debian ${SRCDIR}.tmp/
@@ -23,13 +27,14 @@ ${DEB}: | submodule
 	lintian ${DEB}
 	@echo ${DEB}
 
-.PHONY: submodule
-submodule:
-	test -f "${XTERMJSDIR}/README.md" || git submodule update --init
+${XTERMDATA}: ${XTERMJSTGZ}
+	rm -rf ${XTTERMDIR}
+	tar -xf ${XTERMJSTGZ}
 
 .PHONY: download
 download ${SRCDIR}:
-	git submodule foreach 'git pull --ff-only origin master'
+	wget https://registry.npmjs.org/xterm/-/${XTERMJSTGZ} -O ${XTERMJSTGZ}.tmp
+	mv ${XTERMJSTGZ}.tmp ${XTERMJSTGZ}
 
 .PHONY: upload
 upload: ${DEB}
@@ -40,7 +45,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ debian/*~ *_${ARCH}.deb ${SRCDIR}.tmp *_all.deb *.changes *.dsc *.buildinfo
+	rm -rf *~ debian/*~ *_${ARCH}.deb ${SRCDIR}.tmp ${XTERMJSDIR} *_all.deb *.changes *.dsc *.buildinfo
 
 .PHONY: dinstall
 dinstall: deb
diff --git a/src/www/main.js b/src/www/main.js
index 62ec1c1..4aa856c 100644
--- a/src/www/main.js
+++ b/src/www/main.js
@@ -65,6 +65,7 @@ function updateState(newState, msg) {
 
 var terminalContainer = document.getElementById('terminal-container');
 document.getElementById('status_bar').addEventListener('click', hideMsg);
+Terminal.applyAddon(fit);
 
 createTerminal();
 
diff --git a/xtermjs b/xtermjs
deleted file mode 160000
index ea07bf8..0000000
--- a/xtermjs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ea07bf8f694a6e9714779b19c174e26162c39196
-- 
2.39.5