diff options
| -rw-r--r-- | debian/.git-dpm | 14 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0001-Poppler-0.69-gMemReport-removed-from-API-in-f89446f6.patch | 54 | ||||
| -rw-r--r-- | debian/patches/0002-Poppler-0.69-Object-memCheck-removed-from-API-in-c36.patch | 54 | ||||
| -rw-r--r-- | debian/patches/auto-gitignore | 2 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | filter/pdftoijs.cxx | 4 | ||||
| -rw-r--r-- | filter/pdftoopvp/pdftoopvp.cxx | 4 | ||||
| -rw-r--r-- | filter/pdftoraster.cxx | 4 |
9 files changed, 125 insertions, 21 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 6f40650ee..2e889f141 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -1f12e5098f7010cb275ae3b507eef8c7a19f884b -1f12e5098f7010cb275ae3b507eef8c7a19f884b -1f12e5098f7010cb275ae3b507eef8c7a19f884b -1f12e5098f7010cb275ae3b507eef8c7a19f884b -cups-filters_1.21.2.orig.tar.xz -f3651b75f2c6a05e0cfa54be363c1e6280d6652d -1473008 +2b1d2abe4aa7e03963f30f9dd707173dda075fea +2b1d2abe4aa7e03963f30f9dd707173dda075fea +2e882fb62da3a4da09d62365e25e7b4282d34683 +2e882fb62da3a4da09d62365e25e7b4282d34683 +cups-filters_1.21.3.orig.tar.xz +5164f21a78a425b19c375f86be4e9159f970ac52 +1474152 diff --git a/debian/changelog b/debian/changelog index 95bd4b98e..3e46771b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cups-filters (1.21.3-2) unstable; urgency=high + + * Fix FTBFS against poppler 0.69 by patching out usage of two functions + removed in 0.69 (Closes: #910871) + + -- Didier Raboud <odyx@debian.org> Sat, 20 Oct 2018 18:51:39 +0200 + cups-filters (1.21.3-1) unstable; urgency=medium * New upstream version 1.21.3 diff --git a/debian/patches/0001-Poppler-0.69-gMemReport-removed-from-API-in-f89446f6.patch b/debian/patches/0001-Poppler-0.69-gMemReport-removed-from-API-in-f89446f6.patch new file mode 100644 index 000000000..5f5b4b846 --- /dev/null +++ b/debian/patches/0001-Poppler-0.69-gMemReport-removed-from-API-in-f89446f6.patch @@ -0,0 +1,54 @@ +From bb264947c3b7de87a66f6c2433e5eaf77a7c9012 Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Sat, 20 Oct 2018 18:41:06 +0200 +Subject: =?UTF-8?q?Poppler=200.69:=20gMemReport=20removed=20from=20API?= + =?UTF-8?q?=C2=A0in=20f89446f6917a869b0f1a80fcc8ce81a7213dade4?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + filter/pdftoijs.cxx | 2 -- + filter/pdftoopvp/pdftoopvp.cxx | 2 -- + filter/pdftoraster.cxx | 2 -- + 3 files changed, 6 deletions(-) + +diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx +index 22bc33f43..edc5743f7 100644 +--- a/filter/pdftoijs.cxx ++++ b/filter/pdftoijs.cxx +@@ -505,8 +505,6 @@ err1: + + // Check for memory leaks + Object::memCheck(stderr); +- gMemReport(stderr); +- + return exitCode; + } + +diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx +index 024941ab0..c5ded6f24 100644 +--- a/filter/pdftoopvp/pdftoopvp.cxx ++++ b/filter/pdftoopvp/pdftoopvp.cxx +@@ -765,8 +765,6 @@ err2: + + // check for memory leaks + Object::memCheck(stderr); +- gMemReport(stderr); +- + } + /* muntrace(); */ + return exitCode; +diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx +index 0c63ab8d5..757d4c752 100644 +--- a/filter/pdftoraster.cxx ++++ b/filter/pdftoraster.cxx +@@ -2164,8 +2164,6 @@ err1: + + // Check for memory leaks + Object::memCheck(stderr); +- gMemReport(stderr); +- + return exitCode; + } + diff --git a/debian/patches/0002-Poppler-0.69-Object-memCheck-removed-from-API-in-c36.patch b/debian/patches/0002-Poppler-0.69-Object-memCheck-removed-from-API-in-c36.patch new file mode 100644 index 000000000..4bad1c3c1 --- /dev/null +++ b/debian/patches/0002-Poppler-0.69-Object-memCheck-removed-from-API-in-c36.patch @@ -0,0 +1,54 @@ +From 2b1d2abe4aa7e03963f30f9dd707173dda075fea Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Sat, 20 Oct 2018 18:43:05 +0200 +Subject: =?UTF-8?q?Poppler=200.69:=20Object::memCheck=20removed=20from=20A?= + =?UTF-8?q?PI=C2=A0in=20c362ab1b97f20c5b73b3bad8d52015f679178748?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + filter/pdftoijs.cxx | 2 -- + filter/pdftoopvp/pdftoopvp.cxx | 2 -- + filter/pdftoraster.cxx | 2 -- + 3 files changed, 6 deletions(-) + +diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx +index edc5743f7..57fef77ef 100644 +--- a/filter/pdftoijs.cxx ++++ b/filter/pdftoijs.cxx +@@ -503,8 +503,6 @@ err1: + ppdClose(ppd); + free(outputfile); + +- // Check for memory leaks +- Object::memCheck(stderr); + return exitCode; + } + +diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx +index c5ded6f24..f7fe18cc7 100644 +--- a/filter/pdftoopvp/pdftoopvp.cxx ++++ b/filter/pdftoopvp/pdftoopvp.cxx +@@ -763,8 +763,6 @@ err2: + err0: + delete globalParams; + +- // check for memory leaks +- Object::memCheck(stderr); + } + /* muntrace(); */ + return exitCode; +diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx +index 757d4c752..eae8f54ee 100644 +--- a/filter/pdftoraster.cxx ++++ b/filter/pdftoraster.cxx +@@ -2162,8 +2162,6 @@ err1: + cmsDeleteTransform(colorTransform); + } + +- // Check for memory leaks +- Object::memCheck(stderr); + return exitCode; + } + diff --git a/debian/patches/auto-gitignore b/debian/patches/auto-gitignore index 4fcabfdc6..754d6294d 100644 --- a/debian/patches/auto-gitignore +++ b/debian/patches/auto-gitignore @@ -4,7 +4,7 @@ The Debian packaging git branch contains these updates to the upstream .gitignore file(s). This patch is autogenerated, to provide these updates to users of the official Debian archive view of the package. -[dgit (7.0) update-gitignore] +[dgit (8.0) update-gitignore] --- diff --git a/.gitignore b/.gitignore new file mode 100644 diff --git a/debian/patches/series b/debian/patches/series index a22980abc..e9195e318 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ - +0001-Poppler-0.69-gMemReport-removed-from-API-in-f89446f6.patch +0002-Poppler-0.69-Object-memCheck-removed-from-API-in-c36.patch auto-gitignore diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx index 22bc33f43..57fef77ef 100644 --- a/filter/pdftoijs.cxx +++ b/filter/pdftoijs.cxx @@ -503,10 +503,6 @@ err1: ppdClose(ppd); free(outputfile); - // Check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); - return exitCode; } diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx index 024941ab0..f7fe18cc7 100644 --- a/filter/pdftoopvp/pdftoopvp.cxx +++ b/filter/pdftoopvp/pdftoopvp.cxx @@ -763,10 +763,6 @@ err2: err0: delete globalParams; - // check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); - } /* muntrace(); */ return exitCode; diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx index 0c63ab8d5..eae8f54ee 100644 --- a/filter/pdftoraster.cxx +++ b/filter/pdftoraster.cxx @@ -2162,10 +2162,6 @@ err1: cmsDeleteTransform(colorTransform); } - // Check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); - return exitCode; } |