update to 1.36.3

3 files changed, 22 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33e4cf0c8fd3..461b25369712 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = signal-desktop-noto
 	pkgdesc = Signal Private Messenger for Linux (Noto emoji version)
-	pkgver = 1.34.5
-	pkgrel = 3
+	pkgver = 1.36.3
+	pkgrel = 1
 	url = https://github.com/Skycoder42/Signal-Desktop-Noto
 	arch = x86_64
 	license = GPL3
@@ -11,6 +11,7 @@ pkgbase = signal-desktop-noto
 	makedepends = npm
 	makedepends = python
 	depends = libvips
+	depends = libxss
 	optdepends = repkg: Automatically rebuild the package on dependency updates
 	provides = signal
 	provides = signal-desktop
@@ -18,19 +19,19 @@ pkgbase = signal-desktop-noto
 	replaces = signal
 	replaces = signal-desktop
 	replaces = signal-desktop-bin
-	source = signal-desktop-1.34.5.tar.gz::https://github.com/signalapp/Signal-Desktop/archive/v1.34.5.tar.gz
+	source = signal-desktop-1.36.3.tar.gz::https://github.com/signalapp/Signal-Desktop/archive/v1.36.3.tar.gz
 	source = signal-desktop.desktop
 	source = openssl-linking.patch
 	source = expire-from-source-date-epoch.patch
 	source = https://github.com/atom/node-spellchecker/archive/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz
 	source = noto-emoji.patch
 	source = signal-desktop-noto.rule
-	sha512sums = 07c81b46791ab30e2ffa45f0bceb69dbf5a0029a6fa5da859c75917c012f97ed29154e19797d0ed962249516b9cf4365e54f6997d62c4069305f89eb54a86c01
+	sha512sums = 9b82e45c5cceee5ffc035cb82545d5b5f4dd1d4ddd96fb1be37b225ab2ca07d177494e5bdc8c0290fdf44aaca45534b09529f14b15aeaad6cfa0f017747180b4
 	sha512sums = bc70532c6591d15761df2d7eaf01875e77be756798728fb8fab442bb40e20893dac0148133f892de2db36395bf82c9d289440d64479b0d916d773570a2f7a39d
 	sha512sums = a25698e39e2a3e88ce87e4b89bf222169c279a63359b576e05883682ee1553600b3e7afee5063aa901eaa8529a93d324b4e227d51d491a2054b559d9865ee6da
 	sha512sums = 1d0c276528b19b103a000d8640805971dc2b79b2ef785d3df2d31f610991b3404500ee7118d80da57332578132c04903fd9b9ff157144f2a0226a9efc73561a5
 	sha512sums = 42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd
-	sha512sums = 59806cbc0fb4433b109e1969b874b11683b6b8070bc78a1f32efb8a2a2e2638c42035df226a05a0af150c501f074c8c657c9e142a0aa30300ab7768c7336caf2
+	sha512sums = 863a64154dd39dd66ae58e09ce514430ba87ac83ecd44f8d80fde814ae1dd334bc26d5b214819ca9048773521ab8953b49d0f351795ee4a107892319c10bb533
 	sha512sums = 76856030f91b0b4af3d4113c6a991d0a25838c7b2f02e0819e7c683dd9f710d3e75a426dcba898e946f16829e58baaf45edcf4a29991eccd692429423c473ab2
 
 pkgname = signal-desktop-noto
diff --git a/PKGBUILD b/PKGBUILD
index c1a2c2b5a8c2..c59125e40e2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 _pkgroot=signal-desktop
 pkgname=${_pkgroot}-noto
 _pkgname=Signal-Desktop
-pkgver=1.34.5
-pkgrel=3
+pkgver=1.36.3
+pkgrel=1
 pkgdesc="Signal Private Messenger for Linux (Noto emoji version)"
 license=('GPL3')
 arch=('x86_64')
 url="https://github.com/Skycoder42/Signal-Desktop-Noto"
-depends=('libvips')
+depends=('libvips' 'libxss')
 makedepends=('yarn' 'git' 'nodejs' 'npm' 'python')
 optdepends=("repkg: Automatically rebuild the package on dependency updates")
 provides=(signal signal-desktop signal-desktop-bin)
@@ -26,12 +26,12 @@ source=(
   "noto-emoji.patch"
   "$pkgname.rule"
 )
-sha512sums=('07c81b46791ab30e2ffa45f0bceb69dbf5a0029a6fa5da859c75917c012f97ed29154e19797d0ed962249516b9cf4365e54f6997d62c4069305f89eb54a86c01'
+sha512sums=('9b82e45c5cceee5ffc035cb82545d5b5f4dd1d4ddd96fb1be37b225ab2ca07d177494e5bdc8c0290fdf44aaca45534b09529f14b15aeaad6cfa0f017747180b4'
             'bc70532c6591d15761df2d7eaf01875e77be756798728fb8fab442bb40e20893dac0148133f892de2db36395bf82c9d289440d64479b0d916d773570a2f7a39d'
             'a25698e39e2a3e88ce87e4b89bf222169c279a63359b576e05883682ee1553600b3e7afee5063aa901eaa8529a93d324b4e227d51d491a2054b559d9865ee6da'
             '1d0c276528b19b103a000d8640805971dc2b79b2ef785d3df2d31f610991b3404500ee7118d80da57332578132c04903fd9b9ff157144f2a0226a9efc73561a5'
             '42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd'
-            '59806cbc0fb4433b109e1969b874b11683b6b8070bc78a1f32efb8a2a2e2638c42035df226a05a0af150c501f074c8c657c9e142a0aa30300ab7768c7336caf2'
+            '863a64154dd39dd66ae58e09ce514430ba87ac83ecd44f8d80fde814ae1dd334bc26d5b214819ca9048773521ab8953b49d0f351795ee4a107892319c10bb533'
             '76856030f91b0b4af3d4113c6a991d0a25838c7b2f02e0819e7c683dd9f710d3e75a426dcba898e946f16829e58baaf45edcf4a29991eccd692429423c473ab2')
 
 prepare() {
@@ -51,7 +51,7 @@ prepare() {
   sed 's#"node-gyp": "5.0.3"#"node-gyp": "6.1.0"#' -i package.json
   # https://github.com/sass/node-sass/pull/2841
   # https://github.com/sass/node-sass/issues/2716
-  sed 's#"resolutions": {#"resolutions": {"node-sass/node-gyp": "^6.0.0",#' -i package.json
+  sed -r 's#("dependencies": )#"resolutions": {"node-sass/node-gyp": "^6.0.0"},\1#' -i package.json
 
   yarn install --ignore-engines
 
diff --git a/noto-emoji.patch b/noto-emoji.patch
index 8aa01ee0c754..849cf6205c0c 100644
--- a/noto-emoji.patch
+++ b/noto-emoji.patch
@@ -9,11 +9,11 @@ index 00000000..b1692606
 +set -e
 +exec git diff origin/master origin/noto-emoji > ${1:-'noto-emoji.patch'}
 diff --git a/package.json b/package.json
-index 9a52afe2..9a572cda 100644
+index b2b7ef16..649d44e5 100644
 --- a/package.json
 +++ b/package.json
-@@ -78,7 +78,7 @@
-     "curve25519-n": "https://github.com/scottnonnenberg-signal/node-curve25519.git#3e94f60bc54b2426476520d8d1a0aa835c25f5cc",
+@@ -79,7 +79,7 @@
+     "dashdash": "1.14.1",
      "draft-js": "0.10.5",
      "emoji-datasource": "5.0.1",
 -    "emoji-datasource-apple": "5.0.1",
@@ -21,7 +21,7 @@ index 9a52afe2..9a572cda 100644
      "emoji-regex": "8.0.0",
      "fast-glob": "3.2.1",
      "filesize": "3.6.1",
-@@ -370,8 +370,8 @@
+@@ -386,8 +386,8 @@
        "sticker-creator/dist/**",
        "!node_modules/emoji-datasource/emoji_pretty.json",
        "!node_modules/emoji-datasource/**/*.png",
@@ -33,10 +33,10 @@ index 9a52afe2..9a572cda 100644
        "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples,*.d.ts}",
        "!**/node_modules/.bin",
 diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts
-index 49704d80..4c1157bc 100644
+index 99aae7f2..6d474c49 100644
 --- a/ts/components/emoji/lib.ts
 +++ b/ts/components/emoji/lib.ts
-@@ -69,7 +69,7 @@ export type EmojiData = {
+@@ -68,7 +68,7 @@ export type EmojiData = {
  };
  
  const data = (untypedData as Array<EmojiData>)
@@ -45,7 +45,7 @@ index 49704d80..4c1157bc 100644
    .map(emoji =>
      // Why this weird map?
      // the emoji dataset has two separate categories for Emotions and People
-@@ -91,7 +91,7 @@ const ROOT_PATH = get(
+@@ -89,7 +89,7 @@ const ROOT_PATH = get(
  );
  
  const makeImagePath = (src: string) => {
@@ -53,12 +53,12 @@ index 49704d80..4c1157bc 100644
 +  return `${ROOT_PATH}node_modules/emoji-datasource-google/img/google/64/${src}`;
  };
  
- const imageQueue = new PQueue({ concurrency: 10 });
+ const imageQueue = new PQueue({ concurrency: 10, timeout: 1000 * 60 * 2 });
 diff --git a/yarn.lock b/yarn.lock
-index 028c8fcd..40595788 100644
+index ab2e8b4b..5e73cb5c 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -6530,10 +6530,10 @@ email-validator@^2.0.4:
+@@ -6310,10 +6310,10 @@ email-validator@^2.0.4:
    resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
    integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==