Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages)
@ 2022-09-30 21:17 TinfoilSubmarine
  2022-09-30 23:02 ` TinfoilSubmarine
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-09-30 21:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/element
https://github.com/void-linux/void-packages/pull/39554

New package: element-web-1.11.8 (and move element/riot-desktop as subpackages)
Move element-desktop, riot-desktop to subpackage of element-web

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.

A patch file from https://github.com/void-linux/void-packages/pull/39554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/element-39554.patch --]
[-- Type: text/x-diff, Size: 8267 bytes --]

From ead317a2ac658f2944a08c70f7da619c203a4b4b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 16:43:15 -0400
Subject: [PATCH] New package: element-web-1.11.8

Move element-desktop, riot-desktop to subpackage of element-web
---
 srcpkgs/element-desktop                       |  1 +
 .../files/element-desktop                     |  0
 .../files/element-desktop.desktop             |  0
 ...web_0001-remove-dependency-on-sentry.patch |  0
 ...001-remove-dependency-on-sentry.patch.args |  0
 .../{element-desktop => element-web}/template | 80 +++++++++++--------
 srcpkgs/riot-desktop                          |  2 +-
 7 files changed, 49 insertions(+), 34 deletions(-)
 create mode 120000 srcpkgs/element-desktop
 rename srcpkgs/{element-desktop => element-web}/files/element-desktop (100%)
 rename srcpkgs/{element-desktop => element-web}/files/element-desktop.desktop (100%)
 rename srcpkgs/{element-desktop => element-web}/patches/element-web_0001-remove-dependency-on-sentry.patch (100%)
 rename srcpkgs/{element-desktop => element-web}/patches/element-web_0001-remove-dependency-on-sentry.patch.args (100%)
 rename srcpkgs/{element-desktop => element-web}/template (52%)

diff --git a/srcpkgs/element-desktop b/srcpkgs/element-desktop
new file mode 120000
index 000000000000..ec33e3fca227
--- /dev/null
+++ b/srcpkgs/element-desktop
@@ -0,0 +1 @@
+element-web
\ No newline at end of file
diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-web/files/element-desktop
similarity index 100%
rename from srcpkgs/element-desktop/files/element-desktop
rename to srcpkgs/element-web/files/element-desktop
diff --git a/srcpkgs/element-desktop/files/element-desktop.desktop b/srcpkgs/element-web/files/element-desktop.desktop
similarity index 100%
rename from srcpkgs/element-desktop/files/element-desktop.desktop
rename to srcpkgs/element-web/files/element-desktop.desktop
diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch b/srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch
similarity index 100%
rename from srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
rename to srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch
diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args b/srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch.args
similarity index 100%
rename from srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch.args
rename to srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch.args
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-web/template
similarity index 52%
rename from srcpkgs/element-desktop/template
rename to srcpkgs/element-web/template
index 0231586c65f7..61b969545d1b 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-web/template
@@ -1,16 +1,14 @@
-# Template file for 'element-desktop'
-pkgname=element-desktop
+# Template file for 'element-web'
+pkgname=element-web
 version=1.11.8
 revision=1
 create_wrksrc=yes
-conf_files="/etc/${pkgname}/config.json"
+conf_files="/etc/webapps/element/config.json"
 hostmakedepends="git yarn nodejs rust cargo python3 curl
  sqlcipher-devel libappindicator-devel libnotify-devel pkg-config
  app-builder jq moreutils"
 makedepends="libsecret-devel"
-depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron19"
-short_desc="Glossy Matrix collaboration client, desktop version"
+short_desc="Glossy Matrix collaboration client - web version"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
@@ -23,25 +21,25 @@ checksum="541c01fdac38db2a4e7c058be5d2196ace0cd987c37f58a79631ec43c260182f
 export USE_SYSTEM_APP_BUILDER=true
 
 post_extract() {
+	mv ${pkgname/web/desktop}-${version} ${pkgname/web/desktop}
 	mv ${pkgname}-${version} ${pkgname}
-	mv ${pkgname/desktop/web}-${version} ${pkgname/desktop/web}
 }
 
 pre_patch() {
+	for patch in ${pkgname/web/desktop}_*.patch; do
+		ln -s ../${patch} ${pkgname/web/desktop}
+	done
 	for patch in ${pkgname}_*.patch; do
 		ln -s ../${patch} ${pkgname}
 	done
-	for patch in ${pkgname/desktop/web}_*.patch; do
-		ln -s ../${patch} ${pkgname/desktop/web}
-	done
 }
 
 post_patch() {
-	cd ${pkgname/desktop/web}
+	cd ${pkgname}
 	# Disable auto-updating
 	jq '.update_base_url = ""' element.io/app/config.json | sponge element.io/app/config.json
 
-	cd ../${pkgname}
+	cd ../${pkgname/web/desktop}
 	vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
 }
 
@@ -54,20 +52,20 @@ pre_build() {
 		i686*) carch=ia32 ;;
 	esac
 
-	cd ${pkgname/desktop/web}
+	cd ${pkgname}
 
 	# Build dependencies for element-web
 	npm_config_arch=$carch yarn install
 
 	# Build dependencies and alterations for element-desktop
-	cd ../${pkgname}
+	cd ../${pkgname/web/desktop}
 	npm_config_arch=$carch yarn install
 }
 
 do_build() {
-	cd ${pkgname/desktop/web}
+	cd ${pkgname}
 	yarn build
-	cd ../${pkgname}
+	cd ../${pkgname/web/desktop}
 	if [ "$CROSS_BUILD" ]; then
 		yarn run build:native --target ${XBPS_CROSS_RUST_TARGET}
 	else
@@ -84,25 +82,41 @@ do_build() {
 }
 
 do_install() {
-	cd ${pkgname/desktop/web}
-	vmkdir usr/lib/element-desktop
-	vmkdir etc/element-desktop
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) vcopy ../element-desktop/dist/linux-ia32-unpacked/resources /usr/lib/element-desktop/resources;;
-		*) vcopy ../element-desktop/dist/linux-unpacked/resources /usr/lib/element-desktop/resources
-	esac
-	vinstall config.sample.json 644 /etc/element-desktop/ config.json
-	vcopy webapp /usr/lib/element-desktop/resources
-	ln -s /etc/element-desktop/config.json $DESTDIR/usr/lib/element-desktop/resources/webapp/config.json
+	cd element-web
+	vmkdir usr/share/webapps/element
+	vcopy webapp/. /usr/share/webapps/element
+	vsconf config.sample.json
+	vinstall config.sample.json 644 /etc/webapps/element/ config.json
+	ln -s /etc/webapps/element/config.json $PKGDESTDIR/usr/share/webapps/element/config.json
+}
 
-	vbin ${FILESDIR}/element-desktop
-	ln -s element-desktop $DESTDIR/usr/bin/riot-desktop
-	vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
-	vinstall webapp/themes/element/img/logos/element-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ element.svg
+element-desktop_package() {
+	depends+=" c-ares ffmpeg gtk+3 http-parser libevent libxslt
+	 minizip nss re2 snappy sqlcipher electron19"
+	short_desc="${short_desc/web/desktop}"
+	conf_files="/etc/element-desktop/config.json"
+	pkg_install() {
+		cd element-web
+		vmkdir usr/lib/element-desktop
+		vmkdir etc/element-desktop
+		case "$XBPS_TARGET_MACHINE" in
+			i686*) vcopy ../element-desktop/dist/linux-ia32-unpacked/resources /usr/lib/element-desktop/resources;;
+			*) vcopy ../element-desktop/dist/linux-unpacked/resources /usr/lib/element-desktop/resources
+		esac
+		vsconf config.sample.json
+		vinstall config.sample.json 644 /etc/element-desktop/ config.json
+		vcopy webapp /usr/lib/element-desktop/resources
+		ln -s /etc/element-desktop/config.json $PKGDESTDIR/usr/lib/element-desktop/resources/webapp/config.json
 
-	for i in 16 24 48 64 96 128 256 512; do
-		vinstall ../element-desktop/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
-	done
+		vbin ${FILESDIR}/element-desktop
+		ln -s element-desktop $PKGDESTDIR/usr/bin/riot-desktop
+		vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
+		vinstall webapp/themes/element/img/logos/element-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ element.svg
+
+		for i in 16 24 48 64 96 128 256 512; do
+			vinstall ../element-desktop/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
+		done
+	}
 }
 
 riot-desktop_package() {
diff --git a/srcpkgs/riot-desktop b/srcpkgs/riot-desktop
index b58491091cde..ec33e3fca227 120000
--- a/srcpkgs/riot-desktop
+++ b/srcpkgs/riot-desktop
@@ -1 +1 @@
-element-desktop
\ No newline at end of file
+element-web
\ No newline at end of file

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: New package: element-web-1.11.8 (and move element/riot-desktop as subpackages)
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
@ 2022-09-30 23:02 ` TinfoilSubmarine
  2022-09-30 23:05 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-09-30 23:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/39554#issuecomment-1264116464

Comment:
That's a shame that electron19 makes this so restrictive. Guess for now I'll just make `element-web` its own package.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages)
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
  2022-09-30 23:02 ` TinfoilSubmarine
@ 2022-09-30 23:05 ` TinfoilSubmarine
  2022-09-30 23:43 ` New package: element-web-1.11.8 paper42
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-09-30 23:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1691 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/element
https://github.com/void-linux/void-packages/pull/39554

New package: element-web-1.11.8 (and move element/riot-desktop as subpackages)
Move element-desktop, riot-desktop to subpackage of element-web

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.

A patch file from https://github.com/void-linux/void-packages/pull/39554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/element-39554.patch --]
[-- Type: text/x-diff, Size: 4309 bytes --]

From ed9e7e59d453e19c653ff976aedc147a50d557d0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 19:02:21 -0400
Subject: [PATCH] New package: element-web-1.11.8

---
 ...web_0001-remove-dependency-on-sentry.patch | 55 +++++++++++++++++++
 srcpkgs/element-web/template                  | 35 ++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch
 create mode 100644 srcpkgs/element-web/template

diff --git a/srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch b/srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch
new file mode 100644
index 000000000000..e8d1003a8cec
--- /dev/null
+++ b/srcpkgs/element-web/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -0,0 +1,55 @@
+From 464305f785b65f7b2e552fb449bb7d230e9b0715 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 11 Dec 2021 21:22:44 +0100
+Subject: [PATCH] remove dependency on sentry
+
+This is unused and breaks ppc64 because it downlaods binaries.
+---
+ package.json      |  1 -
+ webpack.config.js | 11 -----------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/package.json b/package.json
+index 89c0ba12e..c31f84fad 100644
+--- a/package.json
++++ b/package.json
+@@ -88,7 +88,6 @@
+     "@babel/register": "^7.12.10",
+     "@babel/runtime": "^7.12.5",
+     "@principalstudio/html-webpack-inject-preload": "^1.2.7",
+-    "@sentry/webpack-plugin": "^1.18.1",
+     "@svgr/webpack": "^5.5.0",
+     "@types/flux": "^3.1.9",
+     "@types/jest": "^28.0.0",
+diff --git a/webpack.config.js b/webpack.config.js
+index 8d1f27330..b56a11566 100644
+--- a/webpack.config.js
++++ b/webpack.config.js
+@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+ const TerserPlugin = require('terser-webpack-plugin');
+ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+ const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
+-const SentryCliPlugin = require("@sentry/webpack-plugin");
+ 
+ dotenv.config();
+ let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
+@@ -626,16 +625,6 @@ module.exports = (env, argv) => {
+                 files: [{ match: /.*Inter.*\.woff2$/ }],
+             }),
+ 
+-            // upload to sentry if sentry env is present
+-            process.env.SENTRY_DSN &&
+-                new SentryCliPlugin({
+-                    release: process.env.VERSION,
+-                    include: "./webapp/bundles",
+-                    errorHandler: (err, invokeErr, compilation) => {
+-                        compilation.warnings.push('Sentry CLI Plugin: ' + err.message);
+-                        console.log(`::warning title=Sentry error::${err.message}`);
+-                    },
+-                }),
+             new webpack.EnvironmentPlugin(['VERSION']),
+         ].filter(Boolean),
+ 
+-- 
+2.37.2
+
diff --git a/srcpkgs/element-web/template b/srcpkgs/element-web/template
new file mode 100644
index 000000000000..be2638590ea3
--- /dev/null
+++ b/srcpkgs/element-web/template
@@ -0,0 +1,35 @@
+# Template file for 'element-web'
+pkgname=element-web
+version=1.11.8
+revision=1
+conf_files="/etc/webapps/element/config.json"
+hostmakedepends="yarn jq moreutils"
+short_desc="Glossy Matrix collaboration client - web version"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://element.io"
+changelog="https://raw.githubusercontent.com/vector-im/element-web/develop/CHANGELOG.md"
+distfiles="https://github.com/vector-im/element-web/archive/v${version}.tar.gz"
+checksum="9d9bb42a3d004ab4659d2945e6752aa278c59bc3b7f75919ce076bf3fb2b5f73"
+
+post_patch() {
+	# Disable auto-updating
+	jq '.update_base_url = ""' element.io/app/config.json | sponge element.io/app/config.json
+}
+
+pre_build() {
+	# Build dependencies for element-web
+	yarn install
+}
+
+do_build() {
+	yarn build
+}
+
+do_install() {
+	vmkdir usr/share/webapps/element
+	vcopy webapp/. /usr/share/webapps/element
+	vsconf config.sample.json
+	vinstall config.sample.json 644 /etc/webapps/element/ config.json
+	ln -s /etc/webapps/element/config.json "${DESTDIR}"/usr/share/webapps/element/config.json
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: New package: element-web-1.11.8
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
  2022-09-30 23:02 ` TinfoilSubmarine
  2022-09-30 23:05 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-09-30 23:43 ` paper42
  2022-10-03  1:31 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2022-09-30 23:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2307 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39554#issuecomment-1264132535

Comment:
I am not sure webapps are a good fit for void-packages. I am not saying no to this package, I just want to document my thoughts and I might be wrong about some things. Feel free to correct me.

Working with groups for web apps is a mess with Void because we don't have a standardized group for all of them. apache uses a different default group than nginx, etc. Also because of how void packages work, group IDs are not known before the group is added, so fixing this would not only break backwards compatibility, but it would also have to add a group to base-files (where we can control GID). It's possible element-web doesn't need write access to these files, in that case this point is not relevant. I got stuck at this point with my nextcloud server package.

I am not sure what value is there in rebuilding everything with yarn. All webapps I worked with provide a nice pre-built tarball and then there isn't a big point in repackaging their archive when you could just unpack it. We would just be removing the webapp from its box and adding it to our own box.

I don't know if it's in the scope of void-packages to package webapps. There is a ton of them, they are often quite big (nextcloud is 350MB). They are probably very low effort for both packaging and manually installing them, but someone needs to keep them up to date, fix their CVEs and CVEs of their dependencies which is often a lot of 3rd party packages.

(this doesn't apply here, but I will mention it anyway) If you have a webapp that uses php8.0 and we decide to change its dependency to php8.1 (which you have installed, but not enabled), you will not notice this in the update because there won't be any new packages installed, just the webapp will get an update until you run xbps-remove -o. This is because xbps by design doesn't handle enabling and disabling services and this is not something we can fix. We could only document it with an install message...

I also see some benefits in packaging webapps - simple updates with the rest of your system, proper system dependency tracking, etc. I personally use docker-compose, so I don't have to care about any of these issues.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] New package: element-web-1.11.8
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2022-09-30 23:43 ` New package: element-web-1.11.8 paper42
@ 2022-10-03  1:31 ` TinfoilSubmarine
  2022-10-03  1:33 ` TinfoilSubmarine
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-10-03  1:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/element
https://github.com/void-linux/void-packages/pull/39554

New package: element-web-1.11.8
~Move element-desktop, riot-desktop to subpackage of element-web~

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

~I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.~

A patch file from https://github.com/void-linux/void-packages/pull/39554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/element-39554.patch --]
[-- Type: text/x-diff, Size: 1421 bytes --]

From 290b05c97c2aa0c3ee17277be735861a3cd6e358 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 19:02:21 -0400
Subject: [PATCH] New package: element-web-1.11.8

---
 srcpkgs/element-web/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/element-web/template

diff --git a/srcpkgs/element-web/template b/srcpkgs/element-web/template
new file mode 100644
index 000000000000..79d4716d5130
--- /dev/null
+++ b/srcpkgs/element-web/template
@@ -0,0 +1,21 @@
+# Template file for 'element-web'
+pkgname=element-web
+version=1.11.8
+revision=1
+wrksrc="element-v${version}"
+conf_files="/etc/webapps/element/config.json"
+short_desc="Glossy Matrix collaboration client - web version"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://element.io"
+changelog="https://raw.githubusercontent.com/vector-im/element-web/develop/CHANGELOG.md"
+distfiles="https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"
+checksum=e1c1c6b5e7d961a0b2c8fcff5b1d1c56dc518cd6ab2ebb75a319e8666b513688
+
+do_install() {
+	vmkdir usr/share/webapps/element
+	vcopy . /usr/share/webapps/element
+	vsconf config.sample.json
+	vinstall config.sample.json 644 /etc/webapps/element/ config.json
+	ln -s /etc/webapps/element/config.json "${DESTDIR}"/usr/share/webapps/element/config.json
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: New package: element-web-1.11.8
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2022-10-03  1:31 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-10-03  1:33 ` TinfoilSubmarine
  2022-10-14 13:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-10-03  1:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/39554#issuecomment-1264815588

Comment:
These are all good points, and several are ones I've run into before that have stopped me from packaging something, or at least from submitting a template I've been using for my own machines.

I will say that I would consider this PR to be an exception to that reasoning since we have several different matrix servers packaged and it would be nice for convenience sake to be able to install a client as well.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] New package: element-web-1.11.8
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2022-10-03  1:33 ` TinfoilSubmarine
@ 2022-10-14 13:00 ` TinfoilSubmarine
  2022-10-27 12:31 ` [PR PATCH] [Updated] New package: element-web-1.11.10 TinfoilSubmarine
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-10-14 13:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/element
https://github.com/void-linux/void-packages/pull/39554

New package: element-web-1.11.8
~Move element-desktop, riot-desktop to subpackage of element-web~

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

~I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.~

A patch file from https://github.com/void-linux/void-packages/pull/39554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/element-39554.patch --]
[-- Type: text/x-diff, Size: 1423 bytes --]

From f0c376abcf98b93b9124cbf8bb3305801035ac50 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 19:02:21 -0400
Subject: [PATCH] New package: element-web-1.11.10

---
 srcpkgs/element-web/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/element-web/template

diff --git a/srcpkgs/element-web/template b/srcpkgs/element-web/template
new file mode 100644
index 000000000000..d85e53c90445
--- /dev/null
+++ b/srcpkgs/element-web/template
@@ -0,0 +1,21 @@
+# Template file for 'element-web'
+pkgname=element-web
+version=1.11.10
+revision=1
+wrksrc="element-v${version}"
+conf_files="/etc/webapps/element/config.json"
+short_desc="Glossy Matrix collaboration client - web version"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://element.io"
+changelog="https://raw.githubusercontent.com/vector-im/element-web/develop/CHANGELOG.md"
+distfiles="https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"
+checksum=153853fc3f1ad3f5da791834904b107d88bb71caf573eb52a2d81bf4a34f634a
+
+do_install() {
+	vmkdir usr/share/webapps/element
+	vcopy . /usr/share/webapps/element
+	vsconf config.sample.json
+	vinstall config.sample.json 644 /etc/webapps/element/ config.json
+	ln -s /etc/webapps/element/config.json "${DESTDIR}"/usr/share/webapps/element/config.json
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] New package: element-web-1.11.10
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
                   ` (5 preceding siblings ...)
  2022-10-14 13:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-10-27 12:31 ` TinfoilSubmarine
  2022-11-01 13:28 ` [PR PATCH] [Updated] New package: element-web-1.11.12 TinfoilSubmarine
  2023-01-20 15:01 ` [PR PATCH] [Closed]: New package: element-web-1.11.13 TinfoilSubmarine
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-10-27 12:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1649 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/element
https://github.com/void-linux/void-packages/pull/39554

New package: element-web-1.11.10
~Move element-desktop, riot-desktop to subpackage of element-web~

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

~I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.~

A patch file from https://github.com/void-linux/void-packages/pull/39554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/element-39554.patch --]
[-- Type: text/x-diff, Size: 1423 bytes --]

From 8641b5fd1646366e1547d028ea626bfa9193bf5d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 19:02:21 -0400
Subject: [PATCH] New package: element-web-1.11.12

---
 srcpkgs/element-web/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/element-web/template

diff --git a/srcpkgs/element-web/template b/srcpkgs/element-web/template
new file mode 100644
index 000000000000..28ee7c0d6ba7
--- /dev/null
+++ b/srcpkgs/element-web/template
@@ -0,0 +1,21 @@
+# Template file for 'element-web'
+pkgname=element-web
+version=1.11.12
+revision=1
+wrksrc="element-v${version}"
+conf_files="/etc/webapps/element/config.json"
+short_desc="Glossy Matrix collaboration client - web version"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://element.io"
+changelog="https://raw.githubusercontent.com/vector-im/element-web/develop/CHANGELOG.md"
+distfiles="https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"
+checksum=62469002d03600c220de90b6f009f4b1016d2bdeb2255145c544f3144ddd1c84
+
+do_install() {
+	vmkdir usr/share/webapps/element
+	vcopy . /usr/share/webapps/element
+	vsconf config.sample.json
+	vinstall config.sample.json 644 /etc/webapps/element/ config.json
+	ln -s /etc/webapps/element/config.json "${DESTDIR}"/usr/share/webapps/element/config.json
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] New package: element-web-1.11.12
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
                   ` (6 preceding siblings ...)
  2022-10-27 12:31 ` [PR PATCH] [Updated] New package: element-web-1.11.10 TinfoilSubmarine
@ 2022-11-01 13:28 ` TinfoilSubmarine
  2023-01-20 15:01 ` [PR PATCH] [Closed]: New package: element-web-1.11.13 TinfoilSubmarine
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2022-11-01 13:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1649 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/element
https://github.com/void-linux/void-packages/pull/39554

New package: element-web-1.11.12
~Move element-desktop, riot-desktop to subpackage of element-web~

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

~I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.~

A patch file from https://github.com/void-linux/void-packages/pull/39554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/element-39554.patch --]
[-- Type: text/x-diff, Size: 1423 bytes --]

From 6d3a4a7c2b60035001cc5a6c79d2fbae7b79fff3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 19:02:21 -0400
Subject: [PATCH] New package: element-web-1.11.13

---
 srcpkgs/element-web/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/element-web/template

diff --git a/srcpkgs/element-web/template b/srcpkgs/element-web/template
new file mode 100644
index 000000000000..dbd4fb559851
--- /dev/null
+++ b/srcpkgs/element-web/template
@@ -0,0 +1,21 @@
+# Template file for 'element-web'
+pkgname=element-web
+version=1.11.13
+revision=1
+wrksrc="element-v${version}"
+conf_files="/etc/webapps/element/config.json"
+short_desc="Glossy Matrix collaboration client - web version"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://element.io"
+changelog="https://raw.githubusercontent.com/vector-im/element-web/develop/CHANGELOG.md"
+distfiles="https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"
+checksum=b76af344abef9059a6a16476e866e37d8f808bff1f38cd47fcf83eb4f1daa2da
+
+do_install() {
+	vmkdir usr/share/webapps/element
+	vcopy . /usr/share/webapps/element
+	vsconf config.sample.json
+	vinstall config.sample.json 644 /etc/webapps/element/ config.json
+	ln -s /etc/webapps/element/config.json "${DESTDIR}"/usr/share/webapps/element/config.json
+}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Closed]: New package: element-web-1.11.13
  2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
                   ` (7 preceding siblings ...)
  2022-11-01 13:28 ` [PR PATCH] [Updated] New package: element-web-1.11.12 TinfoilSubmarine
@ 2023-01-20 15:01 ` TinfoilSubmarine
  8 siblings, 0 replies; 10+ messages in thread
From: TinfoilSubmarine @ 2023-01-20 15:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]

There's a closed pull request on the void-packages repository

New package: element-web-1.11.13
https://github.com/void-linux/void-packages/pull/39554

Description:
~Move element-desktop, riot-desktop to subpackage of element-web~

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I've had `element-desktop` installed on my server and just pointing reverse proxy at `/usr/lib/element-desktop/resources/webapp`, but I also had to `ignorepkg` all of the dependencies. This fixes that :)

~I didn't bump the revision since there aren't any functional changes to `element-desktop`, but I can if needed.~

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-01-20 15:01 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-30 21:17 [PR PATCH] New package: element-web-1.11.8 (and move element/riot-desktop as subpackages) TinfoilSubmarine
2022-09-30 23:02 ` TinfoilSubmarine
2022-09-30 23:05 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-09-30 23:43 ` New package: element-web-1.11.8 paper42
2022-10-03  1:31 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-10-03  1:33 ` TinfoilSubmarine
2022-10-14 13:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-10-27 12:31 ` [PR PATCH] [Updated] New package: element-web-1.11.10 TinfoilSubmarine
2022-11-01 13:28 ` [PR PATCH] [Updated] New package: element-web-1.11.12 TinfoilSubmarine
2023-01-20 15:01 ` [PR PATCH] [Closed]: New package: element-web-1.11.13 TinfoilSubmarine

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).