Ticket #22231: libreoffice-25.8.2.2-poppler_25.10-2.patch

File libreoffice-25.8.2.2-poppler_25.10-2.patch, 1.3 KB (added by martyj19, 12 months ago)

Poppler 25.10 correction via Arch

  • sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 

    diff -ru libreoffice-25.8.2.2.orig/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx libreoffice-25.8.2.2/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
    old new  
    216216                                                  : nullptr));
    217217#if POPPLER_CHECK_VERSION(22, 6, 0)
    218218                    pDocUnique = std::unique_ptr<PDFDoc>(
     219#if POPPLER_CHECK_VERSION(25, 10, 0)
     220                        new PDFDoc(pFileName->copy(),
     221                                   pOwnerPasswordStr ? std::optional<GooString>(pOwnerPasswordStr->toStr()) : std::nullopt,
     222                                   pUserPasswordStr ? std::optional<GooString>(pUserPasswordStr->toStr()) : std::nullopt));
     223#else
    219224                        new PDFDoc(std::make_unique<GooString>(pFileName),
    220225                                   std::optional<GooString>(pOwnerPasswordStr),
    221226                                   std::optional<GooString>(pUserPasswordStr)));
     227#endif
    222228#else
    223229                    pDocUnique = std::unique_ptr<PDFDoc>(
    224230                        new PDFDoc(pFileName, pOwnerPasswordStr, pUserPasswordStr));