[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-76-g071c413

[jonathan at claws-mail.org]

The branch, master has been updated
       via  071c413025023e675e876e658e8b75bd886d8e9e (commit)
      from  ce228dfed527e798c62eb070fd0b4dce8ed37fd9 (commit)

Summary of changes:
 configure.ac | 83 ++++++++++++++++++++++++++++--------------------------------
 1 file changed, 39 insertions(+), 44 deletions(-)


- Log -----------------------------------------------------------------
commit 071c413025023e675e876e658e8b75bd886d8e9e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Oct 7 20:09:56 2023 -0700

    Clean up package dependencies

diff --git a/configure.ac b/configure.ac
index 7531aea..80f86a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,71 +234,66 @@ AC_SUBST(meson_cpu_family)
 CM_BPKG([bsfilter])
 
 CM_MPKG([bzip2])
-CM_MPKG([zlib])
 CM_MPKG([poppler_data])
+CM_MPKG([zlib])
 
-CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gpgme gtk icu4c jpeg libiconv libpng zlib])
-
-CM_SPKG([gmp])
-CM_SPKG([regex], [gettext])
+CM_SPKG([adwaita_icon_theme])
+CM_SPKG([atk], [glib])
+CM_SPKG([cairo], [fontconfig freetype glib libpng pixman zlib])
+CM_SPKG([curl], [gnutls libpsl nettle zlib])
+CM_SPKG([cyrus_sasl])
+CM_SPKG([enchant], [glib hunspell])
+CM_SPKG([expat])
+CM_SPKG([fontconfig], [expat freetype gettext libiconv libxml2 zlib])
+CM_SPKG([freetype], [bzip2 libpng zlib])
 CM_SPKG([fribidi])
-CM_SPKG([hunspell], [libiconv gettext])
+CM_SPKG([gdk_pixbuf], [gettext glib libpng])
+CM_SPKG([gettext], [libiconv libxml2])
+CM_SPKG([glib], [gettext libffi libiconv pcre2 zlib])
+CM_SPKG([gmp])
+CM_SPKG([gnutls], [gettext gmp libiconv libtasn1 nettle p11_kit zlib])
+CM_SPKG([gpgme], [glib libassuan libgpg_error])
+CM_SPKG([gtk], [atk cairo freetype fribidi gdk_pixbuf gettext glib harfbuzz libepoxy libiconv pango])
+CM_SPKG([gumbo_parser])
+CM_SPKG([harfbuzz], [cairo freetype glib icu4c])
+CM_SPKG([hunspell], [gettext libiconv])
+CM_SPKG([icu4c])
 CM_SPKG([jpeg])
-
-CM_SPKG([libiconv])
-CM_SPKG([gettext], [libiconv])
-
+CM_SPKG([libassuan], [libgpg_error])
+CM_SPKG([libepoxy])
+CM_SPKG([libetpan], [curl cyrus_sasl expat gnutls libiconv zlib])
 CM_SPKG([libffi])
-CM_SPKG([pcre2])
-CM_SPKG([glib], [libiconv gettext libffi pcre2 zlib])
-CM_SPKG([expat])
-CM_SPKG([pixman], [libpng])
-CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
-CM_SPKG([atk], [glib])
-CM_SPKG([libxml2], [zlib])
-CM_SPKG([fontconfig], [zlib expat freetype libiconv libxml2])
-CM_SPKG([freetype], [zlib bzip2])
-CM_SPKG([gdk_pixbuf], [glib])
+CM_SPKG([libgpg_error], [gettext libiconv])
+CM_SPKG([libical], [icu4c])
+CM_SPKG([libiconv])
 CM_SPKG([libpng], [zlib])
-CM_SPKG([enchant], [glib hunspell])
-
-CM_SPKG([libgpg_error], [libiconv gettext])
-CM_SPKG([libassuan], [libgpg_error])
-CM_SPKG([gpgme], [libgpg_error libassuan glib])
+CM_SPKG([libpsl], [icu4c])
 CM_SPKG([libtasn1])
+CM_SPKG([libxml2], [icu4c libiconv zlib])
 CM_SPKG([nettle], [gmp])
 CM_SPKG([p11_kit], [gettext libffi libtasn1])
-CM_SPKG([gnutls], [gmp nettle libtasn1 p11_kit])
-CM_SPKG([libpsl], [icu4c])
-CM_SPKG([icu4c])
-CM_SPKG([libepoxy])
-CM_SPKG([harfbuzz], [glib cairo icu4c freetype])
-CM_SPKG([pango], [harfbuzz fontconfig glib cairo fribidi])
-CM_SPKG([gtk], [libiconv gettext atk pango glib gdk_pixbuf cairo libepoxy])
-CM_SPKG([adwaita_icon_theme])
-CM_SPKG([curl], [zlib gnutls libpsl])
-CM_SPKG([cyrus_sasl])
-CM_SPKG([libetpan], [gnutls cyrus_sasl curl expat libiconv zlib])
-CM_SPKG([libical], [icu4c])
+CM_SPKG([pango], [cairo fontconfig freetype fribidi glib harfbuzz])
+CM_SPKG([pcre2], [zlib])
+CM_SPKG([pixman], [glib libpng])
+CM_SPKG([poppler], [cairo fontconfig freetype gdk_pixbuf glib gpgme gtk icu4c jpeg libiconv libpng poppler_data zlib])
+CM_SPKG([regex], [gettext])
 CM_SPKG([ytnef])
-CM_SPKG([gumbo_parser])
 
 if test "$build_fancy" = yes; then
 	CM_SPKG([sqlite], [zlib])
-	CM_SPKG([libwebp], [zlib libpng jpeg])
+	CM_SPKG([libwebp], [jpeg libpng zlib])
 	CM_SPKG([libxslt], [libxml2])
 	CM_SPKG([glib_networking], [glib gnutls])
-	CM_SPKG([libsoup], [gnutls libxml2 glib_networking sqlite libpsl])
-	CM_SPKG([webkitgtk], [jpeg libpng glib gtk libsoup libxml2 libxslt libwebp icu4c harfbuzz])
+	CM_SPKG([libsoup], [glib_networking gnutls libpsl libxml2 sqlite])
+	CM_SPKG([webkitgtk], [glib gtk harfbuzz icu4c jpeg libpng libsoup libwebp libxml2 libxslt])
 	cm_dep_webkitgtk="webkitgtk"
 else
 	cm_dep_webkitgtk=""
 	AC_SUBST(NSIS_DISABLE_FANCY, [-DDISABLE_FANCY_PLUGIN])
 fi
 
-claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib poppler"
-claws_mail_deps="$claws_mail_deps gpgme regex libetpan gnutls ytnef gumbo_parser"
-claws_mail_deps="$claws_mail_deps libxml2 expat $cm_dep_webkitgtk curl libical nettle"
+claws_mail_deps="curl enchant expat gettext glib gnutls gpgme gtk gumbo_parser libetpan libical libiconv libpng libxml2"
+claws_mail_deps="$claws_mail_deps nettle poppler regex $cm_dep_webkitgtk ytnef zlib"
 CM_SPKG([claws_mail], [$claws_mail_deps])
 
 AC_SUBST(cm_bpkgs)

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port