[Commits] [SCM] claws-win32-installer branch, master, updated. 4.3.0-1-50-g5af20bf

[jonathan at claws-mail.org]

The branch, master has been updated
       via  5af20bf5f34c211cd4554968d8825f7fd469919d (commit)
      from  c4d7763959bde37e71ffc246c4f8ac9f1139a782 (commit)

Summary of changes:
 configure.ac    |  2 +-
 src/Makefile.am | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit 5af20bf5f34c211cd4554968d8825f7fd469919d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Dec 8 02:16:10 2024 -0700

    Build fontconfig with meson

diff --git a/configure.ac b/configure.ac
index b14b639..94d3917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,7 +233,7 @@ 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([fontconfig], [expat freetype])
 CM_SPKG([freetype], [libpng zlib])
 CM_SPKG([fribidi])
 CM_SPKG([gdk_pixbuf], [gettext glib libpng])
diff --git a/src/Makefile.am b/src/Makefile.am
index 76f6034..e667405 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,18 +38,19 @@ EXTRA_DIST = config.nsi.in claws-mail.nsi \
 cm_pkg_libical_cmake = yes
 cm_pkg_poppler_cmake = yes
 
-cm_pkg_gtk_meson = yes
-cm_pkg_libepoxy_meson = yes
 cm_pkg_atk_meson = yes
-cm_pkg_glib_meson = yes
-cm_pkg_pixman_meson = yes
-cm_pkg_gdk_pixbuf_meson = yes
+cm_pkg_cairo_meson = yes
+cm_pkg_fontconfig_meson = yes
 cm_pkg_fribidi_meson = yes
-cm_pkg_pango_meson = yes
-cm_pkg_libpsl_meson = yes
+cm_pkg_gdk_pixbuf_meson = yes
+cm_pkg_glib_meson = yes
+cm_pkg_gtk_meson = yes
 cm_pkg_harfbuzz_meson = yes
+cm_pkg_libepoxy_meson = yes
+cm_pkg_libpsl_meson = yes
 cm_pkg_p11_kit_meson = yes
-cm_pkg_cairo_meson = yes
+cm_pkg_pango_meson = yes
+cm_pkg_pixman_meson = yes
 
 cm_pkg_libiconv_configure = \
 	--enable-shared=yes \
@@ -135,11 +136,9 @@ cm_pkg_freetype_configure = \
 	LDFLAGS=-L$(idir)/lib
 
 cm_pkg_fontconfig_configure = \
-	--enable-iconv \
-	--disable-docs \
-	--enable-libxml2 \
-	CPPFLAGS=-I$(idir)/include \
-	LDFLAGS=-L$(idir)/lib
+	-Ddoc=disabled \
+	-Dtests=disabled \
+	-Dtools=disabled
 
 cm_pkg_fribidi_configure = \
 	-Ddocs=false \

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


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