From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D2E611FF17A for ; Tue, 6 Aug 2024 14:31:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 163271D32D; Tue, 6 Aug 2024 14:31:33 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 6 Aug 2024 14:31:26 +0200 Message-Id: <20240806123127.2331746-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.136 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH novnc 1/2] upgrade noVNC and patches to 1.5.0 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Dominik Csapak --- .../0001-add-PVE-specific-JS-code.patch | 4 ++-- ...002-add-custom-fbresize-event-on-rfb.patch | 10 +++++----- ...nge-scaling-when-toggling-fullscreen.patch | 6 +++--- ...rectory-for-fetching-images-js-files.patch | 20 +++++++++---------- .../0009-decrease-animation-time.patch | 2 +- .../0011-add-localCursor-setting-to-rfb.patch | 18 ++++++++--------- ...ove-the-default-value-of-wsProtocols.patch | 4 ++-- novnc | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/debian/patches/0001-add-PVE-specific-JS-code.patch b/debian/patches/0001-add-PVE-specific-JS-code.patch index 904adda..af61af8 100644 --- a/debian/patches/0001-add-PVE-specific-JS-code.patch +++ b/debian/patches/0001-add-PVE-specific-JS-code.patch @@ -452,7 +452,7 @@ index 0000000..e3c7758 + }, +}; diff --git a/app/ui.js b/app/ui.js -index c1f6776..5ebb134 100644 +index f27dfe2..c96cbaa 100644 --- a/app/ui.js +++ b/app/ui.js @@ -17,6 +17,7 @@ import keysyms from "../core/input/keysymdef.js"; @@ -571,7 +571,7 @@ index c1f6776..5ebb134 100644 if (password === null) { password = undefined; } -@@ -1689,9 +1708,36 @@ const UI = { +@@ -1697,9 +1716,36 @@ const UI = { /* ------^------- * /EXTRA KEYS * ============== diff --git a/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch b/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch index decde9d..822cc65 100644 --- a/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch +++ b/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch @@ -13,10 +13,10 @@ Signed-off-by: Dominik Csapak 2 files changed, 21 insertions(+) diff --git a/app/ui.js b/app/ui.js -index 5ebb134..60f4c00 100644 +index c96cbaa..db811d9 100644 --- a/app/ui.js +++ b/app/ui.js -@@ -1074,6 +1074,7 @@ const UI = { +@@ -1082,6 +1082,7 @@ const UI = { UI.rfb.addEventListener("clipboard", UI.clipboardReceive); UI.rfb.addEventListener("bell", UI.bell); UI.rfb.addEventListener("desktopname", UI.updateDesktopName); @@ -24,7 +24,7 @@ index 5ebb134..60f4c00 100644 UI.rfb.clipViewport = UI.getSetting('view_clip'); UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale'; UI.rfb.resizeSession = UI.getSetting('resize') === 'remote'; -@@ -1733,6 +1734,16 @@ const UI = { +@@ -1741,6 +1742,16 @@ const UI = { document.getElementById('pve_commands_button').classList.remove("noVNC_selected"); }, @@ -42,10 +42,10 @@ index 5ebb134..60f4c00 100644 * /PVE * ============== diff --git a/core/rfb.js b/core/rfb.js -index 6afd7c6..2f662ce 100644 +index f2deb0e..37ba099 100644 --- a/core/rfb.js +++ b/core/rfb.js -@@ -2881,6 +2881,16 @@ export default class RFB extends EventTargetMixin { +@@ -2873,6 +2873,16 @@ export default class RFB extends EventTargetMixin { this._updateClip(); this._updateScale(); diff --git a/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch b/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch index 38a35aa..982dec2 100644 --- a/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch +++ b/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch @@ -12,10 +12,10 @@ Signed-off-by: Dominik Csapak 1 file changed, 11 insertions(+) diff --git a/app/ui.js b/app/ui.js -index 60f4c00..235b049 100644 +index db811d9..2b7aae3 100644 --- a/app/ui.js +++ b/app/ui.js -@@ -1292,6 +1292,13 @@ const UI = { +@@ -1300,6 +1300,13 @@ const UI = { } else if (document.msExitFullscreen) { document.msExitFullscreen(); } @@ -29,7 +29,7 @@ index 60f4c00..235b049 100644 } else { if (document.documentElement.requestFullscreen) { document.documentElement.requestFullscreen(); -@@ -1302,7 +1309,11 @@ const UI = { +@@ -1310,7 +1317,11 @@ const UI = { } else if (document.body.msRequestFullscreen) { document.body.msRequestFullscreen(); } diff --git a/debian/patches/0006-change-source-directory-for-fetching-images-js-files.patch b/debian/patches/0006-change-source-directory-for-fetching-images-js-files.patch index bdbfd80..536993a 100644 --- a/debian/patches/0006-change-source-directory-for-fetching-images-js-files.patch +++ b/debian/patches/0006-change-source-directory-for-fetching-images-js-files.patch @@ -13,7 +13,7 @@ Signed-off-by: Dominik Csapak 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/ui.js b/app/ui.js -index 235b049..1d52a5a 100644 +index 2b7aae3..effb1bc 100644 --- a/app/ui.js +++ b/app/ui.js @@ -73,7 +73,7 @@ const UI = { @@ -25,15 +25,15 @@ index 235b049..1d52a5a 100644 .then((response) => { if (!response.ok) { throw Error("" + response.status + " " + response.statusText); -@@ -1835,7 +1835,7 @@ l10n.setup(LINGUAS); - if (l10n.language === "en" || l10n.dictionary !== undefined) { - UI.prime(); - } else { -- fetch('app/locale/' + l10n.language + '.json') -+ fetch('/novnc/app/locale/' + l10n.language + '.json') - .then((response) => { - if (!response.ok) { - throw Error("" + response.status + " " + response.statusText); +@@ -1839,7 +1839,7 @@ const UI = { + + // Set up translations + const LINGUAS = ["cs", "de", "el", "es", "fr", "it", "ja", "ko", "nl", "pl", "pt_BR", "ru", "sv", "tr", "zh_CN", "zh_TW"]; +-l10n.setup(LINGUAS, "app/locale/") ++l10n.setup(LINGUAS, "/novnc/app/locale/") + .catch(err => Log.Error("Failed to load translations: " + err)) + .then(UI.prime); + diff --git a/vnc.html b/vnc.html index 5c5549d..f081aee 100644 --- a/vnc.html diff --git a/debian/patches/0009-decrease-animation-time.patch b/debian/patches/0009-decrease-animation-time.patch index 35f6b4f..5d76932 100644 --- a/debian/patches/0009-decrease-animation-time.patch +++ b/debian/patches/0009-decrease-animation-time.patch @@ -11,7 +11,7 @@ Signed-off-by: Dominik Csapak 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/styles/base.css b/app/styles/base.css -index 06e736a..a3eb872 100644 +index f83ad4b..fd1a66e 100644 --- a/app/styles/base.css +++ b/app/styles/base.css @@ -222,7 +222,7 @@ html { diff --git a/debian/patches/0011-add-localCursor-setting-to-rfb.patch b/debian/patches/0011-add-localCursor-setting-to-rfb.patch index ba9ba48..8efe275 100644 --- a/debian/patches/0011-add-localCursor-setting-to-rfb.patch +++ b/debian/patches/0011-add-localCursor-setting-to-rfb.patch @@ -15,7 +15,7 @@ Signed-off-by: Thomas Lamprecht 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app/ui.js b/app/ui.js -index 1d52a5a..02004c3 100644 +index effb1bc..e2b6bd8 100644 --- a/app/ui.js +++ b/app/ui.js @@ -180,6 +180,7 @@ const UI = { @@ -35,7 +35,7 @@ index 1d52a5a..02004c3 100644 UI.addSettingChangeHandler('host'); UI.addSettingChangeHandler('port'); UI.addSettingChangeHandler('path'); -@@ -1076,6 +1079,7 @@ const UI = { +@@ -1084,6 +1087,7 @@ const UI = { UI.rfb.addEventListener("desktopname", UI.updateDesktopName); UI.rfb.addEventListener("fbresize", UI.updateSessionSize); UI.rfb.clipViewport = UI.getSetting('view_clip'); @@ -43,7 +43,7 @@ index 1d52a5a..02004c3 100644 UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale'; UI.rfb.resizeSession = UI.getSetting('resize') === 'remote'; UI.rfb.qualityLevel = parseInt(UI.getSetting('quality')); -@@ -1760,6 +1764,12 @@ const UI = { +@@ -1768,6 +1772,12 @@ const UI = { * ============== * MISC * ------v------*/ @@ -57,7 +57,7 @@ index 1d52a5a..02004c3 100644 if (!UI.rfb) return; UI.rfb.viewOnly = UI.getSetting('view_only'); diff --git a/core/rfb.js b/core/rfb.js -index 2f662ce..2dc0638 100644 +index 37ba099..0f31079 100644 --- a/core/rfb.js +++ b/core/rfb.js @@ -290,6 +290,7 @@ export default class RFB extends EventTargetMixin { @@ -85,7 +85,7 @@ index 2f662ce..2dc0638 100644 set showDotCursor(show) { this._showDotCursor = show; diff --git a/core/util/cursor.js b/core/util/cursor.js -index 3000cf0..0d9651f 100644 +index 20e75f1..91763a5 100644 --- a/core/util/cursor.js +++ b/core/util/cursor.js @@ -12,6 +12,8 @@ export default class Cursor { @@ -97,7 +97,7 @@ index 3000cf0..0d9651f 100644 this._canvas = document.createElement('canvas'); if (useFallback) { -@@ -104,7 +106,7 @@ export default class Cursor { +@@ -106,7 +108,7 @@ export default class Cursor { } clear() { @@ -106,7 +106,7 @@ index 3000cf0..0d9651f 100644 this._canvas.width = 0; this._canvas.height = 0; this._position.x = this._position.x + this._hotSpot.x; -@@ -134,6 +136,11 @@ export default class Cursor { +@@ -136,6 +138,11 @@ export default class Cursor { this._updateVisibility(target); } @@ -118,7 +118,7 @@ index 3000cf0..0d9651f 100644 _handleMouseOver(event) { // This event could be because we're entering the target, or // moving around amongst its sub elements. Let the move handler -@@ -186,6 +193,11 @@ export default class Cursor { +@@ -188,6 +195,11 @@ export default class Cursor { } } @@ -130,7 +130,7 @@ index 3000cf0..0d9651f 100644 _showCursor() { if (this._canvas.style.visibility === 'hidden') { this._canvas.style.visibility = ''; -@@ -244,4 +256,5 @@ export default class Cursor { +@@ -246,4 +258,5 @@ export default class Cursor { return document.captureElement && document.documentElement.contains(document.captureElement); } diff --git a/debian/patches/0013-Revert-Remove-the-default-value-of-wsProtocols.patch b/debian/patches/0013-Revert-Remove-the-default-value-of-wsProtocols.patch index 1e373d0..0d82f09 100644 --- a/debian/patches/0013-Revert-Remove-the-default-value-of-wsProtocols.patch +++ b/debian/patches/0013-Revert-Remove-the-default-value-of-wsProtocols.patch @@ -15,10 +15,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/rfb.js b/core/rfb.js -index 2dc0638..39fd869 100644 +index 0f31079..22f2966 100644 --- a/core/rfb.js +++ b/core/rfb.js -@@ -117,7 +117,8 @@ export default class RFB extends EventTargetMixin { +@@ -116,7 +116,8 @@ export default class RFB extends EventTargetMixin { this._rfbCredentials = options.credentials || {}; this._shared = 'shared' in options ? !!options.shared : true; this._repeaterID = options.repeaterID || ''; diff --git a/novnc b/novnc index 90455ee..7fcf9dc 160000 --- a/novnc +++ b/novnc @@ -1 +1 @@ -Subproject commit 90455eef0692d2e35276fd31286114d0955016b0 +Subproject commit 7fcf9dcfe0cc5b14e3841a4429dc091a6ffca861 -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel