From nobody Sat May 2 12:33:09 2026 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 4g76ks2HZvz6blsf for ; Sat, 02 May 2026 12:33:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g76ks1L8Tz3hxx for ; Sat, 02 May 2026 12:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777725189; 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=6fQ7lTXd21v82/bNXp3jHVoutEx7Z9PPIVXDyx8yvkA=; b=apg0Vl4cL+fUzhrORIKYZ/jsr+Lir2u/DYSOLG3Nj4hBLJSVKLtiMn2Q976mV5ktPY5m4P DJWljFu85kJmxlUPCZeJzhVJGgIFeKHC/VcqLoQ3W9TnfUY3yeIEmvRl04eNNcvNCCTe/Q 9QKdlUA8i8UEb1WUx39hxzTQeMEAl/maNrTF+7acVLqQfumHsGqDhZSNwiK6FA/zTgwzZH kjqNPNjdWvaNipScCBwVpMKKKhOY5qtRDdAaFf+CZu0MR6+apLm3YuaPk4iYsWDNiRDC9U QcOIg+vRagnOEgi8xSd+4ifRlZW328/iXshbw30cs2iTe8N8+9oGbyMGIaZxWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777725189; a=rsa-sha256; cv=none; b=QG6ttkWWHIB+WPfI37EEBILozuJENl3ghBeBLRSzFCYZUBrzUha4rvv5PBgI/8Hp289olt gk43Qt50nDAlUANNygshhxxc19wJAQnSXq1g6Rl8oAGMFu57eJI4exTHkb+gOXeIE7riT1 yd6hn9owrFWz+Az6q+5XiT2M+7tWm6kOf3qpsPwCQd1wtb07aLFmUfAy+Msn20tES+HGkb 8pPEiPPBLtxK36eQPOUk2r50DnTDCd0vZs5stpSNW8EtA8nWz47/zYCbn2LqVyqLef+vsd NCDHDRh2W2khAtJ9VnIvQJXvfuBgLZxS0lTR8pVNWVrd1EyYUyx9CAPaJFcR7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777725189; 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=6fQ7lTXd21v82/bNXp3jHVoutEx7Z9PPIVXDyx8yvkA=; b=c60d+rlQXhF6fFOWZ0ahs6PIIABlXSVKuY48FdVTqnPkVJ+Pk9C+0nSgCNfi+6hYFhqHyu om3iIjWZIFWy6cgfVD9qhrnoiM9iA+3ePP5U8UvgSzRcyYns4lY3gHUqB+CNhDVHEjVdQ+ GFs4oDrydzGXyDdPSK8ILRbL58jU/tKVyDj7mEaRbVQl0KZq3R2jNA1VSXNrVLUldVVjha xWX1ZI9dYr+0IBnmNJVcU97KMoaY4N7leLcgllKhPX0SOAHSUA8j6uqZcw3/encyL8DZcG lMbf5TeOJBGKkgkIUGJe+CRZR0aYTQtdImBnEuffeIVWjNV/ujhqopFhAQrN+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g76ks0cjZzmR1 for ; Sat, 02 May 2026 12:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37a68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 02 May 2026 12:33:09 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: b9ae6cf162f4 - main - editors/calligra: Fix build against newest Poppler 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9ae6cf162f48457dab7e272f8c5686726a9635a Auto-Submitted: auto-generated Date: Sat, 02 May 2026 12:33:09 +0000 Message-Id: <69f5ef05.37a68.2f0db8dd@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9ae6cf162f48457dab7e272f8c5686726a9635a commit b9ae6cf162f48457dab7e272f8c5686726a9635a Author: Gleb Popov AuthorDate: 2026-04-17 10:38:16 +0000 Commit: Gleb Popov CommitDate: 2026-05-02 12:32:32 +0000 editors/calligra: Fix build against newest Poppler Differential Revision: https://reviews.freebsd.org/D56472 --- .../patch-filters_karbon_pdf_SvgOutputDev.cpp | 44 ++++++++++++++++++++++ .../files/patch-filters_karbon_pdf_SvgOutputDev.h | 14 +++++++ 2 files changed, 58 insertions(+) diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp new file mode 100644 index 000000000000..973e62742bc2 --- /dev/null +++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp @@ -0,0 +1,44 @@ +--- filters/karbon/pdf/SvgOutputDev.cpp.orig 2026-04-09 04:19:06 UTC ++++ filters/karbon/pdf/SvgOutputDev.cpp +@@ -386,7 +386,11 @@ QString SvgOutputDev::printStroke() + return stroke; + } + ++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(26, 4, 0) + void SvgOutputDev::drawString(GfxState *state, const GooString *s) ++#else ++void SvgOutputDev::drawString(GfxState *state, const std::string &s) ++#endif + { + int render = state->getRender(); + // check for invisible text -- this is used by Acrobat Capture +@@ -397,8 +401,10 @@ void SvgOutputDev::drawString(GfxState *state, const G + // ignore empty strings + #if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(25, 10, 0) + if (s->getLength() == 0) { +-#else ++#elif POPPLER_VERSION_MACRO < QT_VERSION_CHECK(26, 4, 0) + if (s->size() == 0) { ++#else ++ if (s.empty()) { + #endif + return; + } +@@ -407,11 +413,15 @@ void SvgOutputDev::drawString(GfxState *state, const G + + QString str; + +- const char *p = s->c_str(); + #if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(25, 10, 0) ++ const char *p = s->c_str(); + int len = s->getLength(); +-#else ++#elif POPPLER_VERSION_MACRO < QT_VERSION_CHECK(26, 4, 0) ++ const char *p = s->c_str(); + int len = s->size(); ++#else ++ const char *p = s.c_str(); ++ int len = s.size(); + #endif + CharCode code; + const Unicode *u = nullptr; diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h new file mode 100644 index 000000000000..49b3fdbfae3f --- /dev/null +++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h @@ -0,0 +1,14 @@ +--- filters/karbon/pdf/SvgOutputDev.h.orig 2026-04-09 04:19:06 UTC ++++ filters/karbon/pdf/SvgOutputDev.h +@@ -44,7 +44,11 @@ class SvgOutputDev : public OutputDev (public) + void eoFill(GfxState *state) override; + + // text ++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(26, 4, 0) + void drawString(GfxState *state, const GooString *s) override; ++#else ++ void drawString(GfxState *state, const std::string &s) override; ++#endif + + // images + void drawImage(GfxState *state,