[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1026098: marked as done (libreoffice: Patch for building with Poppler 22.09)

Your message dated Wed, 14 Dec 2022 19:38:24 +0100
with message-id <8269a7db-317d-92cb-325a-0fc94e679a7b@debian.org>
and subject line Re: Bug#1026098: libreoffice: Patch for building with Poppler 22.09
has caused the Debian Bug report #1026098,
regarding libreoffice: Patch for building with Poppler 22.09
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1026098: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026098
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: libreoffice
Version: Patch for building with Poppler 22.09
Severity: normal
Tags: patch
X-Debbugs-Cc: nathan.teodosio@canonical.com

Dear maintainers,

With the goal of getting the Poppler 22.12 transition done next month,
could you please pick "Fix build with Poppler 22.09.0" from upstream[1]?

I am also attaching it.

[1]: https://cgit.freedesktop.org/libreoffice/core/commit/?id=b7d63694985bbb1cf86eb71769feadb28ce68c17

>From b7d63694985bbb1cf86eb71769feadb28ce68c17 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 2 Sep 2022 04:31:18 +0100
Subject: Fix build with Poppler 22.09.0

With Poppler 22.09.0, LO fails to build with:
```
/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments
    state->getLineDash(&dashArray, &arrayLen, &startOffset);
    ~~~~~~~~~~~~~~~~~~             ^~~~~~~~~~~~~~~~~~~~~~~
/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here
    const std::vector<double> &getLineDash(double *start)
                               ^
1 error generated.
```

Poppler changed the getLineDash interface:
```
-    void getLineDash(double **dash, int *length, double *start)
+    const std::vector<double> &getLineDash(double *start)
```

Signed-off-by: Sam James <sam@gentoo.org>
Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
---
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index f12478cb2f4d..3ad139b65fa3 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -678,8 +678,15 @@ void PDFOutDev::updateLineDash(GfxState *state)
         return;
     assert(state);
 
-    double* dashArray; int arrayLen; double startOffset;
+    int arrayLen; double startOffset;
+#if POPPLER_CHECK_VERSION(22, 9, 0)
+    const std::vector<double> &dash = state->getLineDash(&startOffset);
+    const double* dashArray = dash.data();
+    arrayLen = dash.size();
+#else
+    double* dashArray;
     state->getLineDash(&dashArray, &arrayLen, &startOffset);
+#endif
 
     printf( "updateLineDash" );
     if( arrayLen && dashArray )
-- 
cgit v1.2.1

--- End Message ---
--- Begin Message --- 
Version: 1:7.4.2~rc1-1


Hi,

Am 14.12.22 um 19:22 schrieb Nathan Pratta Teodosio:

With the goal of getting the Poppler 22.12 transition done next month,
could you please pick "Fix build with Poppler 22.09.0" from upstream[1]?


??

This is already upstream.


Since 7.4.2 (rc1).


And sid has 7.4.3.


Nothing to do here :-)


Regards,


Rene

--- End Message ---
Reply to: