package/poppler: bump version to 0.69.0
PATCH 1/2 package/poppler: bump version to 0.69.0
For the version bump, the makefile had to be rewritten for CMake, as the project moved from autotools to CMake.
--- package/poppler/Config.in | 38 +++++++++--- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 114 ++++++++++++----------------------- 3 files changed, 71 insertions(+), 83 deletions(-)
package/poppler/Config.in +30 -8
@@ -2,7 +2,11 @@ config BR2_PACKAGE_POPPLER bool "poppler" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_OPENJPEG + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 help
@@ -13,14 +17,6 @@ config BR2_PACKAGE_POPPLER if BR2_PACKAGE_POPPLER -config BR2_PACKAGE_POPPLER_QT - bool "Qt support" - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_XML - help - Build Qt support into the Poppler library - config BR2_PACKAGE_POPPLER_QT5 bool "Qt5 support" depends on BR2_PACKAGE_QT5
@@ -30,6 +26,32 @@ config BR2_PACKAGE_POPPLER_QT5 help Build Qt support into the Poppler library +config BR2_PACKAGE_POPPLER_FIXED_POINT + bool "use fixed-point" if !BR2_SOFT_FLOAT + default y if BR2_SOFT_FLOAT + help + Compile without floating point operations (for machines + without a fast enough FPU). + +config BR2_PACKAGE_POPPLER_LIBCURL + bool "libcurl support" + depends on BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_QT5BASE_GUI + help + Build poppler with libcurl based HTTP support. + +config BR2_PACKAGE_POPPLER_ZLIB + bool "zlib support" + depends on BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZLIB + help + Build poppler with with zlib. + +config BR2_PACKAGE_POPPLER_UTILS + bool "command line utils" + help + Compile poppler command line utils. + endif comment "poppler needs a toolchain w/ C++, threads"
package/poppler/poppler.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 poppler-0.59.0.tar.xz +sha256 637ff943f805f304ff1da77ba2e7f1cbd675f474941fd8ae1e0fc01a5b45a3f9 poppler-0.69.0.tar.xz
package/poppler/poppler.mk +40 -74
149 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/2 package/poppler: Remove patch which is not needed for poppler 0.69.0
The patch has been applied to the upstream project,
https://github.com/freedesktop/poppler/commit/d3f12611b30e6421f05603a9838ed9131b1aa61e
and is thus not needed anymore.
--- ...c-include-ctype.h-to-fix-build-error.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch
package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From f40143f7acca81b7d39d774ed4c349aec8d9310b Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Sat, 23 Sep 2017 11:37:23 +0200 -Subject: [PATCH] Form.cc: include ctype.h to fix build error - -Fixes -Form.cc:546:28: error: 'isdigit' was not declared in this scope -Form.cc:548:34: error: 'isxdigit' was not declared in this scope -Form.cc:575:40: error: 'isxdigit' was not declared in this scope - -detected by buildroot autobuilders: -http://autobuild.buildroot.net/results/a6a/a6a336f8b6a0136b204a34091e33dc4598178125/ -when cross-compiling with -gcc version 4.7.3 (crosstool-NG hg+-c65fcf8a34b7) - -Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=102951 - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - poppler/Form.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/poppler/Form.cc b/poppler/Form.cc -index 83bceb20..e7efae95 100644 ---- a/poppler/Form.cc -+++ b/poppler/Form.cc -@@ -32,6 +32,7 @@ - #include <stddef.h> - #include <stdlib.h> - #include <string.h> -+#include <ctype.h> - #include "goo/gmem.h" - #include "goo/GooString.h" - #include "Error.h" --- -2.11.0 -
Signature · 1 line
2.17.1
PATCH 1/2 package/poppler: bump version to 0.69.0
In reply to Olivier SchonkenHello Olivier,
Quoted 4 lines · On Fri, 5 Oct 2018 15:31:41 +0200 Olivier Schonken…
For the version bump, the makefile had to be rewritten for CMake, as the project moved from autotools to CMake.
Signed-off-by Olivier Schonken <[email protected]>
So I finally look into this patch, and merged it, but after doing a *lot* of changes.
First of all your PATCH 1/2 and 2/2 should have been squashed into a single patch, otherwise the series is not bisectable: with just PATCH 1/2 applied, poppler doesn't build.
Also, since poppler 0.69 was old, I bumped all the way to 0.77.
package/poppler/Config.in config BR2_PACKAGE_POPPLER · line 5
Quoted 9 lines
package/poppler/Config.in +1
-0@@ -2,7 +2,11 @@ config BR2_PACKAGE_POPPLER bool "poppler" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
I had to change this to GCC_AT_LEAST_5 for poppler 0.77. Also, you had forgotten to update the Config.in comment about this gcc version dependency.
package/poppler/Config.in config BR2_PACKAGE_POPPLER · line 9
Quoted 4 lines
package/poppler/Config.in +3
-0select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_OPENJPEG + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_JPEG
None of these dependencies are mandatory, they can be disabled just like they could with the old version of poppler.
package/poppler/Config.in config BR2_PACKAGE_POPPLER · line 11
Quoted 2 lines
package/poppler/Config.in +0
-0select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
These dependencies were apparently no longer needed.
package/poppler/Config.in config BR2_PACKAGE_POPPLER · line 22
Quoted 12 lines
package/poppler/Config.in +0
-7help@@ -13,14 +17,6 @@ config BR2_PACKAGE_POPPLER if BR2_PACKAGE_POPPLER -config BR2_PACKAGE_POPPLER_QT - bool "Qt support" - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_XML - help - Build Qt support into the Poppler library
This option had been removed in the mean time.
Quoted 5 lines
package/poppler/Config.in +0
-1- config BR2_PACKAGE_POPPLER_QT5 bool "Qt5 support" depends on BR2_PACKAGE_QT5
package/poppler/Config.in config BR2_PACKAGE_POPPLER_QT5 · line 34
Quoted 9 lines
package/poppler/Config.in +6
-0@@ -30,6 +26,32 @@ config BR2_PACKAGE_POPPLER_QT5 help Build Qt support into the Poppler library +config BR2_PACKAGE_POPPLER_FIXED_POINT + bool "use fixed-point" if !BR2_SOFT_FLOAT + default y if BR2_SOFT_FLOAT + help + Compile without floating point operations (for machines + without a fast enough FPU).
I dropped this option, and directly used BR2_SOFT_FLOAT in poppler.mk.
package/poppler/Config.in config BR2_PACKAGE_POPPLER_QT5 · line 41
Quoted 7 lines
package/poppler/Config.in +7
-0+ +config BR2_PACKAGE_POPPLER_LIBCURL + bool "libcurl support" + depends on BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_QT5BASE_GUI + help + Build poppler with libcurl based HTTP support.
I dropped this option, and directly used BR2_PACKAGE_LIBCURL in poppler.mk. I'm not sure why you were selecting QT5BASE_GUI here.
package/poppler/Config.in config BR2_PACKAGE_POPPLER_QT5 · line 48
Quoted 7 lines
package/poppler/Config.in +7
-0+ +config BR2_PACKAGE_POPPLER_ZLIB + bool "zlib support" + depends on BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZLIB + help + Build poppler with with zlib.
I dropped this option, and directly used BR2_PACKAGE_ZLIB in poppler.mk.
package/poppler/Config.in config BR2_PACKAGE_POPPLER_QT5 · line 57
Quoted 1 line
package/poppler/Config.in +0
-0comment "poppler needs a toolchain w/ C++, threads"
This is where I have added the comment about the gcc version dependency.
package/poppler/Config.in config BR2_PACKAGE_POPPLER_QT5 · line 50
Quoted 2 lines
package/poppler/Config.in +1
-1-POPPLER_VERSION = 0.59.0 +POPPLER_VERSION = 0.69.0
So, I bumped to 0.77.0
package/poppler/Config.in config BR2_PACKAGE_POPPLER_QT5
Quoted 6 lines
package/poppler/Config.in +1
-3POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org -POPPLER_DEPENDENCIES = fontconfig host-pkgconf -POPPLER_LICENSE = GPL-2.0+ -POPPLER_LICENSE_FILES = COPYING +POPPLER_DEPENDENCIES = fontconfig host-pkgconf openjpeg lcms2 libjpeg
I didn't add openjpeg, lcms2 and libjpeg here, because they are still optional dependencies. BTW, libjpeg was wrong, it should have been just "jpeg".
package/poppler/Config.in
Quoted 2 lines
package/poppler/Config.in +2
-0+POPPLER_LICENSE = GPL-2.0+ GPL-3.0+ +POPPLER_LICENSE_FILES = COPYING COPYING3
To me, the licensing terms are unclear. All files have a "GPL version 2 or later", but the documentation says the code is forked from Xpdf, which is licensed under GPLv2 or GPLv3 (but not "or any later version", and they really insist on this).
I should probably send a separate e-mail to Yann/Arnout on this to get their opinion.
package/poppler/Config.in
Quoted 3 lines
package/poppler/Config.in +0
-3-ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" -endif
Something like this was still needed, but of course changed for the CMake build system.
And overall, for the rest of the .mk file, I just adapted to the changes I described above: lcms2, openjpeg and jpeg are optional, and sub-options in Config.in were not added.
Since poppler 0.77.0 changed some APIs, I had to bump cups-filters to 1.23.0 as a preparation patch.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com