ipe: rebuild against libpoppler 22.06.0

This commit is contained in:
oreo639 2022-03-25 18:34:43 -07:00 committed by Michal Vasilek
parent 545b41e93d
commit 362fe334a6
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,33 @@
diff -Naur pdftoipe.cpp.orig pdftoipe.cpp
--- a/ipe-tools/pdftoipe/pdftoipe.cpp.orig
+++ b/ipe-tools/pdftoipe/pdftoipe.cpp
@@ -84,22 +84,20 @@
if (quiet)
globalParams->setErrQuiet(quiet);
- GooString *ownerPW, *userPW;
+ std::optional<GooString> ownerPW, userPW;
if (ownerPassword[0]) {
- ownerPW = new GooString(ownerPassword);
+ ownerPW = GooString(ownerPassword);
} else {
- ownerPW = 0;
+ ownerPW = std::nullopt;
}
if (userPassword[0]) {
- userPW = new GooString(userPassword);
+ userPW = GooString(userPassword);
} else {
- userPW = 0;
+ userPW = std::nullopt;
}
// open PDF file
- PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW);
- delete userPW;
- delete ownerPW;
+ PDFDoc *doc = new PDFDoc(std::make_unique<GooString>(fileName), ownerPW, userPW);
if (!doc->isOk())
return 1;

View File

@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
revision=6
revision=7
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel