element-desktop: preparation for submission to SBo

diff --git a/element-desktop/README b/element-desktop/README
index da0a18553355da947ce045b6f886d06554ccd020..98046fbb8e0d1fd6487e6c53517755e39e9b8b81 100644 (file)
--- a/element-desktop/README
+++ b/element-desktop/README
@@ -7,5 +7,6 @@ End-to-end encrypted by default.
 
 Element is only available as a 64 bit program. 32 bit is unsupported.
 
-Warning: building requires over 5 GB of space. If you're hard-pressed
-on space, consider setting TMP to something other than /tmp.
+Warning: vendored-sources.tar.gz is over 800 Mb and the building process
+requires about 5 GB of space. If you're hard-pressed on space, consider
+installing element-desktop-bin instead.

diff --git a/element-desktop/element-desktop.SlackBuild b/element-desktop/element-desktop.SlackBuild
index e46af9310f1724291d4d52bbf61435cedd02fad8..7bf218af822a657d9533ab9c47cf95efa31dca02 100644 (file)
--- a/element-desktop/element-desktop.SlackBuild
+++ b/element-desktop/element-desktop.SlackBuild
@@ -28,8 +28,8 @@ PRGNAM=element-desktop
 WEBNAM=element-web
 VERSION=${VERSION:-1.11.109}
 BUILD=${BUILD:-1}
-TAG=${TAG:-fsleg}
-PKGTYPE=${PKGTYPE:-txz}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -125,8 +125,6 @@ patch -p1 < $CWD/autolaunch.patch
 patch -p1 < $CWD/yarn-offline.patch
 sed -i 's|yarn |yarn --offline |g' package.json .hak/hakModules/matrix-seshat/package.json
 sed -i 's|cargo build |cargo build --frozen |' .hak/hakModules/matrix-seshat/package.json
-# disable autoupdate
-sed -i 's|"https://packages.element.io/desktop/update/"|null|' element.io/release/config.json
 
 mkdir -p deploys
 mv ../$WEBNAM-$VERSION/webapp deploys/element-v$VERSION
@@ -136,12 +134,11 @@ yarn install --frozen-lockfile \
              --update-checksums \
              --offline
 yarn --offline run fetch --noverify --cfgdir ""
+CRATE_CC_NO_DEFAULTS=1 \
 RUSTFLAGS="-C target-cpu=native" \
   yarn --offline run build:native
 rm -r .hak/hakModules/matrix-seshat/{.cargo,node_modules,target,vendor}
-# electron-builder fails if it can't upload the artifact to GitHub for which it requires a GitHub Token
-# all building is done by that point, so we just continue with packaging
-yarn --offline run build || true
+yarn --offline run build --publish never
 
 mkdir -p $PKG/usr/{bin,lib$LIBDIRSUFFIX,share/applications}
 mv dist/linux-unpacked $PKG/usr/lib$LIBDIRSUFFIX/element-desktop