Skip to contentSkip to conversation

package/cups-filters: bump to version 1.21.3

PATCH New Olivier Schonken 2 participants 4 messages Oct 5, 2018 – Oct 6, 2018

lore
Share & tools
lore

Olivier Schonken

author
#0 lore raw

PATCH 1/2 package/cups-filters: bump to version 1.21.3

Signed-off-by Olivier Schonken <[email protected]>
---
 package/cups-filters/cups-filters.hash | 4 ++--
 package/cups-filters/cups-filters.mk   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
package/cups-filters/cups-filters.hash +2 -2
index 7bb00818df..e426ad8b86 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 aad95e35033154f54639923b439e0657fc9f616b9eac7490df89514362551f98  cups-filters-1.20.3.tar.gz
-sha256 24cc91478ca68d6d982dfd86181210ad5f0931ec431bdb740793e3d6555fdcd8  COPYING
+sha256 981b280bc5275a21c6f436aff6207e03cab36dc304c119bbac507db940e7421c  cups-filters-1.21.3.tar.gz
+sha256 8e697cf4681ebbca716bf8cc30dde51c264e32ceee41fa63ceb5213334204b83  COPYING
package/cups-filters/cups-filters.mk +2 -1
index 131e58246e..b7f002f418 100644
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-CUPS_FILTERS_VERSION = 1.20.3
+CUPS_FILTERS_VERSION = 1.21.3
 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
 CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
 CUPS_FILTERS_LICENSE_FILES = COPYING
+CUPS_FILTERS_AUTORECONF = YES
 
 CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 package/cups-filters: Add patch to fix build when using poppler 0.69.0

This patch lets cups-filters only use gMemReport and memCheck functions if poppler version less than 0.69.0

The poppler project removed the memCheck and gMemReport functions in commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM from Object since this uses RAII now and hence cannot leak. (The existing tracking also is not thread-safe and hence unreliable.)

and

f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging from gmem since external tools and compiler instrumentation achieve the same effect.

A pull-request for the patch has also been created upstream at
https://github.com/OpenPrinting/cups-filters/pull/66

Signed-off-by Olivier Schonken <[email protected]>
---
 ...ed-memCheck-and-gMemReport-functions.patch | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch
package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch new file +79 -0
new file mode 100644
index 0000000000..3eb2d35c3e
@@ -0,0 +1,79 @@
+From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Fri, 5 Oct 2018 12:05:31 +0200
+Subject: [PATCH] Poppler removed memCheck and gMemReport functions
+
+Only use gMemReport and memCheck functions if poppler version less
+than 0.69.0
+
+The poppler project removed the memCheck and gMemReport functions in
+commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM
+from Object since this uses RAII now and hence cannot leak.
+(The existing tracking also is not thread-safe and hence unreliable.)
+
+and
+
+f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging
+from gmem since external tools and compiler instrumentation achieve the
+same effect.
+
+This commit solves https://github.com/OpenPrinting/cups-filters/issues/62
+
+Signed-off-by: Olivier Schonken <[email protected]>
+---
+ filter/pdftoijs.cxx            | 2 ++
+ filter/pdftoopvp/pdftoopvp.cxx | 2 ++
+ filter/pdftoraster.cxx         | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
+index 22bc33f4..dd6b6fa0 100644
+--- a/filter/pdftoijs.cxx
++++ b/filter/pdftoijs.cxx
+@@ -503,9 +503,11 @@ err1:
+   ppdClose(ppd);
+   free(outputfile);
+ 
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
+   // Check for memory leaks
+   Object::memCheck(stderr);
+   gMemReport(stderr);
++#endif
+ 
+   return exitCode;
+ }
+diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
+index 024941ab..bf25983b 100644
+--- a/filter/pdftoopvp/pdftoopvp.cxx
++++ b/filter/pdftoopvp/pdftoopvp.cxx
+@@ -763,9 +763,11 @@ err2:
+  err0:
+   delete globalParams;
+ 
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
+   // check for memory leaks
+   Object::memCheck(stderr);
+   gMemReport(stderr);
++#endif
+ 
+ }
+ /* muntrace(); */
+diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
+index 0c63ab8d..4ebf02b0 100644
+--- a/filter/pdftoraster.cxx
++++ b/filter/pdftoraster.cxx
+@@ -2162,9 +2162,11 @@ err1:
+     cmsDeleteTransform(colorTransform);
+   }
+ 
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
+   // Check for memory leaks
+   Object::memCheck(stderr);
+   gMemReport(stderr);
++#endif
+ 
+   return exitCode;
+ }
+-- 
+2.17.1
+
Signature · 1 line
2.17.1
Applied
#2 lore raw

PATCH 2/2 package/cups-filters: Add patch to fix build when using poppler 0.69.0

Hello,

Quoted 14 lines · Olivier Schonken

This patch lets cups-filters only use gMemReport and memCheck functions if poppler version less than 0.69.0

The poppler project removed the memCheck and gMemReport functions in commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM from Object since this uses RAII now and hence cannot leak. (The existing tracking also is not thread-safe and hence unreliable.)

and

f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging from gmem since external tools and compiler instrumentation achieve the same effect.

Quoted 8 lines

A pull-request for the patch has also been created upstream at
https://github.com/OpenPrinting/cups-filters/pull/66

Signed-off-by Olivier Schonken <[email protected]>
---
 ...ed-memCheck-and-gMemReport-functions.patch | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch

Applied to master, thanks. Thanks a lot for having submitted the patch upstream, it has already been merged, which is nice!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/cups-filters: bump to version 1.21.3

In reply to Olivier Schonken

Hello,

Quoted 5 lines · Olivier Schonken
Signed-off-by Olivier Schonken <[email protected]>
---
 package/cups-filters/cups-filters.hash | 4 ++--
 package/cups-filters/cups-filters.mk   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

I've applied, but I have one comment, see below.

package/cups-filters/cups-filters.mk line 11

Quoted 6 lines
package/cups-filters/cups-filters.mk +2 -1
-CUPS_FILTERS_VERSION = 1.20.3
+CUPS_FILTERS_VERSION = 1.21.3
 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
 CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
 CUPS_FILTERS_LICENSE_FILES = COPYING
+CUPS_FILTERS_AUTORECONF = YES

You didn't explain why this autoreconf was needed.

I initially thought it was because the release tarball was broken, with Makefile.am having a date newer than Makefile.in, and so I added such a comment in the .mk file when applying your patch.

But of course right after pushing, I realized the existing patch 0001 modifies the Makefile.am, so the AUTORECONF was needed independently of the package bump.

So, it would have been nice to:

- Do the AUTORECONF = YES addition in a separate patch. This would have easily allowed to backport this fix to our stable branches:
this problem affects Buildroot 2018.05 and 2018.08.

- Do the bump in a separate patch.

Could you send a patch based on the 2018.08.x branch that just adds the AUTORECONF = YES, with the comment I added on top of it ? This will allow Peter to fix it in 2018.08.x.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com