Your message dated Sun, 21 Aug 2022 22:36:58 +0000
with message-id <[email protected]>
and subject line Bug#1012845: fixed in ipe-tools 1:7.2.24.1-1.1
has caused the Debian Bug report #1012845,
regarding pdftoipe: Patch for compatibility with Poppler >22.03
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 [email protected]
immediately.)
--
1012845: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1012845
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: pdftoipe
Severity: normal
Tags: patch
X-Debbugs-Cc: [email protected]
Dear Maintainer,
Since Poppler 22.06 is made its way into experimental, Pdftoipe will need
compatibility changes to build. I got the merge request from
https://github.com/otfried/ipe-
tools/pull/48/commits/14335180432152ad094300d0afd00d8e390469b2 and adapted it
so that it doesn't break builds with previous Poppler versions.
The result is in the attached patch. With Sbuilder I made sure it builds
against both current and new Poppler.
-- System Information:
Debian Release: bookworm/sid
APT prefers kinetic
APT policy: (500, 'kinetic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.15.0-33-generic (SMP w/8 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages pdftoipe depends on:
ii libc6 2.35-0ubuntu3
ii libgcc-s1 12.1.0-2ubuntu1
pn libpoppler118 <none>
ii libstdc++6 12.1.0-2ubuntu1
Versions of packages pdftoipe recommends:
pn ipe <none>
pdftoipe suggests no packages.
*** /home/nteodosio/canonical/debian-updates/poppler/ipetools.diff
diff -Nru ipe-tools-7.2.24.1/debian/changelog
ipe-tools-7.2.24.1/debian/changelog
--- ipe-tools-7.2.24.1/debian/changelog 2022-02-19 15:56:57.000000000 -0300
+++ ipe-tools-7.2.24.1/debian/changelog 2022-06-15 09:06:32.000000000 -0300
@@ -1,3 +1,11 @@
+ipe-tools (1:7.2.24.1-2) UNRELEASED; urgency=medium
+
+ [ Nathan Pratta Teodosio ]
+ * build-with-poppler-22.03.patch: Fix build for poppler 22.03.
+ * d/control: Build depends on libpoppler-cpp-dev.
+
+ -- Nathan Pratta Teodosio <[email protected]> Wed, 15 Jun 2022
09:06:32 -0300
+
ipe-tools (1:7.2.24.1-1) unstable; urgency=medium
[ Steve Robbins ]
diff -Nru ipe-tools-7.2.24.1/debian/control ipe-tools-7.2.24.1/debian/control
--- ipe-tools-7.2.24.1/debian/control 2022-02-19 15:56:57.000000000 -0300
+++ ipe-tools-7.2.24.1/debian/control 2022-06-15 09:05:56.000000000 -0300
@@ -8,7 +8,8 @@
dh-python,
python3:any | python3-all:any | python3-dev:any |
python3-all-dev:any | dh-sequence-python3,
pkg-config,
- libpoppler-private-dev
+ libpoppler-private-dev,
+ libpoppler-cpp-dev
Standards-Version: 4.1.3
Vcs-Browser: https://salsa.debian.org/science-team/ipe-tools
Vcs-Git: https://salsa.debian.org/science-team/ipe-tools.git
diff -Nru ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
--- ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
1969-12-31 21:00:00.000000000 -0300
+++ ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
2022-06-15 09:06:32.000000000 -0300
@@ -0,0 +1,42 @@
+Author: Nathan Pratta Teodosio <[email protected]>, oreo639
+Description: Fix build for poppler >22.03
+
+--- a/pdftoipe/pdftoipe.cpp 2022-06-15 08:45:57.248773786 -0300
++++ b/pdftoipe/pdftoipe.cpp 2022-06-15 08:45:23.915883939 -0300
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++#include <poppler/cpp/poppler-version.h>
+
+ #include "goo/GooString.h"
+ #include "goo/gmem.h"
+@@ -84,6 +85,20 @@
+ if (quiet)
+ globalParams->setErrQuiet(quiet);
+
++#if POPPLER_VERSION_MAJOR > 22 || (POPPLER_VERSION_MAJOR == 22 &&
POPPLER_VERSION_MINOR >= 3)
++ std::optional<GooString> ownerPW, userPW;
++ if (ownerPassword[0]) {
++ ownerPW = GooString(ownerPassword);
++ } else {
++ ownerPW = std::nullopt;
++ }
++ if (userPassword[0]) {
++ userPW = GooString(userPassword);
++ } else {
++ userPW = std::nullopt;
++ }
++ PDFDoc *doc = new PDFDoc(std::make_unique<GooString>(fileName), ownerPW,
userPW);
++#else
+ GooString *ownerPW, *userPW;
+ if (ownerPassword[0]) {
+ ownerPW = new GooString(ownerPassword);
+@@ -100,6 +115,7 @@
+ PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW);
+ delete userPW;
+ delete ownerPW;
++#endif
+
+ if (!doc->isOk())
+ return 1;
diff -Nru ipe-tools-7.2.24.1/debian/patches/series
ipe-tools-7.2.24.1/debian/patches/series
--- ipe-tools-7.2.24.1/debian/patches/series 2022-02-19 15:56:57.000000000
-0300
+++ ipe-tools-7.2.24.1/debian/patches/series 2022-06-15 09:06:32.000000000
-0300
@@ -1 +1,2 @@
+build-with-poppler-22.03.patch
cross.patch
diff -Nru ipe-tools-7.2.24.1/debian/changelog
ipe-tools-7.2.24.1/debian/changelog
--- ipe-tools-7.2.24.1/debian/changelog 2022-02-19 15:56:57.000000000 -0300
+++ ipe-tools-7.2.24.1/debian/changelog 2022-06-15 09:06:32.000000000 -0300
@@ -1,3 +1,11 @@
+ipe-tools (1:7.2.24.1-2) UNRELEASED; urgency=medium
+
+ [ Nathan Pratta Teodosio ]
+ * build-with-poppler-22.03.patch: Fix build for poppler 22.03.
+ * d/control: Build depends on libpoppler-cpp-dev.
+
+ -- Nathan Pratta Teodosio <[email protected]> Wed, 15 Jun 2022
09:06:32 -0300
+
ipe-tools (1:7.2.24.1-1) unstable; urgency=medium
[ Steve Robbins ]
diff -Nru ipe-tools-7.2.24.1/debian/control ipe-tools-7.2.24.1/debian/control
--- ipe-tools-7.2.24.1/debian/control 2022-02-19 15:56:57.000000000 -0300
+++ ipe-tools-7.2.24.1/debian/control 2022-06-15 09:05:56.000000000 -0300
@@ -8,7 +8,8 @@
dh-python,
python3:any | python3-all:any | python3-dev:any |
python3-all-dev:any | dh-sequence-python3,
pkg-config,
- libpoppler-private-dev
+ libpoppler-private-dev,
+ libpoppler-cpp-dev
Standards-Version: 4.1.3
Vcs-Browser: https://salsa.debian.org/science-team/ipe-tools
Vcs-Git: https://salsa.debian.org/science-team/ipe-tools.git
diff -Nru ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
--- ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
1969-12-31 21:00:00.000000000 -0300
+++ ipe-tools-7.2.24.1/debian/patches/build-with-poppler-22.03.patch
2022-06-15 09:06:32.000000000 -0300
@@ -0,0 +1,42 @@
+Author: Nathan Pratta Teodosio <[email protected]>, oreo639
+Description: Fix build for poppler >22.03
+
+--- a/pdftoipe/pdftoipe.cpp 2022-06-15 08:45:57.248773786 -0300
++++ b/pdftoipe/pdftoipe.cpp 2022-06-15 08:45:23.915883939 -0300
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++#include <poppler/cpp/poppler-version.h>
+
+ #include "goo/GooString.h"
+ #include "goo/gmem.h"
+@@ -84,6 +85,20 @@
+ if (quiet)
+ globalParams->setErrQuiet(quiet);
+
++#if POPPLER_VERSION_MAJOR > 22 || (POPPLER_VERSION_MAJOR == 22 &&
POPPLER_VERSION_MINOR >= 3)
++ std::optional<GooString> ownerPW, userPW;
++ if (ownerPassword[0]) {
++ ownerPW = GooString(ownerPassword);
++ } else {
++ ownerPW = std::nullopt;
++ }
++ if (userPassword[0]) {
++ userPW = GooString(userPassword);
++ } else {
++ userPW = std::nullopt;
++ }
++ PDFDoc *doc = new PDFDoc(std::make_unique<GooString>(fileName), ownerPW,
userPW);
++#else
+ GooString *ownerPW, *userPW;
+ if (ownerPassword[0]) {
+ ownerPW = new GooString(ownerPassword);
+@@ -100,6 +115,7 @@
+ PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW);
+ delete userPW;
+ delete ownerPW;
++#endif
+
+ if (!doc->isOk())
+ return 1;
diff -Nru ipe-tools-7.2.24.1/debian/patches/series
ipe-tools-7.2.24.1/debian/patches/series
--- ipe-tools-7.2.24.1/debian/patches/series 2022-02-19 15:56:57.000000000
-0300
+++ ipe-tools-7.2.24.1/debian/patches/series 2022-06-15 09:06:32.000000000
-0300
@@ -1 +1,2 @@
+build-with-poppler-22.03.patch
cross.patch
--- End Message ---
--- Begin Message ---
Source: ipe-tools
Source-Version: 1:7.2.24.1-1.1
Done: Jeremy Bicha <[email protected]>
We believe that the bug you reported is fixed in the latest version of
ipe-tools, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jeremy Bicha <[email protected]> (supplier of updated ipe-tools package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 21 Aug 2022 18:11:26 -0400
Source: ipe-tools
Built-For-Profiles: noudeb
Architecture: source
Version: 1:7.2.24.1-1.1
Distribution: unstable
Urgency: medium
Maintainer: Debian Science Team
<[email protected]>
Changed-By: Jeremy Bicha <[email protected]>
Closes: 1012845
Changes:
ipe-tools (1:7.2.24.1-1.1) unstable; urgency=medium
.
* Non-maintainer upload
.
[ Nathan Pratta Teodosio ]
* Add patch to fix build with poppler 22.03 (Closes: #1012845)
Checksums-Sha1:
0462aa506a860401f5713da2326270ef465eb28d 2286 ipe-tools_7.2.24.1-1.1.dsc
cb189c86a060042729d410c5a0a37531299242d5 5360
ipe-tools_7.2.24.1-1.1.debian.tar.xz
3e6b9d2b31771e5b516234249283e4367c55b6b4 8294
ipe-tools_7.2.24.1-1.1_source.buildinfo
Checksums-Sha256:
6087cfa3313d03b2d06960df7f7a63279ca0a435e4e32c92a3feebeca818ed1a 2286
ipe-tools_7.2.24.1-1.1.dsc
82e9dc8c8e0fe154fb460e141d66d10439d284fdf6c59aef87d032f5537eff9e 5360
ipe-tools_7.2.24.1-1.1.debian.tar.xz
5c87d391c35076a4287122a90ad5289c2d7a820c04cc32e890037758431a84ad 8294
ipe-tools_7.2.24.1-1.1_source.buildinfo
Files:
7c9ae2ae08fa2d72aae55663010aa05c 2286 graphics optional
ipe-tools_7.2.24.1-1.1.dsc
30ac3b4209f11cbe2f7cc245ce340acd 5360 graphics optional
ipe-tools_7.2.24.1-1.1.debian.tar.xz
248ac409b19982a68c94c4d335714209 8294 graphics optional
ipe-tools_7.2.24.1-1.1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEETQvhLw5HdtiqzpaW5mx3Wuv+bH0FAmMCrmsACgkQ5mx3Wuv+
bH0x0w//bckr6jg7emCGqBdPVKEl6XRSWK/jjUsagm01JgObtzySzYxNTOB1b5lI
pDXED57nBeuH2Nho+hXC0RyZDitK+QRHMSAVNaoCmvh7Wf+oVyNFV73eDSJuZIye
a4wYtpfBKehhDVO1itGu6yw91te/BjsXy2gHOxQvO1DAewmNVrryJ/FAk7eN/jUb
OLfAhmkfCc8xiGQ1nuFJjFwxrsg+HJeNAeGhyoSd718fMFpgkVuLbqh/3KaMYwf5
uDITYgICzqKMy3896PTeBeiEzOGdxNgJVN4YGPuZQsRotK2kjqzFwrpwWUWaVGkD
zzVnbmFfgFXVHM3pqNxLW+N36Eh0+4O303aX85rJUYkc0tdcIRPRZ+WZpCWP0IA3
5f1EAbyqrlL2jBZNmyA/X3ODSFSii1cRnxD9hCtgBV07fsw1Sh2RSn65KjgL+3mK
wjBas8Ye8/e1A/QbTXO6DkXsZ0Ys540kvDjqied0lp+6LySmXVyMIdVpksJS3wT9
kaGhOXrscbyCBGHKyekD18wYX2sHC83LuoT3BksHUW//W6/tWl23VlXJJb5mkjCw
5P4776KyG0StSyVFx/iwHIzoxcjbD5D3iy3bLzGnGNFzqWiHu1gWlzNlmpx8ehO6
sgFLEjWcmRAspeIu1pDz2l5zgxXgR9k+M5CiaMbqIpB+TVjE4EA=
=BY6g
-----END PGP SIGNATURE-----
--- End Message ---
