rexy712/rexy712-overlay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update riot-web

Browse Source
This commit is contained in:
layman 2020-04-02 10:50:14 -07:00
parent 3e76a38256
commit d556b9d6a6
10 changed files with 23 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net-im/riot-web/Manifest
View File

@ -1,4 +1,2 @@
DIST riot-web-1.4.2.tar.gz 1509372 BLAKE2B 8491674aae6a912b9b6b67318ca2eaff642525101f15c12d2dd80f76ff9d405a0673a940ba8cd08ca83871233cf4cd36f0815c6798fee92c3dbf1c35f5951888 SHA512 2911c8e8c53fdf43f393727505c6c24fcd7304189ca9a40679bdbfef7308accfca2f02e4bc1a9ffe833918dc0f25428a09733b69802546a75439d1e423df97df
DIST riot-web-1.5.0.tar.gz 1512020 BLAKE2B 0ab27789a7bdb8a1a909db8eefab43edcddff9c28bb86414dc4b7b6ad2e8253067484f5c1a3016553c3292b8d34ee6774e774091e9e63d72e99b2c552c2f72af SHA512 38c9141df97f82574dd3c9d2efa93aef382d66077071a7c007fb1bfc93e51fc2ab75f1ac0a6db6aa4b09d73a5100b6dc9ce6a9d2e8c90c2c2a2b368d077e5e3c
DIST riot-web-1.5.10.tar.gz 1401671 BLAKE2B d9c2ba57fe4dc68cbd0b919f5a15a2a5935dd7c171815710c65224c19ac276ab62b19c7e0329489f322072b43aafc6a5f6a2705b4d01513c9486e635561ee95e SHA512 855ec625ae07afb8989b04f7f5a8cca6b1a047810a82a88746d936ea9d84c58d7a3c9374412d6f112356df2cdae13f39dd904403663abcfe19a67332e71c4cbb DIST riot-web-1.5.10.tar.gz 1401671 BLAKE2B d9c2ba57fe4dc68cbd0b919f5a15a2a5935dd7c171815710c65224c19ac276ab62b19c7e0329489f322072b43aafc6a5f6a2705b4d01513c9486e635561ee95e SHA512 855ec625ae07afb8989b04f7f5a8cca6b1a047810a82a88746d936ea9d84c58d7a3c9374412d6f112356df2cdae13f39dd904403663abcfe19a67332e71c4cbb
DIST riot-web-1.5.6.tar.gz 1484473 BLAKE2B c5f801c3b69a3165b7635ad8ed036ec506d4c8a8d59c23eb3b67e23c8b573ee3981082a5b83df5596d30d6a349643ebad50c9f918e21db9081d1691b34b2f887 SHA512 78e444d400636fee619b1b2fa1d13a73a22c2af44c42a839a4c6a27ecf51533f648df5438647538e9aac3078815520d7c62818a9d5afcf890042fad044c62965 DIST riot-web-1.5.15.tar.gz 1407869 BLAKE2B fb19bb606d6ddb56344ea2bc0247e9736e957ce6c97b08fa52753661ac66db7966147bfa5345f4e18b3dca5da2d8fdde6873778c91f90c434b27de741d09118d SHA512 6d02f8304617a286ea3fd74f218242bb859be8e706126550b5c38706cb56d3c45326b2d2700f9532dcb029bede766e48aa5c5a95dea3707e85222dd90bdc148a

12
net-im/riot-web/files/riot-1.4.0-fix-hidden-on-start.patch
View File

@ -1,12 +0,0 @@
diff -Naur a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
--- a/electron_app/src/electron-main.js 2019-12-16 10:21:31.356675852 -0800
+++ b/electron_app/src/electron-main.js 2019-12-16 10:21:12.442675147 -0800
@@ -368,7 +368,7 @@
// explicitly hide because setApplicationMenu on Linux otherwise shows...
// https://github.com/electron/electron/issues/9621
- mainWindow.hide();
+ //mainWindow.hide();
// Create trayIcon icon
tray.create({

12
net-im/riot-web/files/riot-1.4.0-icon-path.patch
View File

@ -1,12 +0,0 @@
diff -Naur a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
--- a/electron_app/src/electron-main.js 2019-12-16 10:09:34.583649124 -0800
+++ b/electron_app/src/electron-main.js 2019-12-16 10:09:16.621648454 -0800
@@ -332,7 +332,7 @@
// It's important to call `path.join` so we don't end up with the packaged
// asar in the final path.
const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
- const iconPath = path.join(__dirname, "..", "..", "img", iconFile);
+ const iconPath = path.join(__dirname, "..", "img", iconFile);
// Load the previous window state with fallback to defaults
const mainWindowState = windowStateKeeper({

12
net-im/riot-web/files/riot-1.4.0-move-origin-migrator.patch
View File

@ -1,12 +0,0 @@
diff -Naur a/electron_app/src/originMigrator.js b/electron_app/src/originMigrator.js
--- a/electron_app/src/originMigrator.js 2019-11-07 11:55:10.315123179 -0800
+++ b/electron_app/src/originMigrator.js 2019-11-07 11:55:24.918122160 -0800
@@ -61,7 +61,7 @@
// Normalise the path because in the distribution, __dirname will be inside the
// electron asar.
- const sourcePagePath = path.normalize(__dirname + '/../../origin_migrator/source.html');
+ const sourcePagePath = path.normalize(__dirname + '/../origin_migrator/source.html');
console.log("Loading path: " + sourcePagePath);
migrateWindow.loadURL('file://' + sourcePagePath);
});

16
net-im/riot-web/files/riot-1.5.6-remove-seshat.patch
View File

@ -1,16 +0,0 @@
diff -Naur a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
--- a/electron_app/src/electron-main.js 2019-12-09 03:39:56.000000000 -0800
+++ b/electron_app/src/electron-main.js 2019-12-16 13:39:33.898118954 -0800
@@ -45,12 +45,6 @@
let Seshat = null;
-try {
- Seshat = require('matrix-seshat');
-} catch (e) {
- console.warn("seshat unavailable", e);
-}
-
if (argv["help"]) {
console.log("Options:");
console.log(" --profile-dir {path}: Path to where to store the profile.");

110
net-im/riot-web/riot-web-1.4.2.ebuild
View File

@ -1,110 +0,0 @@
# Copyright 2019 rexy712
# Distributed under the terms of the GNU General Public License v3
EAPI=6
DESCRIPTION="A glossy Matrix collaboration client for the web"
HOMEPAGE="https://riot.im"
inherit eutils
if [ "${PV}" == "9999" ];then
inherit git-r3
SRC_URI=""
KEYWORDS=""
EGIT_REPO_URI="https://github.com/vector-im/riot-web.git"
EGIT_BRANCH="develop"
else
if [ "${PR}" != "r0" ];then
rc_num="${PR:1}"
MY_PV="${PV}-rc.${rc_num}"
else
MY_PV="${PV}"
fi
MY_PF="${PN}-${MY_PV}"
SRC_URI="https://github.com/vector-im/riot-web/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz" #change source tar file name to include package name
KEYWORDS="~amd64"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="+emoji proxy +darkmode +labs +savedconfig"
REQUIRED_USE=""
RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
DEPEND="sys-devel/binutils:*
>=net-libs/nodejs-10.0
>=sys-apps/yarn-1.15
x11-libs/libXScrnSaver
net-print/cups
dev-libs/nss
gnome-base/gconf
emoji? ( >=media-fonts/noto-emoji-20180823 )
>=media-video/ffmpeg-4.0
|| ( >=dev-util/electron-bin-6.0.0 >=dev-util/electron-6.0.0 )"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
"${FILESDIR}/riot-1.4.0-icon-path.patch"
"${FILESDIR}/riot-1.4.0-fix-hidden-on-start.patch"
)
DESTINATION="/opt/Riot"
src_prepare() {
if use "proxy";then
yarn install || die "Yarn module installation failed"
cd electron_app
yarn install || die "Yarn module installation failed"
cd ..
[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
else
http_proxy="" yarn install || die "Yarn module installation failed"
cd electron_app
http_proxy="" yarn install || die "Yarn module installation failed"
cd ..
[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
fi
if [ -e "${DESTINATION}/webapp/config.json" ] && use savedconfig;then
cp "${DESTINATION}/webapp/config.json" "${S}"/config.json
else
cp "${S}"/config.sample.json "${S}"/config.json
use "darkmode" && sed -e 's/^\([[:space:]]*"default_theme":[[:space:]]*\)"light"/\1"dark"/' "${S}"/config.json -i
use "labs" && sed -e 's/^\([[:space:]]*"showLabsSettings":[[:space:]]*\)false/\1true/' "${S}"/config.json -i
fi
if [ "${PV}" == "9999" ];then
#skip built in patches
eapply_user
else
default
fi
}
src_compile() {
yarn build || die "Build failed"
}
src_install() {
insinto "${DESTINATION}"
doins -r "${S}/webapp"
doins -r "${S}/electron_app"
cp "${FILESDIR}"/runscript.sh "${S}/${PN}"
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${S}/${PN}" -i
insopts "-m755"
doins "${S}/${PN}"
insinto "${DESTINATION}/electron_app"
doins -r "${S}/origin_migrator"
cp "${FILESDIR}/${PN}.desktop" "${T}"
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i
domenu "${T}/${PN}.desktop"
dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
}

110
net-im/riot-web/riot-web-1.5.0.ebuild
View File

@ -1,110 +0,0 @@
# Copyright 2019 rexy712
# Distributed under the terms of the GNU General Public License v3
EAPI=6
DESCRIPTION="A glossy Matrix collaboration client for the web"
HOMEPAGE="https://riot.im"
inherit eutils
if [ "${PV}" == "9999" ];then
inherit git-r3
SRC_URI=""
KEYWORDS=""
EGIT_REPO_URI="https://github.com/vector-im/riot-web.git"
EGIT_BRANCH="develop"
else
if [ "${PR}" != "r0" ];then
rc_num="${PR:1}"
MY_PV="${PV}-rc.${rc_num}"
else
MY_PV="${PV}"
fi
MY_PF="${PN}-${MY_PV}"
SRC_URI="https://github.com/vector-im/riot-web/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz" #change source tar file name to include package name
KEYWORDS="~amd64"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="+emoji proxy +darkmode +labs +savedconfig"
REQUIRED_USE=""
RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
DEPEND="sys-devel/binutils:*
>=net-libs/nodejs-10.0
>=sys-apps/yarn-1.15
x11-libs/libXScrnSaver
net-print/cups
dev-libs/nss
gnome-base/gconf
emoji? ( >=media-fonts/noto-emoji-20180823 )
>=media-video/ffmpeg-4.0
|| ( >=dev-util/electron-bin-6.0.0 >=dev-util/electron-6.0.0 )"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
"${FILESDIR}/riot-1.4.0-icon-path.patch"
"${FILESDIR}/riot-1.4.0-fix-hidden-on-start.patch"
)
DESTINATION="/opt/Riot"
src_prepare() {
if use "proxy";then
yarn install || die "Yarn module installation failed"
cd electron_app
yarn install || die "Yarn module installation failed"
cd ..
[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
else
http_proxy="" yarn install || die "Yarn module installation failed"
cd electron_app
http_proxy="" yarn install || die "Yarn module installation failed"
cd ..
[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
fi
if [ -e "${DESTINATION}/webapp/config.json" ] && use savedconfig;then
cp "${DESTINATION}/webapp/config.json" "${S}"/config.json
else
cp "${S}"/config.sample.json "${S}"/config.json
use "darkmode" && sed -e 's/^\([[:space:]]*"default_theme":[[:space:]]*\)"light"/\1"dark"/' "${S}"/config.json -i
use "labs" && sed -e 's/^\([[:space:]]*"showLabsSettings":[[:space:]]*\)false/\1true/' "${S}"/config.json -i
fi
if [ "${PV}" == "9999" ];then
#skip built in patches
eapply_user
else
default
fi
}
src_compile() {
yarn build || die "Build failed"
}
src_install() {
insinto "${DESTINATION}"
doins -r "${S}/webapp"
doins -r "${S}/electron_app"
cp "${FILESDIR}"/runscript.sh "${S}/${PN}"
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${S}/${PN}" -i
insopts "-m755"
doins "${S}/${PN}"
insinto "${DESTINATION}/electron_app"
doins -r "${S}/origin_migrator"
cp "${FILESDIR}/${PN}.desktop" "${T}"
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i
domenu "${T}/${PN}.desktop"
dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
}

9
net-im/riot-web/riot-web-1.5.10.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 2019 rexy712 # Copyright 2019 rexy712
# Distributed under the terms of the GNU General Public License v3 # Distributed under the terms of the GNU General Public License v3
EAPI=6 EAPI=6
@ -35,15 +35,16 @@ REQUIRED_USE=""
RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
DEPEND="sys-devel/binutils:* DEPEND="sys-devel/binutils:*
>=net-libs/nodejs-10.0 >=net-libs/nodejs-12.0
>=sys-apps/yarn-1.15 <net-libs/nodejs-13.9
>=sys-apps/yarn-1.20
x11-libs/libXScrnSaver x11-libs/libXScrnSaver
net-print/cups net-print/cups
dev-libs/nss dev-libs/nss
gnome-base/gconf gnome-base/gconf
emoji? ( >=media-fonts/noto-emoji-20180823 ) emoji? ( >=media-fonts/noto-emoji-20180823 )
>=media-video/ffmpeg-4.0 >=media-video/ffmpeg-4.0
|| ( >=dev-util/electron-bin-6.0.0:= >=dev-util/electron-6.0.0:= )" || ( dev-util/electron-bin-next:7 dev-util/electron-next:7 )"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
PATCHES=( PATCHES=(

10
net-im/riot-web/riot-web-1.5.6.ebuild → net-im/riot-web/riot-web-1.5.15.ebuild
View File

@ -35,22 +35,19 @@ REQUIRED_USE=""
RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
DEPEND="sys-devel/binutils:* DEPEND="sys-devel/binutils:*
>=net-libs/nodejs-10.0 >=net-libs/nodejs-13.0
>=sys-apps/yarn-1.15 >=sys-apps/yarn-1.20
x11-libs/libXScrnSaver x11-libs/libXScrnSaver
net-print/cups net-print/cups
dev-libs/nss dev-libs/nss
gnome-base/gconf gnome-base/gconf
emoji? ( >=media-fonts/noto-emoji-20180823 ) emoji? ( >=media-fonts/noto-emoji-20180823 )
>=media-video/ffmpeg-4.0 >=media-video/ffmpeg-4.0
|| ( >=dev-util/electron-bin-6.0.0:= >=dev-util/electron-6.0.0:= )" || ( dev-util/electron-bin-next:7 dev-util/electron-next:7 )"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
PATCHES=( PATCHES=(
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
"${FILESDIR}/riot-1.5.6-icon-path.patch" "${FILESDIR}/riot-1.5.6-icon-path.patch"
#TODO find a way to rebuild seshat for given electron target
"${FILESDIR}/riot-1.5.6-remove-seshat.patch"
) )
DESTINATION="/opt/Riot" DESTINATION="/opt/Riot"
@ -100,7 +97,6 @@ src_install() {
doins "${S}/${PN}" doins "${S}/${PN}"
insinto "${DESTINATION}/electron_app" insinto "${DESTINATION}/electron_app"
doins -r "${S}/origin_migrator"
cp "${FILESDIR}/${PN}.desktop" "${T}" cp "${FILESDIR}/${PN}.desktop" "${T}"
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i

34
net-im/riot-web/riot-web-9999.ebuild
View File

@ -35,40 +35,35 @@ REQUIRED_USE=""
RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
DEPEND="sys-devel/binutils:* DEPEND="sys-devel/binutils:*
>=net-libs/nodejs-10.0 >=net-libs/nodejs-13.0
>=sys-apps/yarn-1.15 >=sys-apps/yarn-1.20
x11-libs/libXScrnSaver x11-libs/libXScrnSaver
net-print/cups net-print/cups
dev-libs/nss dev-libs/nss
gnome-base/gconf gnome-base/gconf
emoji? ( >=media-fonts/noto-emoji-20180823 ) emoji? ( >=media-fonts/noto-emoji-20180823 )
>=media-video/ffmpeg-4.0 >=media-video/ffmpeg-4.0
|| ( >=dev-util/electron-bin-6.0.0 >=dev-util/electron-6.0.0 )" || ( dev-util/electron-bin-next:7 dev-util/electron:7 )"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
PATCHES=( PATCHES=()
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
"${FILESDIR}/riot-1.4.0-icon-path.patch"
"${FILESDIR}/riot-1.4.0-fix-hidden-on-start.patch"
)
DESTINATION="/opt/Riot" DESTINATION="/opt/Riot"
src_prepare() { src_prepare() {
if use "proxy";then if ! use "proxy";then
yarn install || die "Yarn module installation failed" my_proxy=""
cd electron_app
yarn install || die "Yarn module installation failed"
cd ..
[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
else else
http_proxy="" yarn install || die "Yarn module installation failed" my_proxy="$http_proxy"
cd electron_app
http_proxy="" yarn install || die "Yarn module installation failed"
cd ..
[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
fi fi
http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
pushd electron_app >/dev/null 2>&1 || die
http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
popd >/dev/null 2>&1 || die
[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
if [ -e "${DESTINATION}/webapp/config.json" ] && use savedconfig;then if [ -e "${DESTINATION}/webapp/config.json" ] && use savedconfig;then
cp "${DESTINATION}/webapp/config.json" "${S}"/config.json cp "${DESTINATION}/webapp/config.json" "${S}"/config.json
else else
@ -100,7 +95,6 @@ src_install() {
doins "${S}/${PN}" doins "${S}/${PN}"
insinto "${DESTINATION}/electron_app" insinto "${DESTINATION}/electron_app"
doins -r "${S}/origin_migrator"
cp "${FILESDIR}/${PN}.desktop" "${T}" cp "${FILESDIR}/${PN}.desktop" "${T}"
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i