[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-28-gc1edd64

[jonathan at claws-mail.org]

The branch, master has been updated
       via  c1edd64dab3986c3f6a85afe6b5f0b31ed7c0eef (commit)
      from  2f63b71a70242861e25a5f160890d12fa8a3c6b9 (commit)

Summary of changes:
 packages/packages.current         |  2 +-
 patches/pango/02-num-glyphs.patch | 30 ------------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 patches/pango/02-num-glyphs.patch


- Log -----------------------------------------------------------------
commit c1edd64dab3986c3f6a85afe6b5f0b31ed7c0eef
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Wed Nov 10 11:08:13 2021 -0700

    update to pango-1.48.10

diff --git a/packages/packages.current b/packages/packages.current
index aadb5d8..930c34e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -41,7 +41,7 @@ libwebp,1.2.1,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.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar.xz,a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa,,
+pango,1.48.10,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.10.tar.xz,21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98,,
 pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
 poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b,,
 poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
diff --git a/patches/pango/02-num-glyphs.patch b/patches/pango/02-num-glyphs.patch
deleted file mode 100644
index b911201..0000000
--- a/patches/pango/02-num-glyphs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 71e39443b5e97fd5e8952c42369c9f59b3f393e3 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Sat, 21 Aug 2021 19:08:32 -0400
-Subject: [PATCH] renderer: Don't divide by zero
-
-Before dividing by num_glyphs in draw_strikethrough,
-make sure it isn't 0. This should fix reported crashes
-in this function.
-
-Fixes: #599
----
- pango/pango-renderer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
-index f575707f..21d09573 100644
---- a/pango/pango-renderer.c
-+++ b/pango/pango-renderer.c
-@@ -284,7 +284,7 @@ draw_strikethrough (PangoRenderer *renderer,
-   PangoRectangle *rect = &state->strikethrough_rect;
-   int num_glyphs = state->strikethrough_glyphs;
- 
--  if (state->strikethrough)
-+  if (state->strikethrough && num_glyphs > 0)
-     pango_renderer_draw_rectangle (renderer,
-                                    PANGO_RENDER_PART_STRIKETHROUGH,
-                                    rect->x,
--- 
-GitLab
-

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


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