[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-3-g0b6cd7c

[jonathan at claws-mail.org]

The branch, master has been updated
       via  0b6cd7c2e031b282182377b03cc24034d77a4af9 (commit)
      from  6afb80520eb6fe85482f13a26e4ee0f42039af62 (commit)

Summary of changes:
 packages/packages.current | 2 +-
 src/Makefile.am           | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 0b6cd7c2e031b282182377b03cc24034d77a4af9
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Feb 19 19:32:24 2023 -0700

    Update to cairo-1.17.8

diff --git a/packages/packages.current b/packages/packages.current
index 819be3b..4c42b5d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -6,7 +6,7 @@ adwaita_icon_theme,41.0,file,https://download.gnome.org/sources/adwaita-icon-the
 atk,2.38.0,file,https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz,ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36,,
 bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
 bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
-cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
+cairo,1.17.8,file,https://cairographics.org/snapshots/cairo-1.17.8.tar.xz,5b10c8892d1b58d70d3f0ba5b47863a061262fa56b9dc7944161f8c8b783bc64,,
 certdata,20220913,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/82c1e9cb9e0fedac10187342630d2072ca859348/security/nss/lib/ckfw/builtins/certdata.txt,3ff8bd209b5f2e739b9f2b96eacb694a774114685b02978257824f37ff528f71,,
 curl,7.86.0,file,https://curl.se/download/curl-7.86.0.tar.xz,2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b,,
 cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f616e4..2c017b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,7 @@ cm_pkg_libsoup_meson = yes
 cm_pkg_libpsl_meson = yes
 cm_pkg_harfbuzz_meson = yes
 cm_pkg_p11_kit_meson = yes
+cm_pkg_cairo_meson = yes
 
 cm_pkg_libiconv_configure = \
 	--enable-shared=yes \
@@ -168,13 +169,7 @@ cm_pkg_atk_meson_ldflags = -L$(idir)/lib
 cm_pkg_pixman_meson_cppflags = -I$(idir)/include
 cm_pkg_pixman_meson_ldflags = -L$(idir)/lib
 
-cm_pkg_cairo_configure = \
-	--enable-win32 \
-	--enable-win32-font \
-	--enable-ft \
-	--enable-fc \
-	CPPFLAGS=-I$(idir)/include \
-	LDFLAGS=-L$(idir)/lib
+cm_pkg_cairo_meson_ldflags = -L$(idir)/lib
 
 cm_pkg_libgpg_error_configure = \
 	--disable-doc \

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


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