upgrade novnc and patches to 1.4.0

[novnc-pve.git] / debian / patches / 0005-remove-vnc-logos.patch

diff --git a/debian/patches/0005-remove-vnc-logos.patch b/debian/patches/0005-remove-vnc-logos.patch
index 646475154d634ab56e6d470167c7076c76ba2db5..9395183f9fa8de180b25b2da9c93181c0920c779 100644 (file)
--- a/debian/patches/0005-remove-vnc-logos.patch
+++ b/debian/patches/0005-remove-vnc-logos.patch
@@ -7,50 +7,41 @@ to show the pve icon instead
 
 Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
 ---
- vnc.html | 32 +++-----------------------------
- 1 file changed, 3 insertions(+), 29 deletions(-)
+ vnc.html | 22 ++++------------------
+ 1 file changed, 4 insertions(+), 18 deletions(-)
 
 diff --git a/vnc.html b/vnc.html
-index 61d0fdd..216b33f 100644
+index b54fe41..5c5549d 100644
 --- a/vnc.html
 +++ b/vnc.html
-@@ -17,36 +17,10 @@
+@@ -15,26 +15,12 @@
+     -->
+     <title>noVNC</title>
  
-     <meta charset="utf-8">
+-    <link rel="icon" type="image/x-icon" href="app/images/icons/novnc.ico">
++    <meta charset="utf-8">
  
--    <!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
--    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
--    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
--    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
--    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
--    <link rel="icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
--    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
--    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
--    <link rel="icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
--    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
--    <link rel="icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
--    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
--    <link rel="icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
--    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
--    <!-- Firefox currently mishandles SVG, see #1419039
--    <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
--    -->
--    <!-- Repeated last so that legacy handling will pick this -->
--    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
--
      <!-- Apple iOS Safari settings -->
 -    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 -    <meta name="apple-mobile-web-app-capable" content="yes">
 -    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
--    <!-- Home Screen Icons (favourites and bookmarks use the normal icons) -->
--    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
--    <link rel="apple-touch-icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
--    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
--    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
+-
+-    <!-- @2x -->
+-    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-ios-40.png">
+-    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-ios-58.png">
+-    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-ios-80.png">
+-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-ios-120.png">
+-    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-ios-152.png">
+-    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-ios-167.png">
+-    <!-- @3x -->
+-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-ios-60.png">
+-    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-ios-87.png">
+-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-ios-120.png">
+-    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-ios-180.png">
 -
 +    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 +    <meta name="apple-mobile-web-app-capable" content="yes" />
 +    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
      <!-- Stylesheets -->
      <link rel="stylesheet" href="app/styles/base.css" />
-     <link rel="stylesheet" href="/novnc/app/styles/pve.css" />
+     <link rel="stylesheet" href="app/styles/input.css" />