diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | noto-emoji.patch | 46 |
3 files changed, 34 insertions, 34 deletions
@@ -1,6 +1,6 @@ pkgbase = signal-desktop-noto pkgdesc = Electron application that links with Signal on mobile (Noto emoji version) - pkgver = 1.30.1 + pkgver = 1.31.0 pkgrel = 1 url = https://github.com/Skycoder42/Signal-Desktop-Noto arch = x86_64 @@ -18,23 +18,23 @@ pkgbase = signal-desktop-noto replaces = signal replaces = signal-desktop replaces = signal-desktop-bin - source = signal-desktop-1.30.1.tar.gz::https://github.com/signalapp/Signal-Desktop/archive/v1.30.1.tar.gz + source = signal-desktop-1.31.0.tar.gz::https://github.com/signalapp/Signal-Desktop/archive/v1.31.0.tar.gz source = signal-desktop.desktop source = openssl-linking.patch source = expire-from-source-date-epoch.patch source = noto-emoji.patch source = https://github.com/atom/node-spellchecker/archive/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz - sha512sums = 612a968e30571d4d3bf9d965a673ecc02bdd0a6def90b8f61a27e25160359862eb6f8fba854f82184e8cb707b04860a6c182951ab6b37f60d05fc374805ef639 + sha512sums = 198c05c77629bfb8a61a344305302f98120c32fdbffeb1a681b88be721acd34be5ddce5885312d49a7af9c78064cbe177e100742e54191fa68fee040f3f2f785 sha512sums = c6ef4b73440bfc4e15114ffe6a7c8114e9d824fac08daafd5d13096e946c6fbb169a5d6cdbf1d34b956223ab14bd9bb9e173ae4d01025103d0ae61fc8de26189 sha512sums = a25698e39e2a3e88ce87e4b89bf222169c279a63359b576e05883682ee1553600b3e7afee5063aa901eaa8529a93d324b4e227d51d491a2054b559d9865ee6da sha512sums = 1d0c276528b19b103a000d8640805971dc2b79b2ef785d3df2d31f610991b3404500ee7118d80da57332578132c04903fd9b9ff157144f2a0226a9efc73561a5 - sha512sums = 03bebc2111d498b8126d5b53463f927f25584e3ce90de5f1c7fa32ce23d716f96174ce32b7619eb54733080db0b72b3ee925e0046605015d47559271e2fd097d + sha512sums = a5443dbe0c2e32d335b5f7457e2cfa0738e77dbc6e7686d14c24212a71178ef835b0b01e192d13ab6b3b3d9378005020cc1a0e59d3b0a3dfc55c529cf132e331 sha512sums = 42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd - b2sums = 92fd1c182f23db91bf9127fd4b0d0ef075c12d85cb885154b3888a82f3ef224a0a895fe472fb82cceb69a482d64be35c82c4546ca6a1d03a62eb2eef9617c5ac + b2sums = ae79adf74b93ffb8f6f11be9ae94c8bbd1c16d59567b4e5138e617105a4825fda70f3d4d5849c7e4ab485c1b157721f3c70e7f1da248bdaa36ac86f0833c3f12 b2sums = 678d776f8468fd16d06763a141882d2408ff1c775f2115080f5ab0ee6e6fd18e353ca31d9cddd5eba21a86ce1a3b404e595dec7e2e5baf7227b58f4d46fdea88 b2sums = 7173c57b0645533202c0dffdf3aa54f92e9589eecd95c2a32ec9ef341e990bfe6d927e914322e6a39ffda38fa65c25f75cc7805ec70af9fc2c543256ac4e94c3 b2sums = a0ab62451aa9ba9782ba49fbb6173c4bfabf849b68d6bbc7789dca8593558ef169139c95df701a86f629ae1d0714284d4c2aea2cb0a4240b4ca35c8503d9d2c4 - b2sums = 66babf2dcee5c4602038beb78c979a251297eb1b9bb3a6fc8fe96411ac9f2408c76a39daf9da545642cef19f8bf8032b77a447f54796a532b9cdb34f166b9400 + b2sums = d5457af7e50104060a1d5fd2362aa2a75fdd716ce776324073d8d70bbfea7d743915fae2b6e34a6b46669023c9c12e201687509b50696306db80d18317cffe00 b2sums = 53ad39f0bed69c5c5635d2e581f4ce56e3080fee16f184add08adee1164c2d68059d52071478a05cdacf04186f9964250f46f09e80553bf35e1f2f4cd1976d1b pkgname = signal-desktop-noto @@ -4,7 +4,7 @@ _pkgroot=signal-desktop pkgname=${_pkgroot}-noto _pkgname=Signal-Desktop -pkgver=1.30.1 +pkgver=1.31.0 pkgrel=1 pkgdesc="Electron application that links with Signal on mobile (Noto emoji version)" license=('GPL3') @@ -24,17 +24,17 @@ source=( # See https://github.com/atom/node-spellchecker/issues/127 "https://github.com/atom/node-spellchecker/archive/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz" ) -sha512sums=('612a968e30571d4d3bf9d965a673ecc02bdd0a6def90b8f61a27e25160359862eb6f8fba854f82184e8cb707b04860a6c182951ab6b37f60d05fc374805ef639' +sha512sums=('198c05c77629bfb8a61a344305302f98120c32fdbffeb1a681b88be721acd34be5ddce5885312d49a7af9c78064cbe177e100742e54191fa68fee040f3f2f785' 'c6ef4b73440bfc4e15114ffe6a7c8114e9d824fac08daafd5d13096e946c6fbb169a5d6cdbf1d34b956223ab14bd9bb9e173ae4d01025103d0ae61fc8de26189' 'a25698e39e2a3e88ce87e4b89bf222169c279a63359b576e05883682ee1553600b3e7afee5063aa901eaa8529a93d324b4e227d51d491a2054b559d9865ee6da' '1d0c276528b19b103a000d8640805971dc2b79b2ef785d3df2d31f610991b3404500ee7118d80da57332578132c04903fd9b9ff157144f2a0226a9efc73561a5' - '03bebc2111d498b8126d5b53463f927f25584e3ce90de5f1c7fa32ce23d716f96174ce32b7619eb54733080db0b72b3ee925e0046605015d47559271e2fd097d' + 'a5443dbe0c2e32d335b5f7457e2cfa0738e77dbc6e7686d14c24212a71178ef835b0b01e192d13ab6b3b3d9378005020cc1a0e59d3b0a3dfc55c529cf132e331' '42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd') -b2sums=('92fd1c182f23db91bf9127fd4b0d0ef075c12d85cb885154b3888a82f3ef224a0a895fe472fb82cceb69a482d64be35c82c4546ca6a1d03a62eb2eef9617c5ac' +b2sums=('ae79adf74b93ffb8f6f11be9ae94c8bbd1c16d59567b4e5138e617105a4825fda70f3d4d5849c7e4ab485c1b157721f3c70e7f1da248bdaa36ac86f0833c3f12' '678d776f8468fd16d06763a141882d2408ff1c775f2115080f5ab0ee6e6fd18e353ca31d9cddd5eba21a86ce1a3b404e595dec7e2e5baf7227b58f4d46fdea88' '7173c57b0645533202c0dffdf3aa54f92e9589eecd95c2a32ec9ef341e990bfe6d927e914322e6a39ffda38fa65c25f75cc7805ec70af9fc2c543256ac4e94c3' 'a0ab62451aa9ba9782ba49fbb6173c4bfabf849b68d6bbc7789dca8593558ef169139c95df701a86f629ae1d0714284d4c2aea2cb0a4240b4ca35c8503d9d2c4' - '66babf2dcee5c4602038beb78c979a251297eb1b9bb3a6fc8fe96411ac9f2408c76a39daf9da545642cef19f8bf8032b77a447f54796a532b9cdb34f166b9400' + 'd5457af7e50104060a1d5fd2362aa2a75fdd716ce776324073d8d70bbfea7d743915fae2b6e34a6b46669023c9c12e201687509b50696306db80d18317cffe00' '53ad39f0bed69c5c5635d2e581f4ce56e3080fee16f184add08adee1164c2d68059d52071478a05cdacf04186f9964250f46f09e80553bf35e1f2f4cd1976d1b') prepare() { diff --git a/noto-emoji.patch b/noto-emoji.patch index 9cbf9029a3f4..696cb2d53b07 100644 --- a/noto-emoji.patch +++ b/noto-emoji.patch @@ -9,22 +9,22 @@ 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 863e3c79..fcbd8fc2 100644 +index ccdd03ff..c0bc7c78 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "electron-mocha": "8.1.1", "electron-notarize": "0.1.1", - "emoji-datasource": "4.1.0", -- "emoji-datasource-apple": "4.1.0", -+ "emoji-datasource-google": "4.1.0", + "emoji-datasource": "5.0.1", +- "emoji-datasource-apple": "5.0.1", ++ "emoji-datasource-google": "5.0.1", "emoji-regex": "8.0.0", "filesize": "3.6.1", "firstline": "1.2.1", @@ -366,8 +366,8 @@ "sticker-creator/dist/**", "!node_modules/emoji-datasource/emoji_pretty.json", - "!node_modules/emoji-datasource/*.png", + "!node_modules/emoji-datasource/**/*.png", - "!node_modules/emoji-datasource-apple/emoji_pretty.json", - "!node_modules/emoji-datasource-apple/img/apple/sheets*", + "!node_modules/emoji-datasource-google/emoji_pretty.json", @@ -33,19 +33,19 @@ index 863e3c79..fcbd8fc2 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 05dc8b73..9f10357c 100644 +index 47b7f0b0..60996d4b 100644 --- a/ts/components/emoji/lib.ts +++ b/ts/components/emoji/lib.ts @@ -69,7 +69,7 @@ export type EmojiData = { }; - const data = (untypedData as Array<EmojiData>).filter( -- emoji => emoji.has_img_apple -+ emoji => emoji.has_img_google - ); - - // @ts-ignore -@@ -81,7 +81,7 @@ const ROOT_PATH = get( + const data = (untypedData as Array<EmojiData>) +- .filter(emoji => emoji.has_img_apple) ++ .filter(emoji => emoji.has_img_google) + .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( ); const makeImagePath = (src: string) => { @@ -55,20 +55,20 @@ index 05dc8b73..9f10357c 100644 const imageQueue = new PQueue({ concurrency: 10 }); diff --git a/yarn.lock b/yarn.lock -index 20fa5141..3c998b24 100644 +index 288d92c5..ccc02523 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6107,10 +6107,10 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" --emoji-datasource-apple@4.1.0: -+emoji-datasource-google@4.1.0: - version "4.1.0" -- resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-4.1.0.tgz#e6725311b115144a32fb60043416a755fea30bf5" -- integrity sha1-5nJTEbEVFEoy+2AENBanVf6jC/U= -+ resolved "https://registry.yarnpkg.com/emoji-datasource-google/-/emoji-datasource-google-4.1.0.tgz#d69be74d48c76ee2bb9fcb4e7920f27fa12dde9e" -+ integrity sha1-1pvnTUjHbuK7n8tOeSDyf6Et3p4= +-emoji-datasource-apple@5.0.1: ++emoji-datasource-google@5.0.1: + version "5.0.1" +- resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-5.0.1.tgz#fd3a3fb9993f1c58a53b015e3a30fe640641044f" +- integrity sha512-VmbD3iwv5FS2XUuxzmRpkicGNwXWrMe45f5ZL6YkcMznp0YtCsKO2bCxsSZ41XU1aWtwH5IZDqF12038TC01kw== ++ resolved "https://registry.yarnpkg.com/emoji-datasource-google/-/emoji-datasource-google-5.0.1.tgz#81ac5bdbbd153976196a516d840e04303f19375d" ++ integrity sha512-JLlz6tcuNRqg/BUhfWjWmOAaj8VhBvF7E88yRblMh+6c3IBmSeAqlYbepsavS1QPEhhvZICGUkch7+yxWTrRlQ== - emoji-datasource@4.1.0: - version "4.1.0" + emoji-datasource@5.0.1: + version "5.0.1" |