From d8b24a075cce620bcfc9a3a773353e385768ed32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 8 Apr 2020 10:34:55 +0200 Subject: [PATCH 1/5] Fix Chrome sandbox on Linux AppImage builds --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47e2221..4ad1031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,12 @@ matrix: - g++-4.8 - gcc-4.8 -cache: - directories: - - node_modules - - $HOME/.cache/electron - - $HOME/.cache/electron-builder - +before_script: + - | # Fix chrome-sandbox: https://github.com/electron/electron/issues/17972 + if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then + echo "Fixing chrome-sandbox permissions..." + sudo chown root ./node_modules/electron/dist/chrome-sandbox + sudo chmod 4755 ./node_modules/electron/dist/chrome-sandbox + fi script: - npm run dist From 917dc30d2d320f648c5aee81cc40388b7bcf6d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 8 Apr 2020 10:36:24 +0200 Subject: [PATCH 2/5] Drop unneeded dependencies on Travis --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ad1031..0c9492c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,17 @@ matrix: node_js: '12' - os: linux + dist: bionic + sudo: true language: node_js node_js: '12' addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - libx11-dev - zlib1g-dev - - libpng12-dev + - libpng-dev - libxtst-dev - - g++-4.8 - - gcc-4.8 before_script: - | # Fix chrome-sandbox: https://github.com/electron/electron/issues/17972 From f879b6bd2a9f9202d5fdcb352c8d41fe81fdb0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 8 Apr 2020 10:55:04 +0200 Subject: [PATCH 3/5] Bump version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83c1e5f..d0107bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "jitsi-meet-electron", - "version": "2.0.0-beta2", + "version": "2.0.0-beta4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6be9d35..7d6b2f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jitsi-meet-electron", - "version": "2.0.0-beta3", + "version": "2.0.0-beta4", "description": "Electron application for Jitsi Meet", "main": "./build/main.js", "productName": "Jitsi Meet", From a50a3bd7b7469a161bcf6171ffbf9c1b89440dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 8 Apr 2020 16:48:51 +0200 Subject: [PATCH 4/5] Bump jitsi-meet-electron-utilss dependency --- package-lock.json | 40 ++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index d0107bc..2fc1d05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3990,13 +3990,24 @@ } }, "bl": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz", - "integrity": "sha512-FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz", + "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==", "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", "readable-stream": "^3.4.0" }, "dependencies": { + "buffer": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz", + "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -8111,8 +8122,8 @@ } }, "jitsi-meet-electron-utils": { - "version": "github:jitsi/jitsi-meet-electron-utils#83fd972296a9a6005762c0627f80c3f44ad6b832", - "from": "github:jitsi/jitsi-meet-electron-utils#v2.0.1", + "version": "github:jitsi/jitsi-meet-electron-utils#364d6ad20b2f1b81614444eab0d9f4166b8aead4", + "from": "github:jitsi/jitsi-meet-electron-utils#v2.0.3", "requires": { "nan": "^2.14.0", "postis": "^2.2.0", @@ -8814,6 +8825,11 @@ "minimist": "0.0.8" } }, + "mkdirp-classic": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz", + "integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==" + }, "moment": { "version": "2.23.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz", @@ -9659,9 +9675,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" } } }, @@ -11325,12 +11341,12 @@ "dev": true }, "tar-fs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", - "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", + "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", "requires": { "chownr": "^1.1.1", - "mkdirp": "^0.5.1", + "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^2.0.0" } diff --git a/package.json b/package.json index 7d6b2f1..e32e566 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "electron-updater": "4.2.5", "electron-window-state": "5.0.3", "history": "4.10.1", - "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.1", + "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.3", "js-utils": "github:jitsi/js-utils#0c53500a5120be2aa3fc590f0f932a0d4771920f", "moment": "2.23.0", "mousetrap": "1.6.2", From 6ce4e51071b886ea804fa3ff182c3d89eca874f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 8 Apr 2020 16:49:20 +0200 Subject: [PATCH 5/5] Bump version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2fc1d05..6c2142a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "jitsi-meet-electron", - "version": "2.0.0-beta4", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e32e566..8de5100 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jitsi-meet-electron", - "version": "2.0.0-beta4", + "version": "2.0.0", "description": "Electron application for Jitsi Meet", "main": "./build/main.js", "productName": "Jitsi Meet",