From 763da2a0e9a2017408e2ee98492642eea55a7401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 24 Dec 2022 15:04:35 +0100 Subject: [PATCH] element-desktop: update to 1.11.17. --- ...web_0001-remove-dependency-on-sentry.patch | 42 +++++++++---------- srcpkgs/element-desktop/template | 6 +-- 2 files changed, 24 insertions(+), 24 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 e8d1003a8cec..ddae6631628f 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,4 +1,4 @@ -From 464305f785b65f7b2e552fb449bb7d230e9b0715 Mon Sep 17 00:00:00 2001 +From 8ea90b34d20f713dc015613a718ca159e6bc3d3d Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 11 Dec 2021 21:22:44 +0100 Subject: [PATCH] remove dependency on sentry @@ -10,30 +10,30 @@ This is unused and breaks ppc64 because it downlaods binaries. 2 files changed, 12 deletions(-) diff --git a/package.json b/package.json -index 89c0ba12e..c31f84fad 100644 +index 0e67a0543..7878c3443 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", +@@ -87,7 +87,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", + "@svgr/webpack": "^5.5.0", + "@testing-library/react": "^12.1.5", + "@types/flux": "^3.1.9", diff --git a/webpack.config.js b/webpack.config.js -index 8d1f27330..b56a11566 100644 +index dce54b53f..88b64ef91 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'); +@@ -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) => { + // Environment variables + // RIOT_OG_IMAGE_URL: specifies the URL to the image which should be used for the opengraph logo. +@@ -645,16 +644,6 @@ module.exports = (env, argv) => { files: [{ match: /.*Inter.*\.woff2$/ }], }), @@ -43,13 +43,13 @@ index 8d1f27330..b56a11566 100644 - release: process.env.VERSION, - include: "./webapp/bundles", - errorHandler: (err, invokeErr, compilation) => { -- compilation.warnings.push('Sentry CLI Plugin: ' + err.message); +- compilation.warnings.push("Sentry CLI Plugin: " + err.message); - console.log(`::warning title=Sentry error::${err.message}`); - }, - }), - new webpack.EnvironmentPlugin(['VERSION']), + new webpack.EnvironmentPlugin(["VERSION"]), ].filter(Boolean), -- -2.37.2 +2.39.0 diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template index 3bf270cff998..5be8a1e0de39 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.16 +version=1.11.17 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="b5ea805ec3422a85cab7411e9c9cf33c412b7a7a2742d50ecafaf8f19532c334 - f757dab950d0e7c2a7b0b9e21d07d41ac3e59b5b8fa70c0bea1b459bf26d87a7" +checksum="247a7ec3adab36635b1124ad84bb73b87999642a79dabfee093f2e72b5bf6c68 + 0e9d225a18e0bd67586d553fce087a12b908398ca4e0820184f4f95601e96152" export USE_SYSTEM_APP_BUILDER=true