diff options
| author |  Peter Korsgaard <peter@korsgaard.com> | 2019-02-06 15:10:50 +0100 |
|---|---|---|
| committer |  Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2019-02-06 15:41:12 +0100 |
| commit | 3f821fcc9c4398d0f549a04eecfc075aba7f413c (patch) | |
| tree | 1aabee710f89ae9d494d6fbc494f5d4c2ffc9d19 | |
| parent | 3a3fdaebd960a15f3d9fd514a6325d154a9c539d (diff) | |
| download | buildroot-3f821fcc9c4398d0f549a04eecfc075aba7f413c.tar.gz buildroot-3f821fcc9c4398d0f549a04eecfc075aba7f413c.tar.bz2 | |
package/poppler: remove qt option
The qt option uses the obsolete qt4 package, which we are about to remove,
so remove the poppler qt option as well.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
| -rw-r--r-- | Config.in.legacy | 6 | ||||
| -rw-r--r-- | package/poppler/Config.in | 8 | ||||
| -rw-r--r-- | package/poppler/poppler.mk | 9 |
3 files changed, 7 insertions, 16 deletions
diff --git a/Config.in.legacy b/Config.in.legacy index 67e3b0dc70..c137006948 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2019.02" +config BR2_PACKAGE_POPPLER_QT + bool "poppler qt option removed" + select BR2_LEGACY + help + The poppler qt option was removed. + config BR2_PACKAGE_OPENCV3_WITH_QT bool "opencv3 qt backend option removed" select BR2_LEGACY diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 9b03df8d27..4a553df721 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -13,14 +13,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 diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index bad61a6613..be1c0e4821 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -12,7 +12,7 @@ POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ - --enable-xpdf-headers + --enable-xpdf-headers --disable-poppler-qt4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" @@ -84,13 +84,6 @@ else POPPLER_CONF_OPTS += --without-x endif -ifeq ($(BR2_PACKAGE_POPPLER_QT),y) -POPPLER_DEPENDENCIES += qt -POPPLER_CONF_OPTS += --enable-poppler-qt4 -else -POPPLER_CONF_OPTS += --disable-poppler-qt4 -endif - ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) POPPLER_DEPENDENCIES += qt5base POPPLER_CONF_OPTS += --enable-poppler-qt5 |