[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-3-g8fa6105
jonathan at claws-mail.org
jonathan at claws-mail.org
Tue Aug 17 12:12:17 UTC 2021
The branch, master has been updated
via 8fa6105dc56a833eb8a0589f82b9a12dcc9d7cec (commit)
via 4ebf562d83fbb8386a80ed2509f6d4d28b1e7f3c (commit)
via 6315b0c164f8329779fadf7cba0bfcbb608e1db0 (commit)
from 8773971c5e4e87ce747077d6456dc553bc6915ac (commit)
Summary of changes:
configure.ac | 2 +-
packages/packages.current | 2 +-
patches/enchant/02-free-library-name.patch | 23 +++++++++++++++++
patches/glib/01-memcpy-length.patch | 11 ++++++++
patches/pango/01-rounding.patch | 41 ++++++++++++++++++++++++++++++
5 files changed, 77 insertions(+), 2 deletions(-)
create mode 100644 patches/enchant/02-free-library-name.patch
create mode 100644 patches/glib/01-memcpy-length.patch
create mode 100644 patches/pango/01-rounding.patch
- Log -----------------------------------------------------------------
commit 8fa6105dc56a833eb8a0589f82b9a12dcc9d7cec
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 01:05:58 2021 -0700
update to pango-1.48.8
also add a patch to fix font spacing issues introduced in 1.48.6
diff --git a/packages/packages.current b/packages/packages.current
index 9e9069b..7d71f58 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -41,7 +41,7 @@ libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/rele
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
-pango,1.48.7,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.7.tar.xz,28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc,,
+pango,1.48.8,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.8.tar.xz,009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
diff --git a/patches/pango/01-rounding.patch b/patches/pango/01-rounding.patch
new file mode 100644
index 0000000..bb721eb
--- /dev/null
+++ b/patches/pango/01-rounding.patch
@@ -0,0 +1,41 @@
+From df0217a3f46c77b743fa1ae1ddfc2bb321ba91e8 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei at src.gnome.org>
+Date: Mon, 9 Aug 2021 16:22:22 +0800
+Subject: [PATCH] pango/shape.c: Use the former rounding code as needed
+
+The careful rounding code that was brought back as a result of commit
+d4356779 only had effect if we are using a backend that supported font
+hinting, so on other backends, use the former rounding code that was
+dropped in favor of the careful rounding code that unfortunately did not
+apply for all backends.
+
+Should fix #578.
+---
+ pango/shape.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/pango/shape.c b/pango/shape.c
+index f8ac3691..aed028b7 100644
+--- a/pango/shape.c
++++ b/pango/shape.c
+@@ -341,5 +341,17 @@ pango_shape_with_flags (const gchar *item_text,
+ #undef HINT
+ }
+ }
++ else
++ {
++ for (i = 0; i < glyphs->num_glyphs; i++)
++ {
++ glyphs->glyphs[i].geometry.width =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.width);
++ glyphs->glyphs[i].geometry.x_offset =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.x_offset);
++ glyphs->glyphs[i].geometry.y_offset =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.y_offset);
++ }
++ }
+ }
+ }
+--
+GitLab
+
commit 4ebf562d83fbb8386a80ed2509f6d4d28b1e7f3c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 23:11:08 2021 -0700
add patches for glib and enchant
fix issues found by app verifier:
glib reads past the end of a buffer
enchant leaks memory from DllMain
diff --git a/patches/enchant/02-free-library-name.patch b/patches/enchant/02-free-library-name.patch
new file mode 100644
index 0000000..b55efee
--- /dev/null
+++ b/patches/enchant/02-free-library-name.patch
@@ -0,0 +1,23 @@
+--- a/lib/relocatable.c 2021-08-02 22:03:28.502997457 -0700
++++ b/lib/relocatable.c 2021-08-02 22:09:43.269387994 -0700
+@@ -314,7 +314,7 @@
+ #if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+
+ /* Full pathname of shared library, or NULL. */
+-static char *shared_library_fullname;
++static char *shared_library_fullname = NULL;
+
+ #if defined _WIN32 && !defined __CYGWIN__
+ /* Native Windows only.
+@@ -345,6 +345,11 @@
+
+ shared_library_fullname = strdup (location);
+ }
++ else if (event == DLL_PROCESS_DETACH)
++ {
++ if (shared_library_fullname != NULL)
++ free(shared_library_fullname);
++ }
+
+ return TRUE;
+ }
diff --git a/patches/glib/01-memcpy-length.patch b/patches/glib/01-memcpy-length.patch
new file mode 100644
index 0000000..8fb0255
--- /dev/null
+++ b/patches/glib/01-memcpy-length.patch
@@ -0,0 +1,11 @@
+--- 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 6315b0c164f8329779fadf7cba0bfcbb608e1db0
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 17:29:59 2021 -0700
add missing dependency on cairo for pixman
diff --git a/configure.ac b/configure.ac
index f2c2f40..4f4959f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ CM_SPKG([libffi])
CM_SPKG([glib], [libiconv gettext libffi zlib])
CM_SPKG([expat])
CM_SPKG([pixman], [libpng])
-CM_SPKG([cairo], [zlib libpng glib freetype fontconfig])
+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])
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list