[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-7-ga92406d

[jonathan at claws-mail.org]

The branch, master has been updated
       via  a92406d9403e62db1d14c3880574f1969a95bb0b (commit)
       via  501c68ba9e28954a41420a5760ae8fd82981c1d5 (commit)
      from  ab93961df3b4da524a4aa38b3063855d9089d062 (commit)

Summary of changes:
 patches/glib/01-memcpy-length.patch | 11 -----------
 src/Makefile.am                     |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 patches/glib/01-memcpy-length.patch


- Log -----------------------------------------------------------------
commit a92406d9403e62db1d14c3880574f1969a95bb0b
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Tue Aug 31 22:24:48 2021 -0700

    glib patch doesn't apply to old version

diff --git a/patches/glib/01-memcpy-length.patch b/patches/glib/01-memcpy-length.patch
deleted file mode 100644
index 8fb0255..0000000
--- a/patches/glib/01-memcpy-length.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gio/gwin32packageparser.c	2021-08-02 21:23:30.898523365 -0700
-+++ b/gio/gwin32packageparser.c	2021-08-02 21:30:48.908511480 -0700
-@@ -390,7 +390,7 @@
-       wcs_path = LoadedWindowsGetStringRawBuffer (path, NULL);
-       manifest_filename_size = wcslen (wcs_path) + wcslen (bslash_appmanifest);
-       manifest_filename = g_new (wchar_t, manifest_filename_size + 1);
--      memcpy (manifest_filename, wcs_path, manifest_filename_size * sizeof (wchar_t));
-+      memcpy (manifest_filename, wcs_path, wcslen (wcs_path) * sizeof (wchar_t));
-       memcpy (&manifest_filename[wcslen (wcs_path)], bslash_appmanifest, (wcslen (bslash_appmanifest) + 1) * sizeof (wchar_t));
- 
-       memset (sax, 0, sizeof (*sax));

commit 501c68ba9e28954a41420a5760ae8fd82981c1d5
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Tue Aug 31 19:53:15 2021 -0700

    Move LITEHTML_UTF8 definition to claws makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 5dc24f4..fe41b37 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -288,7 +288,7 @@ cm_pkg_claws_mail_configure = \
 	--disable-dillo-plugin \
 	--enable-tnef_parse-plugin \
 	--with-password-encryption=gnutls \
-	CPPFLAGS="-I$(idir)/include -D_POSIX_C_SOURCE -DLITEHTML_UTF8" \
+	CPPFLAGS="-I$(idir)/include -D_POSIX_C_SOURCE" \
 	LDFLAGS=-L$(idir)/lib
 
 cm_pkg_sqlite_configure = \

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


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