From nobody Mon Oct 20 11:51:14 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqv031D0mz6BVBG; Mon, 20 Oct 2025 11:51:15 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqv030jLYz3xmH; Mon, 20 Oct 2025 11:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760961075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ATMZdw/uU6/IoUVChUwm01pxZq5ygmfJ+FZhWx1dWXA=; b=UVMs0CWfQCcrOFlyN39MeBYE/v3bJ9s89bVZViF0b79YV1si+Bausj3brdm3Ial1aDCnW5 6FeJpKH1duR43T0LxLbTxmWTSppbpSL5lFNEpOB1an34a/b+IdRiDmqPOxiwZTOlN0pt+h JxZn4KfbVohP2LWp1YHLSINoL7zmoI7tV4lAqAK2JEy2X2l2YEdKtTE3rWeLnDFvlQ1OEB bfgTN/pHJL0ARuur/rzf+NFmMw6dr0lmVBpIgJxY/cTln9hgPyM5wdOWEQOrXOnI5jekl9 V71ZOn1r7p3+IL+1uaW50/UI4zextEU2cT8zv6uuS7JFwm+Fyr9KHs5DWNizPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760961075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ATMZdw/uU6/IoUVChUwm01pxZq5ygmfJ+FZhWx1dWXA=; b=BNwGapq3LLcIasJRhd9+HPy02Mvo5kFDJ/NKtFQX6qfK+ErPzXZifshMkOJY/sFQR0KjKI AFQu+u/IhmQQ5uYUZFjLs6QOnuKrojE+C3u2pmLPooRbCypg667I8lewBz29vViM+oLBGi bUTxw3K2qXDQTd6wL4Ty4mfjuSVTKho4A3raJHJ/EneF9dVWYCagAPHpdecRFEZYi1LHsZ E+IdgFmWliHCIThTujLwPfTtvHo4o4Y0bsUrh9bcisHG/fEZfpc9a83q3PI5dtJ/VeFqTI jwe94uwMki7rJ7YT8scfoLyD/sqSnFuKyB6rI1syxu8KH5ivqfR2HsjvBAeUHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760961075; a=rsa-sha256; cv=none; b=rXHeE8AsG8ebWDM1rgxJhpU5uXbrTASQaLQsfrvIQ9GayCY80TjtZLQuNbfLyJ8eeSHfPu 7gdgGZKZ/EIM6PBxXABI4J+m9Fb11ckP3CLZeO0HOrrB/vN90xqgYTFnvNlkmoubGRyUE9 NK3EMiG80WMtPtER8NCSoYaDQqZ5urf8Gq1W/0oaCwXR1SJNdhKHb3qKcLRBNN5sVmD4yg kRxu0kGBR6prZvbjSDMDeCpaxSGa5TBvxrzNKMirEDO+iH//Mcn5z0jr31JtYZSVwnNDS9 TM+067zYhN8uXZeGRnAiOMcRdSebtMm4mjAL/8k2hw6MT+b8NVB/nvBiFDPgCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqv030JHBz19nQ; Mon, 20 Oct 2025 11:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KBpEp0043778; Mon, 20 Oct 2025 11:51:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KBpEv0043775; Mon, 20 Oct 2025 11:51:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 11:51:14 GMT Message-Id: <202510201151.59KBpEv0043775@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c2417c70a783 - main - editors/libreoffice: use non-expired Gentium font List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2417c70a783105d5dca21cd6369d8e4401ba623 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2417c70a783105d5dca21cd6369d8e4401ba623 commit c2417c70a783105d5dca21cd6369d8e4401ba623 Author: Dima Panov AuthorDate: 2025-10-20 11:50:42 +0000 Commit: Dima Panov CommitDate: 2025-10-20 11:50:42 +0000 editors/libreoffice: use non-expired Gentium font PR: 289341 --- editors/libreoffice/Makefile | 4 ++-- .../files/patch-vcl_qa_cppunit_pdfexport_pdfexport.cxx | 11 +++++++++++ editors/libreoffice/files/pathc-vcl_workben_vcldemo.cxx | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index bbbcee8b2708..093d11fc5ff7 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 2 +PORTREVISION= 3 .include "${.CURDIR}/Makefile.common" @@ -102,7 +102,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ ${LOCALBASE}/share/fonts/twemoji-color-font-ttf/TwitterColorEmoji-SVGinOT.ttf:x11-fonts/twemoji-color-font-ttf \ - ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ + ${LOCALBASE}/share/fonts/Gentium/Gentium-Bold.ttf:x11-fonts/gentium \ ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \ ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g diff --git a/editors/libreoffice/files/patch-vcl_qa_cppunit_pdfexport_pdfexport.cxx b/editors/libreoffice/files/patch-vcl_qa_cppunit_pdfexport_pdfexport.cxx new file mode 100644 index 000000000000..a001b210c9c4 --- /dev/null +++ b/editors/libreoffice/files/patch-vcl_qa_cppunit_pdfexport_pdfexport.cxx @@ -0,0 +1,11 @@ +--- vcl/qa/cppunit/pdfexport/pdfexport.cxx.orig 2025-10-01 11:38:12 UTC ++++ vcl/qa/cppunit/pdfexport/pdfexport.cxx +@@ -1821,7 +1821,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf66597_3) + auto pName + = dynamic_cast(pObject->Lookup("BaseFont"_ostr)); + auto aName = pName->GetValue().copy(7); // skip the subset id +- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected font name", "GentiumBasic"_ostr, aName); ++ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected font name", "Gentium"_ostr, aName); + + auto pToUnicodeRef = dynamic_cast( + pObject->Lookup("ToUnicode"_ostr)); diff --git a/editors/libreoffice/files/pathc-vcl_workben_vcldemo.cxx b/editors/libreoffice/files/pathc-vcl_workben_vcldemo.cxx new file mode 100644 index 000000000000..4a20c9046b5c --- /dev/null +++ b/editors/libreoffice/files/pathc-vcl_workben_vcldemo.cxx @@ -0,0 +1,11 @@ +--- vcl/workben/vcldemo.cxx.orig 2025-10-01 11:38:12 UTC ++++ vcl/workben/vcldemo.cxx +@@ -507,7 +507,7 @@ class DemoRenderer (public) + + // tdf#95222 - justification issue + // - FIXME: replicate justification +- SET("gentium basic", pJustification), ++ SET("gentium", pJustification), + + // tdf#97319 - Unicode beyond BMP; SMP & Plane 2 + SET("symbola", pEmojis),