From 19f007fa9d64dff4f292dc274bc37e142847bbe1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 18 Jul 2022 19:30:24 +0530 Subject: [PATCH] Linux binaries: Bundle brotli and graphite2 as well as Qt links against them --- bypy/linux/__main__.py | 3 ++- bypy/macos/__main__.py | 1 + bypy/sources.json | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/bypy/linux/__main__.py b/bypy/linux/__main__.py index bad81744bf..9136c9e6b8 100644 --- a/bypy/linux/__main__.py +++ b/bypy/linux/__main__.py @@ -45,7 +45,8 @@ def binary_includes(): get_dll_path, ('usb-1.0 mtp expat sqlite3 ffi z lzma openjp2 poppler dbus-1 iconv xml2 xslt jpeg png16' ' webp webpmux webpdemux exslt ncursesw readline chm hunspell-1.7 hyphen' - ' icudata icui18n icuuc icuio stemmer gcrypt gpg-error uchardet' + ' icudata icui18n icuuc icuio stemmer gcrypt gpg-error uchardet graphite2' + ' brotlicommon brotlidec brotlienc' ' gobject-2.0 glib-2.0 gthread-2.0 gmodule-2.0 gio-2.0 dbus-glib-1').split() )) + [ # debian/ubuntu for for some typical stupid reason use libpcre.so.3 diff --git a/bypy/macos/__main__.py b/bypy/macos/__main__.py index b922ce7b58..b18960e405 100644 --- a/bypy/macos/__main__.py +++ b/bypy/macos/__main__.py @@ -529,6 +529,7 @@ class Freeze: 'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0', 'icudata.70', 'icui18n.70', 'icuio.70', 'icuuc.70', 'hyphen.0', 'uchardet.0', 'stemmer.0', 'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5', + 'brotlicommon.1', 'brotlidec.1', 'brotlienc.1', 'crypto.1.1', 'ssl.1.1', 'iconv.2', # 'ltdl.7' ): print('\nAdding', x) diff --git a/bypy/sources.json b/bypy/sources.json index 6e3a8fd00e..57681b362c 100644 --- a/bypy/sources.json +++ b/bypy/sources.json @@ -97,6 +97,16 @@ } }, + { + "name": "brotli", + "unix": { + "filename": "brotli-1.0.9.tar.gz", + "hash": "sha256:f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46", + "urls": ["https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz"] + } + }, + + { "name": "expat", "unix": { @@ -242,6 +252,17 @@ } }, + { + "name": "graphite", + "os": "linux", + "unix": { + "filename": "graphite2-1.3.14.tgz", + "hash": "sha256:f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d", + "urls": ["https://github.com/silnrsi/graphite/releases/download/1.3.14/{filename}"] + } + }, + + { "name": "fontconfig", "os": "macos",