[Buildroot] [PATCH 0/2] poppler: Add option for Qt5 support

This explicitly adds poppler support for qt5. Since we depend on qt5 we dont
need to depend on individual toolchain requirements for Qt5.
However for supporting Qt >= 5.7 we need to use the -std=c++11 compiler option.

Should fix:
http://autobuild.buildroot.net/results/359/35916f2a34ec45ced3e30a25a680cbaa3a0aba6f/


Andreas Naumann (1):
  poppler: qt5 support needs c++11 (since Qt5.7)

Jens Kleintje (1):
  poppler: Add option for Qt5 support

 package/poppler/Config.in  |  9 +++++++++
 package/poppler/poppler.mk | 11 +++++++++++
 2 files changed, 20 insertions(+)

-- 
1.9.1

From: Jens Kleintje <redacted>

Add an option to build the libpoppler-qt5 library.

Signed-off-by: Andreas Naumann <redacted>
---
 package/poppler/Config.in  | 9 +++++++++
 package/poppler/poppler.mk | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index 2ca3ff6..d741f65 100644
--- a/package/poppler/Config.in
+++ b/package/poppler/Config.in

@@ -24,6 +24,15 @@ config BR2_PACKAGE_POPPLER_QT
 comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405"
 	depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
 
+config BR2_PACKAGE_POPPLER_QT5
+	bool "Qt5 support"
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	select BR2_PACKAGE_QT5BASE_XML
+	help
+	  Build Qt support into the Poppler library
+
 endif
 
 comment "poppler needs a toolchain w/ C++, threads"

diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 3e8a9f4..022c2c5 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk

@@ -87,6 +87,13 @@ else
 POPPLER_CONF_OPTS += --disable-poppler-qt4
 endif
 
+ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
+POPPLER_DEPENDENCIES += qt5base
+POPPLER_CONF_OPTS += --enable-poppler-qt5
+else
+POPPLER_CONF_OPTS += --disable-poppler-qt5
+endif
+
 ifeq ($(BR2_PACKAGE_OPENJPEG),y)
 POPPLER_DEPENDENCIES += openjpeg
 POPPLER_CONF_OPTS += --enable-libopenjpeg

-- 
1.9.1

Signed-off-by: Andreas Naumann <redacted>
---
 package/poppler/poppler.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 022c2c5..29c79d7 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk

@@ -90,6 +90,10 @@ endif
 ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
 POPPLER_DEPENDENCIES += qt5base
 POPPLER_CONF_OPTS += --enable-poppler-qt5
+# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement)
+ifneq ($(BR2_QT5_VERSION_5_6),y)
+POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+endif
 else
 POPPLER_CONF_OPTS += --disable-poppler-qt5
 endif

-- 
1.9.1

Hello,

On Fri, 10 Feb 2017 14:59:58 +0100, Andreas Naumann wrote:

+# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement)
+ifneq ($(BR2_QT5_VERSION_5_6),y)

Reviewing lead me to realize that we did a mistake when naming those
options. They should be named BR2_PACKAGE_QT5_VERSION_XYZ, and not
BR2_QT5_VERSION_XYZ.

We want to fix this before 2017.02 is released.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Hi,

Am 10.02.2017 um 16:39 schrieb Thomas Petazzoni:

Hello,

On Fri, 10 Feb 2017 14:59:58 +0100, Andreas Naumann wrote:

quoted

+# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement)
+ifneq ($(BR2_QT5_VERSION_5_6),y)

Reviewing lead me to realize that we did a mistake when naming those
options. They should be named BR2_PACKAGE_QT5_VERSION_XYZ, and not
BR2_QT5_VERSION_XYZ.

Ok, I'll resend this including the option rename as first patch.

regards,
Andreas

We want to fix this before 2017.02 is released.

Thomas