element-desktop: updated to version 1.12.6

diff --git a/element-desktop-bin/element-desktop-bin.SlackBuild b/element-desktop-bin/element-desktop-bin.SlackBuild
index ca131eecd87431f5d5debc07d0f918bfdf9cb313..a604ca2d66c26e9e066235348dee465333fb0a86 100644 (file)
--- a/element-desktop-bin/element-desktop-bin.SlackBuild
+++ b/element-desktop-bin/element-desktop-bin.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=element-desktop-bin
 DEBNAM=${PRGNAM%-bin}
-VERSION=${VERSION:-1.12.5}
+VERSION=${VERSION:-1.12.6}
 SRCVERSION=$( echo $VERSION | tr _ - )
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}

diff --git a/element-desktop-bin/element-desktop-bin.info b/element-desktop-bin/element-desktop-bin.info
index a9679c6f1a6c952dffbf0cf3e8b2dce6312ebf4e..007c3482b99fb580b703fc9750c92a042e7b7e68 100644 (file)
--- a/element-desktop-bin/element-desktop-bin.info
+++ b/element-desktop-bin/element-desktop-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="element-desktop-bin"
-VERSION="1.12.5"
+VERSION="1.12.6"
 HOMEPAGE="https://element.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.12.5_amd64.deb"
-MD5SUM_x86_64="8d589f8c10ce9072ba9eff1aa4e8e8a7"
+DOWNLOAD_x86_64="https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.12.6_amd64.deb"
+MD5SUM_x86_64="d90b0187a9eb0c281f8b195e5df9c309"
 REQUIRES="sqlcipher"
 MAINTAINER="Vladislav 'fsLeg' Borisov"
 EMAIL="fsleg@t-rg.ws"

diff --git a/element-desktop/README b/element-desktop/README
index d466cddf29857bfb6d107c58a868e6578ca782a0..986b552bbb051ba48390d6024683c3e4a6dbc253 100644 (file)
--- a/element-desktop/README
+++ b/element-desktop/README
@@ -7,6 +7,9 @@ End-to-end encrypted by default.
 
 Element is only available as a 64 bit program. 32 bit is unsupported.
 
-Warning: vendored-sources.tar.xz is over 800 Mb and the building process
+WARNING: vendored-sources.tar.xz 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.
+
+WARNING: this script's build dependency is nodejs24-bin which conflicts
+with nodejs.

diff --git a/element-desktop/element-desktop.SlackBuild b/element-desktop/element-desktop.SlackBuild
index 2d847f942940b5cd6cbad346bc18627e702462da..4250048b73fa9b04a8c27059cb1631a304f4e3fe 100644 (file)
--- a/element-desktop/element-desktop.SlackBuild
+++ b/element-desktop/element-desktop.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=element-desktop
 WEBNAM=element-web
-VERSION=${VERSION:-1.12.4}
+VERSION=${VERSION:-1.12.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}

diff --git a/element-desktop/element-desktop.info b/element-desktop/element-desktop.info
index 799c56c66e864523d052601032a33b922dbc781e..6b682c5da7552982c1d26b66c39085e732362d35 100644 (file)
--- a/element-desktop/element-desktop.info
+++ b/element-desktop/element-desktop.info
@@ -1,14 +1,14 @@
 PRGNAM="element-desktop"
-VERSION="1.12.4"
+VERSION="1.12.6"
 HOMEPAGE="https://element.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/element-hq/element-desktop/archive/v1.12.4/element-desktop-1.12.4.tar.gz \
-                 https://github.com/element-hq/element-web/archive/v1.12.4/element-web-1.12.4.tar.gz \
-                 https://sbo.t-rg.ws/element-desktop-1.12.4-vendored-sources.tar.xz"
-MD5SUM_x86_64="9c5d4f849f72fb93cc30ed0e7b0e2607 \
-               8631b92f7e92352bb562dc1a49f20128 \
-               6d552d2419b5188603c7ebfedd087d6e"
-REQUIRES="sqlcipher yarn rust-opt"
+DOWNLOAD_x86_64="https://github.com/element-hq/element-desktop/archive/v1.12.6/element-desktop-1.12.6.tar.gz \
+                 https://github.com/element-hq/element-web/archive/v1.12.6/element-web-1.12.6.tar.gz \
+                 https://sbo.t-rg.ws/element-desktop-1.12.6-vendored-sources.tar.xz"
+MD5SUM_x86_64="c36286cf87e80641db5b64e27602f512 \
+               fc2f5530b8afb857ca8980106365450e \
+               664fda8217864dab0633144c7118ee81"
+REQUIRES="sqlcipher yarn rust-opt nodejs24-bin"
 MAINTAINER="Vladislav 'fsLeg' Borisov"
 EMAIL="fsleg@t-rg.ws"

diff --git a/element-desktop/mkvendor.sh b/element-desktop/mkvendor.sh
index a24ec13a53e605ae6459a376b03762dfa19b488e..4d31e95111616367c8f7926832cd38230af9c0b0 100644 (file)
--- a/element-desktop/mkvendor.sh
+++ b/element-desktop/mkvendor.sh
@@ -35,10 +35,17 @@ mkdir -p "$YARN_YARN_OFFLINE_MIRROR"
 
 # element-web
 cd "element-web-$VERSION"
-yarn install --frozen-lockfile \
-             --ignore-engines \
-             --no-fund \
-             --update-checksums
+# this `yarn install` is actually a two step process. the second step
+# doesn't like wrap-ansi that was cached during the first step, however we
+# aren't interested in cache, we are interested in vendor directory, so we
+# restart the command after clearing cache
+until yarn install --frozen-lockfile \
+                   --ignore-engines \
+                   --no-fund \
+                   --update-checksums
+  do
+    yarn cache clean
+done
 yarn cache clean
 
 # element-desktop