From 84b744aadd5576832b3cf183ebf9afe4a47140d0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 25 Jun 2023 13:19:10 +0200
Subject: [PATCH] element-desktop: update to 1.11.34.

---
 ...web_0001-remove-dependency-on-sentry.patch | 34 ++++++-------------
 srcpkgs/element-desktop/template              |  6 ++--
 2 files changed, 14 insertions(+), 26 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 e64a3bbb6b37..9919c3963c09 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,47 +1,38 @@
-From 83e08eeed782ba5f0b63f10b27829d031aec74d1 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 6d740b00b..e94240911 100644
+index 02a59ee45..b5dd89a2f 100644
 --- a/package.json
 +++ b/package.json
-@@ -87,7 +87,6 @@
+@@ -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": "^1.18.1",
+-        "@sentry/webpack-plugin": "^2.0.0",
          "@svgr/webpack": "^5.5.0",
          "@testing-library/react": "^12.1.5",
-         "@types/flux": "^3.1.9",
+         "@types/jest": "^29.0.0",
 diff --git a/webpack.config.js b/webpack.config.js
-index 28d60af8a..0018dcdd4 100644
+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 SentryCliPlugin = require("@sentry/webpack-plugin");
+-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
-@@ -656,16 +655,6 @@ module.exports = (env, argv) => {
+@@ -658,18 +657,6 @@ module.exports = (env, argv) => {
                  files: [{ match: /.*Inter.*\.woff2$/ }],
              }),
  
 -            // upload to sentry if sentry env is present
 -            process.env.SENTRY_DSN &&
--                new SentryCliPlugin({
+-                sentryWebpackPlugin({
 -                    release: process.env.VERSION,
--                    include: "./webapp/bundles",
+-                    sourcemaps: {
+-                        paths: "./webapp/bundles/**",
+-                    },
 -                    errorHandler: (err, invokeErr, compilation) => {
 -                        compilation.warnings.push("Sentry CLI Plugin: " + err.message);
 -                        console.log(`::warning title=Sentry error::${err.message}`);
@@ -50,6 +41,3 @@ index 28d60af8a..0018dcdd4 100644
              new webpack.EnvironmentPlugin(["VERSION"]),
          ].filter(Boolean),
  
--- 
-2.39.2
-
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 884a022da7f5..9eb59cc50721 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.33
+version=1.11.34
 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="ac657d25576c6151f4a96ce067363d27bbc0ed940b3c16d79eee5fafc5ce0024
- 4015804125d448065c68e1f9e8673c1fea9f11a2e937159edbdc64113c564d45"
+checksum="5163d11740bb9f9660c919a28c5a6fe2828660849088ce1e6b40b558736afd18
+ 54bfef3484f18135408b427ff253496e36a6ad3788b1df3c6c7ba0655e23e21b"
 
 export USE_SYSTEM_APP_BUILDER=true