element-desktop: update to 1.11.82

The patch is no longer necessary since sentry is now imported
conditionally.
This commit is contained in:
Luca Bilke 2024-10-29 11:03:14 +01:00 committed by classabbyamp
parent c4b7b79f96
commit 397c5a9844
3 changed files with 3 additions and 56 deletions

View File

@ -1,43 +0,0 @@
diff --git a/package.json b/package.json
index 02a59ee45..b5dd89a2f 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,6 @@
"@babel/runtime": "^7.12.5",
"@casualbot/jest-sonar-reporter": "^2.2.5",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
- "@sentry/webpack-plugin": "^2.0.0",
"@svgr/webpack": "^5.5.0",
"@testing-library/react": "^12.1.5",
"@types/jest": "^29.0.0",
diff --git a/webpack.config.js b/webpack.config.js
index 514bf32d0..a17a561b7 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 { sentryWebpackPlugin } = require("@sentry/webpack-plugin");
const crypto = require("crypto");
// XXX: mangle Crypto::createHash to replace md4 with sha256, output.hashFunction is insufficient as multiple bits
@@ -658,18 +657,6 @@ module.exports = (env, argv) => {
files: [{ match: /.*Inter.*\.woff2$/ }],
}),
- // upload to sentry if sentry env is present
- process.env.SENTRY_DSN &&
- sentryWebpackPlugin({
- release: process.env.VERSION,
- sourcemaps: {
- paths: "./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),

View File

@ -1,6 +1,6 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
version=1.11.82
revision=1
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
@ -17,8 +17,8 @@ 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-v${version}.tar.gz
https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
checksum="9a090dad94096e57ceb6629f41650fbb70c3efb2d36a7354ec3902463495633e
c7395f14a7747ece79ade9ab1133e95abf9c35c73fa430220e4a5d8868cd5028"
checksum="eb8b94aca6bacbb4e9b21d2c81e6e5a46bb343f8266ee8987d6137cfd2d6928b
465d420c75207026d4e9cbc3988d427b3320e13e984745a08c7d60bdb978281f"
export USE_SYSTEM_APP_BUILDER=true
@ -27,15 +27,6 @@ post_extract() {
mv ${pkgname/desktop/web}-${version} ${pkgname/desktop/web}
}
pre_patch() {
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}
# Disable auto-updating