From owner-svn-ports-all@freebsd.org Thu Apr 2 18:12:57 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C8762AEF87; Thu, 2 Apr 2020 18:12:57 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48tWQ02Gb1z4ZtX; Thu, 2 Apr 2020 18:12:56 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7D541DA1D; Thu, 2 Apr 2020 18:11:43 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 032IBhwu072052; Thu, 2 Apr 2020 18:11:43 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 032IBhI0072048; Thu, 2 Apr 2020 18:11:43 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202004021811.032IBhI0072048@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 2 Apr 2020 18:11:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r530394 - branches/2020Q2/print/libraqm/files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2020Q2/print/libraqm/files X-SVN-Commit-Revision: 530394 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 18:12:57 -0000 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; +