Github messages for voidlinux
 help / color / mirror / Atom feed
From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] element-desktop: update to 1.11.0.
Date: Thu, 07 Jul 2022 10:20:51 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37908@inbox.vuxu.org> (raw)

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

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

https://github.com/jcgruenhage/void-packages element-desktop-1.11.0_1
https://github.com/void-linux/void-packages/pull/37908

element-desktop: update to 1.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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


The platform support patch has been removed because it's been merged upstream in https://github.com/vector-im/element-desktop/pull/376.

I've tested this locally on x86\_64, works as expected.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/37908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.11.0_1-37908.patch --]
[-- Type: text/x-diff, Size: 8542 bytes --]

From ec03de623730f44c72668aea7b4b36853637cf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Thu, 7 Jul 2022 10:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.0.

---
 ...es-compilation-on-a-bunch-of-targets.patch | 184 ------------------
 ...mpilation-on-a-bunch-of-targets.patch.args |   1 -
 srcpkgs/element-desktop/template              |   6 +-
 3 files changed, 3 insertions(+), 188 deletions(-)
 delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
 delete mode 100644 srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args

diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
deleted file mode 100644
index 81fe2882b532..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8234ebac57785b09defe3b179f9cce8ef4cf88d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Tue, 17 Aug 2021 17:33:02 +0200
-Subject: [PATCH] support compilation on more targets
-
----
- package.json          |  1 +
- scripts/hak/target.ts | 86 +++++++++++++++++++++++++++++++++++++++++--
- yarn.lock             |  2 +-
- 3 files changed, 84 insertions(+), 5 deletions(-)
-
-diff --git a/package.json b/package.json
-index ac17d6d..01e2192 100644
---- a/package.json
-+++ b/package.json
-@@ -61,6 +61,7 @@
-     "app-builder-lib": "^22.14.10",
-     "asar": "^2.0.1",
-     "chokidar": "^3.5.2",
-+    "detect-libc": "^1.0.3",
-     "electron": "^17",
-     "electron-builder": "22.11.4",
-     "electron-builder-squirrel-windows": "22.11.4",
-diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts
-index 7970bb3..657fe45 100644
---- a/scripts/hak/target.ts
-+++ b/scripts/hak/target.ts
-@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
- limitations under the License.
- */
- 
-+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
-+
- // We borrow Rust's target naming scheme as a way of expressing all target
- // details in a single string.
- // See https://doc.rust-lang.org/rustc/platform-support.html.
-@@ -23,18 +25,28 @@ export type TargetId =
-     'universal-apple-darwin' |
-     'i686-pc-windows-msvc' |
-     'x86_64-pc-windows-msvc' |
--    'x86_64-unknown-linux-gnu';
-+    'i686-unknown-linux-musl' |
-+    'i686-unknown-linux-gnu' |
-+    'x86_64-unknown-linux-musl' |
-+    'x86_64-unknown-linux-gnu' |
-+    'aarch64-unknown-linux-musl' |
-+    'aarch64-unknown-linux-gnu' |
-+    'powerpc64le-unknown-linux-musl' |
-+    'powerpc64le-unknown-linux-gnu';
- 
- // Values are expected to match those used in `process.platform`.
- export type Platform = 'darwin' | 'linux' | 'win32';
- 
- // Values are expected to match those used in `process.arch`.
--export type Arch = 'arm64' | 'ia32' | 'x64' | 'universal';
-+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
- 
- // Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
- // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
- export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
- 
-+// Values are expected to match those used in `detect-libc`.
-+export type LibC = GLIBC | MUSL;
-+
- export type Target = {
-     id: TargetId;
-     platform: Platform;
-@@ -46,6 +58,11 @@ export type WindowsTarget = Target & {
-     vcVarsArch: VcVarsArch;
- };
- 
-+export type LinuxTarget = Target & {
-+    platform: 'linux';
-+    libC: LibC;
-+}
-+
- export type UniversalTarget = Target & {
-     arch: 'universal';
-     subtargets: Target[];
-@@ -87,10 +104,60 @@ const x8664PcWindowsMsvc: WindowsTarget = {
-     vcVarsArch: 'amd64',
- };
- 
--const x8664UnknownLinuxGnu: Target = {
-+const x8664UnknownLinuxGnu: LinuxTarget = {
-     id: 'x86_64-unknown-linux-gnu',
-     platform: 'linux',
-     arch: 'x64',
-+    libC: 'glibc',
-+};
-+
-+const x8664UnknownLinuxMusl: LinuxTarget = {
-+    id: 'x86_64-unknown-linux-musl',
-+    platform: 'linux',
-+    arch: 'x64',
-+    libC: 'musl',
-+};
-+
-+const i686UnknownLinuxGnu: LinuxTarget = {
-+    id: 'i686-unknown-linux-gnu',
-+    platform: 'linux',
-+    arch: 'ia32',
-+    libC: 'glibc',
-+};
-+
-+const i686UnknownLinuxMusl: LinuxTarget = {
-+    id: 'i686-unknown-linux-musl',
-+    platform: 'linux',
-+    arch: 'ia32',
-+    libC: 'musl',
-+};
-+
-+const aarch64UnknownLinuxGnu: LinuxTarget = {
-+    id: 'aarch64-unknown-linux-gnu',
-+    platform: 'linux',
-+    arch: 'arm64',
-+    libC: 'glibc',
-+};
-+
-+const aarch64UnknownLinuxMusl: LinuxTarget = {
-+    id: 'aarch64-unknown-linux-musl',
-+    platform: 'linux',
-+    arch: 'arm64',
-+    libC: 'musl',
-+};
-+
-+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
-+    id: 'powerpc64le-unknown-linux-gnu',
-+    platform: 'linux',
-+    arch: 'ppc64',
-+    libC: 'glibc',
-+};
-+
-+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
-+    id: 'powerpc64le-unknown-linux-musl',
-+    platform: 'linux',
-+    arch: 'ppc64',
-+    libC: 'musl',
- };
- 
- export const TARGETS: Record<TargetId, Target> = {
-@@ -102,13 +169,24 @@ export const TARGETS: Record<TargetId, Target> = {
-     'i686-pc-windows-msvc': i686PcWindowsMsvc,
-     'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
-     // Linux
-+    'i686-unknown-linux-musl': i686UnknownLinuxMusl,
-+    'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
-+    'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
-     'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
-+    'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
-+    'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
-+    'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
-+    'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
- };
- 
- export function getHost(): Target {
-     return Object.values(TARGETS).find(target => (
-         target.platform === process.platform &&
--        target.arch === process.arch
-+        target.arch === process.arch &&
-+        (
-+            process.platform !== 'linux' ||
-+            (target as LinuxTarget).libC === processLibC
-+        )
-     ));
- }
- 
-diff --git a/yarn.lock b/yarn.lock
-index 75b3bb5..12ec518 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2049,7 +2049,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
-   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
-   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
- 
--detect-libc@^1.0.2:
-+detect-libc@^1.0.2, detect-libc@^1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
--- 
-2.36.1
-
diff --git a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args b/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
deleted file mode 100644
index ed3aca96feaa..000000000000
--- a/srcpkgs/element-desktop/patches/element-desktop_0001-Fixes-compilation-on-a-bunch-of-targets.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d element-desktop
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7e712cf0da9c..af65250ce93d 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.10.14
+version=1.11.0
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="4e590e765944701b9884ea493ba482272f61fb0dd1c877fc59db6c460c1a2e10
- 57d4730d6ced050199966db34bd56da89d2dbbfd52bd90546c300549601b7b31"
+checksum="1a098b81ee4dcd2053d9fe19c37813721e7e49e53d300fb8463498fe48192105
+ 73d248b8d7b53d05c4a4297de125d1f350f2ddfa17b428e0aa4ed46ede5031e2"
 
 export USE_SYSTEM_APP_BUILDER=true
 

             reply	other threads:[~2022-07-07  8:20 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-07  8:20 jcgruenhage [this message]
2022-07-07  8:30 ` wael444
2022-07-08 12:13 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-10 19:16 ` Johnnynator
2022-07-11  4:48 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-11  5:10 ` jcgruenhage
2022-07-11  5:13 ` Johnnynator
2022-07-11  5:23 ` jcgruenhage
2022-07-11  5:27 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-11  8:43 ` jcgruenhage
2022-07-11  9:14 ` jcgruenhage
2022-07-11 10:04 ` Johnnynator
2022-07-11 11:55 ` jcgruenhage
2022-07-11 14:38 ` jcgruenhage
2022-07-11 19:24 ` Johnnynator
2022-07-12  5:58 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13  7:16 ` Johnnynator
2022-07-13 16:26 ` [PR PATCH] [Updated] " jcgruenhage
2022-07-13 16:26 ` jcgruenhage
2022-07-13 17:13 ` [PR PATCH] [Merged]: " Johnnynator

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37908@inbox.vuxu.org \
    --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).