Fix riot-web hang when trying to migrate hosts
This commit is contained in:
rexy712
parent
c2860211a1
commit
dec5a24112
12
net-im/riot-web/files/riot-1.4.0-move-origin-migrator.patch
Normal file
12
net-im/riot-web/files/riot-1.4.0-move-origin-migrator.patch
Normal file
@ -0,0 +1,12 @@
|
||||
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);
|
||||
});
|
||||
@ -46,11 +46,13 @@ DEPEND="sys-devel/binutils:*
|
||||
|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
|
||||
)
|
||||
|
||||
DESTINATION="/opt/Riot"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use "proxy";then
|
||||
yarn install || die "Yarn module installation failed"
|
||||
cd electron_app
|
||||
@ -72,6 +74,13 @@ src_prepare() {
|
||||
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() {
|
||||
@ -83,6 +92,9 @@ src_install() {
|
||||
doins -r "${S}/webapp"
|
||||
doins -r "${S}/electron_app"
|
||||
|
||||
insinto "${DESTINATION}/electron_app"
|
||||
doins -r "${S}/origin_migrator"
|
||||
|
||||
cp "${FILESDIR}"/runscript.sh "${S}/${PN}"
|
||||
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${S}/${PN}" -i
|
||||
insopts "-m755"
|
||||
|
||||
@ -46,11 +46,13 @@ DEPEND="sys-devel/binutils:*
|
||||
|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
|
||||
)
|
||||
|
||||
DESTINATION="/opt/Riot"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use "proxy";then
|
||||
yarn install || die "Yarn module installation failed"
|
||||
cd electron_app
|
||||
@ -72,6 +74,13 @@ src_prepare() {
|
||||
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() {
|
||||
@ -83,6 +92,9 @@ src_install() {
|
||||
doins -r "${S}/webapp"
|
||||
doins -r "${S}/electron_app"
|
||||
|
||||
insinto "${DESTINATION}/electron_app"
|
||||
doins -r "${S}/origin_migrator"
|
||||
|
||||
cp "${FILESDIR}"/runscript.sh "${S}/${PN}"
|
||||
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${S}/${PN}" -i
|
||||
insopts "-m755"
|
||||
|
||||
@ -46,11 +46,13 @@ DEPEND="sys-devel/binutils:*
|
||||
|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
|
||||
)
|
||||
|
||||
DESTINATION="/opt/Riot"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use "proxy";then
|
||||
yarn install || die "Yarn module installation failed"
|
||||
cd electron_app
|
||||
@ -72,6 +74,13 @@ src_prepare() {
|
||||
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() {
|
||||
@ -83,6 +92,9 @@ src_install() {
|
||||
doins -r "${S}/webapp"
|
||||
doins -r "${S}/electron_app"
|
||||
|
||||
insinto "${DESTINATION}/electron_app"
|
||||
doins -r "${S}/origin_migrator"
|
||||
|
||||
cp "${FILESDIR}"/runscript.sh "${S}/${PN}"
|
||||
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${S}/${PN}" -i
|
||||
insopts "-m755"
|
||||
|
||||
@ -46,11 +46,13 @@ DEPEND="sys-devel/binutils:*
|
||||
|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/riot-1.4.0-move-origin-migrator.patch"
|
||||
)
|
||||
|
||||
DESTINATION="/opt/Riot"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use "proxy";then
|
||||
yarn install || die "Yarn module installation failed"
|
||||
cd electron_app
|
||||
@ -72,6 +74,13 @@ src_prepare() {
|
||||
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() {
|
||||
@ -83,6 +92,9 @@ src_install() {
|
||||
doins -r "${S}/webapp"
|
||||
doins -r "${S}/electron_app"
|
||||
|
||||
insinto "${DESTINATION}/electron_app"
|
||||
doins -r "${S}/origin_migrator"
|
||||
|
||||
cp "${FILESDIR}"/runscript.sh "${S}/${PN}"
|
||||
sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${S}/${PN}" -i
|
||||
insopts "-m755"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user