Skip to content

Commit 13fcaaa

Browse files
ErenHDEErenHDE
committed
element-desktop: update to 1.12.21.
1 parent 7bc9b4e commit 13fcaaa

6 files changed

Lines changed: 69 additions & 118 deletions

File tree

‎srcpkgs/element-desktop/files/element-desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
exec electron35 /usr/lib/element-desktop/resources/app.asar "$@"
2+
exec electron35 /usr/lib/element-desktop/app.asar "$@"

‎srcpkgs/element-desktop/files/io.element.desktop‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[Desktop Entry]
2+
Name=Element
3+
Comment=Feature-rich client for Matrix
4+
Exec=/usr/bin/element-desktop %u
5+
Terminal=false
6+
Type=Application
7+
Icon=io.element.Element
8+
StartupWMClass=Element
9+
Categories=Network;InstantMessaging;Chat;IRCClient
10+
MimeType=x-scheme-handler/element;x-scheme-handler/io.element.desktop;

‎srcpkgs/element-desktop/patches/disable-deb-packaging.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/element-web/apps/desktop/electron-builder.ts
2+
+++ b/element-web/apps/desktop/electron-builder.ts
3+
@@ -128,7 +128,7 @@
4+
electron_protocol: variant.protocols[0],
5+
},
6+
linux: {
7+
- target: ["tar.gz", "deb"],
8+
+ target: ["dir"],
9+
category: "Network;InstantMessaging;Chat",
10+
icon: "icon.png",
11+
executableName: variant.name, // element-desktop or element-desktop-nightly

‎srcpkgs/element-desktop/patches/remove-pnpm-version-check.patch‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- /element-web/package.json
2+
+++ /element-web/package.json
3+
@@ -49,12 +49,5 @@
4+
"engines": {
5+
"node": ">=22.18"
6+
},
7+
- "devEngines": {
8+
- "packageManager": {
9+
- "name": "pnpm",
10+
- "version": "11.2.2+sha512.36e6621fad506178936455e70247b8808ef4ec25797a9f437a93281a020484e2607f6a469a22e982987c3dbb8866e3071514ab10a4a1749e06edcd1ec118436f",
11+
- "onFail": "error"
12+
- }
13+
- },
14+
"private": true
15+
}

‎srcpkgs/element-desktop/patches/tasje-one-hak.patch‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎srcpkgs/element-desktop/template‎

Lines changed: 32 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,67 @@
11
# Template file for 'element-desktop'
22
pkgname=element-desktop
3-
version=1.12.10
4-
revision=2
3+
version=1.12.21
4+
revision=1
55
_electronver=35
66
create_wrksrc=yes
77
build_helper="rust"
88
conf_files="/etc/element-desktop/config.json"
9-
hostmakedepends="git yarn nodejs rust cargo python3 curl
10-
sqlcipher-devel libnotify-devel pkg-config electron-tasje"
11-
makedepends="libsecret-devel electron${_electronver}-devel"
9+
hostmakedepends="git nodejs rust cargo python3 curl
10+
pnpm sqlcipher-devel libnotify-devel pkg-config
11+
electron-tasje yarn app-builder"
12+
makedepends="libsecret-devel electron${_electronver}-devel openssl-devel"
1213
depends="c-ares http-parser libevent
1314
libxslt minizip nss snappy sqlcipher electron${_electronver}"
1415
short_desc="Glossy Matrix collaboration client, desktop version"
1516
maintainer="Orphaned <orphan@voidlinux.org>"
1617
license="Apache-2.0"
1718
homepage="https://element.io"
1819
changelog="https://raw.githubusercontent.com/element-hq/element-desktop/develop/CHANGELOG.md"
19-
distfiles="https://github.com/element-hq/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
20-
https://github.com/element-hq/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
21-
checksum="2aa491d4601b0af20c36fff0133ea19a3585b16d9217d3ec9df9fe256d6167dd
22-
17f6253497879f70f9c23729a25d77f0259ec7a9a43a33eeaebc45686922912b"
20+
distfiles="https://github.com/element-hq/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
21+
checksum="bbf87817f7f60ee034e58acba1f937954137f0fbc4527885ae38851f3757512c"
2322
replaces="riot-desktop>=0"
2423

2524
export USE_SYSTEM_APP_BUILDER=true
2625

2726
post_extract() {
28-
mv "element-desktop-${version}" element-desktop
2927
mv "element-web-${version}" element-web
3028
}
3129

32-
post_patch() {
33-
# Disable auto-updating
34-
vsed -e 's|"https://packages.element.io/desktop/update/"|null|' -i element-desktop/element.io/release/config.json
35-
}
36-
3730
pre_build() {
38-
# since element 1.8.x it's necessary to force the npm arch
39-
# to x86, otherwise it will fail in electron js stuff on
40-
# platforms officially unsupported by electron (ppc64le...)
41-
local carch=x64
42-
case "$XBPS_TARGET_MACHINE" in
43-
i686*) carch=ia32 ;;
44-
esac
45-
4631
cd element-web
47-
yarn install --no-fund --frozen-lockfile
32+
pnpm install
4833

49-
cd ../element-desktop
50-
yarn install --no-fund --frozen-lockfile
34+
cd apps/desktop
35+
pnpm install
5136
}
5237

5338
do_build() {
54-
cd element-web
55-
NODE_ENV=production VERSION=${version} yarn build
56-
57-
cd ../element-desktop
58-
59-
yarn asar-webapp
60-
61-
# add "optional" native dependencies
62-
# hak stands for hack
63-
yarn run hak
64-
65-
yarn build:ts
66-
67-
yarn build:res
68-
69-
cat <<-EOF >tsconfig.electron-builder.json
70-
{
71-
"compilerOptions": {
72-
"module": "node16",
73-
"moduleResolution": "node16",
74-
"esModuleInterop": true,
75-
"resolveJsonModule": true,
76-
"skipLibCheck": true,
77-
"strict": true,
78-
"target": "es2019",
79-
"sourceMap": false,
80-
"noImplicitAny": false,
81-
"noEmitOnError": true,
82-
},
83-
"files": ["electron-builder.ts"]
84-
}
85-
EOF
86-
yarn tsc -p tsconfig.electron-builder.json
87-
ELECTRON_RUN_AS_NODE=1 IS_TASJE=1 node -e 'console.log(JSON.stringify(require("./electron-builder.js").default))' | awk '/^{/{x=1} x' >electron-builder.json
39+
cd element-web/apps/web
40+
VERSION=${version} pnpm run build
8841

89-
yarn install --frozen-lockfile --ignore-scripts --production
90-
npm rebuild keytar-forked --nodedir=/usr/include/electron35/node_headers --build-from-source
91-
92-
# stripping in build because it gets into asar
93-
/usr/bin/$STRIP .hak/hakModules/matrix-seshat/index.node
94-
95-
tasje -c ./electron-builder.json pack
42+
cd ../desktop
43+
pnpm run build:native
44+
pnpm run build --publish never
9645
}
9746

9847
do_install() {
99-
vmkdir usr/lib/element-desktop/resources
100-
101-
cd element-web
102-
103-
vcopy webapp usr/lib/element-desktop/resources
104-
105-
vinstall webapp/themes/element/img/logos/element-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ element-desktop.svg
106-
107-
vinstall config.sample.json 644 etc/element-desktop config.json
108-
ln -s /etc/element-desktop/config.json $DESTDIR/usr/lib/element-desktop/resources/webapp/config.json
109-
110-
cd ../element-desktop
111-
vinstall webapp.asar 644 usr/lib/element-desktop
112-
vinstall dist/resources/app.asar 644 usr/lib/element-desktop/resources
113-
114-
vcopy build usr/lib/element-desktop/resources
115-
vinstall dist/element-desktop.desktop 644 usr/share/applications
116-
echo '' >> dist/icons/size-list
117-
while read -r size; do
118-
if [ -n "$size" ]; then
119-
vinstall dist/icons/$size.png 644 "usr/share/icons/hicolor/$size/apps" element-desktop.png
120-
fi
121-
done <dist/icons/size-list
48+
vmkdir usr/share/webapps/element-desktop
49+
50+
cd element-web/apps/web
51+
vcopy webapp/* usr/share/webapps/element-desktop/
52+
vinstall config.sample.json 644 etc/webapps/element-desktop/
53+
ln -sf /etc/webapps/element-desktop/config.json ${DESTDIR}/usr/share/webapps/element-desktop/
54+
55+
cd ../desktop
56+
vcopy dist/linux-unpacked/resources/ usr/lib/element-desktop/
57+
ln -s /usr/share/webapps/element-desktop ${DESTDIR}/usr/lib/element-desktop/webapp
58+
ln -s /etc/element-desktop/config.json ${DESTDIR}/etc/webapps/element-desktop/config.json
59+
vinstall element.io/release/config.json 644 etc/element-desktop
60+
vinstall ${FILESDIR}/io.element.desktop 644 usr/share/applications/
61+
vbin ${FILESDIR}/element-desktop
62+
vinstall ../web/res/themes/element/img/logos/element-logo.svg 644 usr/share/icons/hicolor/scalable/apps/ io.element.Element.svg
63+
vinstall build/icon.png 644 usr/share/icons/hicolor/512x512/apps/ io.element.Element.png
12264

123-
cat <<-EOF > element-desktop
124-
#!/bin/sh
125-
exec electron${_electronver} /usr/lib/element-desktop/resources/app.asar "\$@"
126-
EOF
127-
vbin element-desktop
128-
ln -s element-desktop "${DESTDIR}/usr/bin/riot-desktop"
12965
}
13066

13167
riot-desktop_package() {

0 commit comments

Comments
 (0)