From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] element-desktop: update to 1.11.3.
Date: Wed, 17 Aug 2022 07:15:34 +0200 [thread overview]
Message-ID: <20220817051534.YQX58FOBEQT3BN0PH3jdtR5HTwAcc9lPmspvBllLNjs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38714@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages element-desktop-1.11.3_1
https://github.com/void-linux/void-packages/pull/38714
element-desktop: update to 1.11.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/38714.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.3_1-38714.patch --]
[-- Type: text/x-diff, Size: 4256 bytes --]
From 0593bcd2f56035307a5d732dc0975fb258eb2e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 16 Aug 2022 18:04:42 +0200
Subject: [PATCH] element-desktop: update to 1.11.3.
---
...web_0001-remove-dependency-on-sentry.patch | 24 +++++++++++--------
srcpkgs/element-desktop/template | 7 +++---
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
index 92a490b59734..e8d1003a8cec 100644
--- a/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
+++ b/srcpkgs/element-desktop/patches/element-web_0001-remove-dependency-on-sentry.patch
@@ -1,28 +1,28 @@
-From a38eae15bfa5fd31927fe7d26191ebf8b56e04ee Mon Sep 17 00:00:00 2001
+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 | 7 -------
- 2 files changed, 8 deletions(-)
+ package.json | 1 -
+ webpack.config.js | 11 -----------
+ 2 files changed, 12 deletions(-)
diff --git a/package.json b/package.json
-index 021368599..4587b29fb 100644
+index 89c0ba12e..c31f84fad 100644
--- a/package.json
+++ b/package.json
-@@ -84,7 +84,6 @@
+@@ -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": "^27.0.2",
+ "@types/jest": "^28.0.0",
diff --git a/webpack.config.js b/webpack.config.js
-index 13e969eca..0cd036a7e 100644
+index 8d1f27330..b56a11566 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
@@ -33,7 +33,7 @@ index 13e969eca..0cd036a7e 100644
dotenv.config();
let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
-@@ -631,12 +630,6 @@ module.exports = (env, argv) => {
+@@ -626,16 +625,6 @@ module.exports = (env, argv) => {
files: [{ match: /.*Inter.*\.woff2$/ }],
}),
@@ -42,10 +42,14 @@ index 13e969eca..0cd036a7e 100644
- 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.36.0
+2.37.2
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a2c70cf88a8e..e095421207a4 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.11.2
+version=1.11.3
revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
@@ -14,10 +14,11 @@ short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0"
homepage="https://element.io"
+changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
-checksum="f8cae27b6960e58d4a78f19b8198a6452e4789e7107950d678ec88a08247f84a
- 2e9498a910acfc78d1b5ba4beb99af05195bde664c08ec1c2da47ef0d6ef21af"
+checksum="36205847fa61e17fc2a2ab40c066ea08f901987e16541a9f0817ad8314bd2a72
+ f75f431295091ff5c43e21d0c58d504f37c45ef57550926ecbeefe7a01c83c48"
export USE_SYSTEM_APP_BUILDER=true
next prev parent reply other threads:[~2022-08-17 5:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-16 16:06 [PR PATCH] " jcgruenhage
2022-08-17 0:33 ` [PR REVIEW] " classabbyamp
2022-08-17 5:15 ` jcgruenhage [this message]
2022-08-17 5:44 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220817051534.YQX58FOBEQT3BN0PH3jdtR5HTwAcc9lPmspvBllLNjs@z \
--to=jcgruenhage@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).