Date: Thu, 2 Apr 2020 18:11:43 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r530394 - branches/2020Q2/print/libraqm/files Message-ID: <202004021811.032IBhI0072048@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Thu Apr 2 18:11:43 2020 New Revision: 530394 URL: https://svnweb.freebsd.org/changeset/ports/530394 Log: MFH: r530379 print/libraqm: FIx build with llvm 10 Fix the build of print/libraqm with llvm 10. PR: 244401 Submitted by: dim Approved by: maintainer timeout Approved by: ports-secteam (joenum) Modified: branches/2020Q2/print/libraqm/files/patch-src_raqm.c Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/print/libraqm/files/patch-src_raqm.c ============================================================================== --- branches/2020Q2/print/libraqm/files/patch-src_raqm.c Thu Apr 2 18:06:00 2020 (r530393) +++ branches/2020Q2/print/libraqm/files/patch-src_raqm.c Thu Apr 2 18:11:43 2020 (r530394) @@ -1,4 +1,4 @@ ---- src/raqm.c.orig 2019-05-17 11:29:46 UTC +--- src/raqm.c.orig 2019-05-05 20:05:08 UTC +++ src/raqm.c @@ -1599,14 +1599,14 @@ _raqm_shape (raqm_t *rq) /* Convert index from UTF-32 to UTF-8 */ @@ -175,3 +175,20 @@ return true; } +@@ -1931,11 +1931,11 @@ _raqm_get_grapheme_break (hb_codepoint_t ch, + case HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK: + case HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK: + case HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK: +- if (ch != 0x102B || ch != 0x102C || ch != 0x1038 || +- (ch <= 0x1062 && ch >= 0x1064) || (ch <= 0x1067 && ch >= 0x106D) || +- ch != 0x1083 || (ch <= 0x1087 && ch >= 0x108C) || ch != 0x108F || +- (ch <= 0x109A && ch >= 0x109C) || ch != 0x1A61 || ch != 0x1A63 || +- ch != 0x1A64 || ch != 0xAA7B || ch != 0xAA70 || ch != 0x11720 || ++ if (ch != 0x102B && ch != 0x102C && ch != 0x1038 && ++ (ch < 0x1062 || ch > 0x1064) && (ch < 0x1067 || ch > 0x106D) && ++ ch != 0x1083 && (ch < 0x1087 || ch > 0x108C) && ch != 0x108F && ++ (ch < 0x109A || ch > 0x109C) && ch != 0x1A61 && ch != 0x1A63 && ++ ch != 0x1A64 && ch != 0xAA7B && ch != 0xAA70 && ch != 0x11720 && + ch != 0x11721) /**/ + gb_type = RAQM_GRAPHEM_SPACING_MARK; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004021811.032IBhI0072048>