public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
Date: Tue, 06 May 2025 18:17:50 +0000 (UTC)	[thread overview]
Message-ID: <1746555461.91838e7332ff02610f4980eeb86a29306f97755f.asturm@gentoo> (raw)

commit:     91838e7332ff02610f4980eeb86a29306f97755f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 15:05:40 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  6 18:17:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91838e73

app-office/libreoffice: Fix build w/ >=app-text/poppler-25.05

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libreoffice-25.2.3.2-poppler-25.05.patch | 40 ++++++++++++++++++++++
 app-office/libreoffice/libreoffice-25.2.3.2.ebuild |  3 ++
 2 files changed, 43 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch b/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch
new file mode 100644
index 000000000000..91774898ff1d
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch
@@ -0,0 +1,40 @@
+From 0ee2636304ac049f21415c67e92040f7d6c14d35 Mon Sep 17 00:00:00 2001
+From: Xisco Fauli <xiscofauli@libreoffice.org>
+Date: Mon, 5 May 2025 10:03:10 +0200
+Subject: poppler: uggrade to 25.05
+
+Change-Id: Icd2b318cc01bedc5baeb4445a463a136ed6d7c48
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184953
+Tested-by: Jenkins
+Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |  8 ++++++++
+ 3 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index dcc1932f7ad7..604ba3b7db2c 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -1320,11 +1320,19 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *,
+         }
+     }
+ 
++#if POPPLER_CHECK_VERSION(25, 5, 0)
++    std::unique_ptr<MemStream> pRgbStr(new MemStream(pBitmapData, 0,
++        nBitmapWidth * nBitmapHeight * 3, Object::null()));
++    std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char *>(pSplashBitmap->getAlphaPtr()),
++        0, nBitmapWidth * nBitmapHeight, Object::null()));
++    auto aDecode = Object::null();
++#else
+     std::unique_ptr<MemStream> pRgbStr(new MemStream(pBitmapData, 0,
+         nBitmapWidth * nBitmapHeight * 3, Object(objNull)));
+     std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char *>(pSplashBitmap->getAlphaPtr()),
+         0, nBitmapWidth * nBitmapHeight, Object(objNull)));
+     auto aDecode = Object(objNull);
++#endif
+ #if POPPLER_CHECK_VERSION(24, 10, 0)
+     std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode,
+         std::make_unique<GfxDeviceRGBColorSpace>()));
+-- 
+cgit v1.2.3
+

diff --git a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
index 641ec420ad25..460f419d359a 100644
--- a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
@@ -316,6 +316,9 @@ PATCHES=(
 	# add qt6 backend as possible fallback for gtk-based desktop environments:
 	# https://bugs.gentoo.org/950170
 	"${FILESDIR}/${PN}-25.2-vcl-backend-fallback.patch"
+
+	# git master:
+	"${FILESDIR}/${P}-poppler-25.05.patch"
 )
 
 _check_reqs() {


             reply	other threads:[~2025-05-06 18:17 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-06 18:17 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-11-06 23:10 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ Andreas Sturmlechner
2025-09-02 20:19 Andreas Sturmlechner
2025-07-05 17:53 Andreas Sturmlechner
2025-06-13 16:28 Sam James
2025-06-02 16:47 Andreas Sturmlechner
2025-03-04 22:04 Sam James
2025-02-22 23:24 Sam James
2024-12-17 21:44 Andreas Sturmlechner
2024-10-05 13:54 Andreas Sturmlechner
2024-09-21  8:29 Andreas Sturmlechner
2024-05-21 15:14 Andreas Sturmlechner
2024-03-28 18:48 Andreas Sturmlechner
2024-03-12 11:50 Andreas Sturmlechner
2024-03-10 16:30 Andreas Sturmlechner
2024-03-04  4:22 Sam James
2024-01-28 16:28 Andreas Sturmlechner
2023-11-21 22:36 Andreas Sturmlechner
2023-11-20 13:35 Sam James
2023-11-03 23:58 Sam James
2023-02-01 18:22 Andreas Sturmlechner
2023-01-30  4:01 Sam James
2023-01-13 19:08 Sam James
2023-01-10  0:04 Andreas Sturmlechner
2022-12-17 19:53 David Seifert
2022-11-03  8:40 Andreas Sturmlechner
2022-08-31 21:47 Sam James
2022-06-14 15:20 Andreas Sturmlechner
2022-05-09 19:12 Sam James
2022-05-08 13:35 Andreas Sturmlechner
2022-03-12 15:53 Andreas Sturmlechner
2022-02-05 20:46 Andreas Sturmlechner
2021-12-03 11:11 Andreas Sturmlechner
2021-11-05  5:39 Sam James
2021-09-07 18:28 Andreas Sturmlechner
2021-06-10 15:34 Andreas Sturmlechner
2021-01-24 13:02 Andreas Sturmlechner
2020-12-12 21:59 Andreas Sturmlechner
2020-11-21 22:18 Andreas Sturmlechner
2020-11-21 21:00 Andreas K. Hüttel
2020-11-06  2:22 Andreas Sturmlechner
2020-11-05 22:51 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-22 22:04 Andreas Sturmlechner
2020-09-08 18:08 Andreas Sturmlechner
2020-05-31 21:09 Andreas Sturmlechner
2020-04-05 17:05 Andreas Sturmlechner
2020-01-17  2:50 Andreas Sturmlechner
2019-11-01 18:39 Andreas Sturmlechner
2019-10-18 23:59 Andreas Sturmlechner
2019-08-13 15:56 Andreas Sturmlechner
2019-04-21 11:31 Andreas Sturmlechner
2019-04-21 11:31 Andreas Sturmlechner
2019-04-11  9:03 Andreas Sturmlechner
2019-03-30  9:59 Andreas Sturmlechner
2019-02-01 20:14 Andreas Sturmlechner
2019-01-30 22:31 Andreas Sturmlechner
2019-01-23 22:53 Andreas Sturmlechner
2019-01-08  0:17 Andreas Sturmlechner
2018-12-13 11:01 Andreas Sturmlechner
2018-12-13  9:57 Andreas Sturmlechner
2018-10-01 18:13 Andreas Sturmlechner
2018-08-13 21:48 Andreas Sturmlechner
2018-06-10 14:43 Andreas Sturmlechner
2018-05-27 22:59 Andreas Sturmlechner
2018-05-27 19:54 Andreas Sturmlechner
2018-05-27  6:29 Andreas Sturmlechner
2018-04-25 16:15 Andreas Sturmlechner
2017-12-21 13:27 Andreas Sturmlechner
2017-10-08 11:22 Andreas Sturmlechner
2017-02-26 18:37 Andreas Sturmlechner
2016-11-06 18:42 Andreas Hüttel
2016-07-03 20:10 Andreas Hüttel
2016-02-25 16:50 Andreas Hüttel
2016-02-22 17:07 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1746555461.91838e7332ff02610f4980eeb86a29306f97755f.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox