From 9c15a81b40d5ed83e1da23b16f21c0d86c627ec1 Mon Sep 17 00:00:00 2001 From: Maxim Logaev Date: Mon, 11 Mar 2024 17:10:07 +0300 Subject: [PATCH] Fixed build dependencies Signed-off-by: Maxim Logaev --- .gitignore | 3 +++ build-win64.sh | 23 +++++------------------ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 47bfd683..6d362804 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ Makefile .idea .sqlite3 gschemas.compiled +windows-installer/win64-dist/ +*.exe +*.dll diff --git a/build-win64.sh b/build-win64.sh index 8cd3dd24..49ce2c6c 100644 --- a/build-win64.sh +++ b/build-win64.sh @@ -23,12 +23,9 @@ prepare() mingw64/mingw-w64-x86_64-gcc \ mingw64/mingw-w64-x86_64-cmake \ mingw64/mingw-w64-x86_64-ninja \ - mingw64/mingw-w64-x86_64-libsoup3 \ - mingw64/mingw-w64-x86_64-gtk3 \ + mingw64/mingw-w64-x86_64-gtk4 \ + mingw64/mingw-w64-x86_64-libadwaita \ mingw64/mingw-w64-x86_64-sqlite3 \ - mingw64/mingw-w64-x86_64-gobject-introspection \ - mingw64/mingw-w64-x86_64-glib2 \ - mingw64/mingw-w64-x86_64-glib-networking \ mingw64/mingw-w64-x86_64-openssl \ mingw64/mingw-w64-x86_64-libgcrypt \ mingw64/mingw-w64-x86_64-libgee \ @@ -37,19 +34,17 @@ prepare() mingw64/mingw-w64-x86_64-qrencode \ mingw64/mingw-w64-x86_64-ntldd-git \ mingw64/mingw-w64-x86_64-gpgme \ - mingw64/mingw-w64-x86_64-nsis \ mingw64/mingw-w64-x86_64-fontconfig \ - mingw64/mingw-w64-x86_64-gspell \ - mingw64/mingw-w64-x86_64-enchant \ - mingw64/mingw-w64-x86_64-hunspell \ mingw64/mingw-w64-x86_64-iso-codes \ mingw64/mingw-w64-x86_64-gst-plugins-bad \ mingw64/mingw-w64-x86_64-gst-plugins-good \ mingw64/mingw-w64-x86_64-gst-plugins-base \ mingw64/mingw-w64-x86_64-gst-plugins-ugly \ mingw64/mingw-w64-x86_64-nsis \ + mingw64/mingw-w64-x86_64-libsignal-protocol-c \ + mingw64/mingw-w64-x86_64-ninja \ + mingw64/mingw-w64-x86_64-icu \ make \ - zip \ unzip \ curl @@ -80,7 +75,6 @@ dist_install() cp /mingw64/bin/gspawn-win64-helper.exe $DIST_DIR/bin cp /mingw64/bin/libcrypto-*-x64.dll $DIST_DIR/bin/ - cp -r /mingw64/lib/enchant-2 $DIST_DIR/lib cp -r /mingw64/lib/gstreamer-1.0 $DIST_DIR/lib mkdir -p $DIST_DIR/lib/gdk-pixbuf-2.0/ && cp -r /mingw64/lib/gdk-pixbuf-2.0 $DIST_DIR/lib/ mkdir -p $DIST_DIR/lib/gio/ && cp -r /mingw64/lib/gio $DIST_DIR/lib/ @@ -112,13 +106,6 @@ dist_install() mkdir -p $DIST_DIR/share/icons && cp -r /mingw64/share/icons $DIST_DIR/share/ mkdir -p $DIST_DIR/share/glib-2.0/schemas && cp -rf /mingw64/share/glib-2.0/schemas $DIST_DIR/share/glib-2.0/ - msg "Downloading spell check files for RU and EN (USA)" - mkdir -p $DIST_DIR/share/hunspell - curl -L -o $DIST_DIR/share/hunspell/ru.aff https://github.com/elastic/hunspell/raw/master/dicts/ru/ru.aff - curl -L -o $DIST_DIR/share/hunspell/ru.dic https://github.com/elastic/hunspell/raw/master/dicts/ru/ru.dic - curl -L -o $DIST_DIR/share/hunspell/en_US.aff https://github.com/elastic/hunspell/raw/master/dicts/en_US/en_US.aff - curl -L -o $DIST_DIR/share/hunspell/en_US.dic https://github.com/elastic/hunspell/raw/master/dicts/en_US/en_US.dic - msg "Successfully installed!" }