NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pinentry: remove qt4 option

Browse Source 
The qt4 option uses the obsolete qt4 package, which we are about to remove,
so remove the pinentry-qt4 option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:51 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 3f821fcc9c
commit 5de7c039d9
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02"
config BR2_PACKAGE_PINENTRY_QT4
bool "pinentry-qt4 option removed"
select BR2_LEGACY
help
The pinentry-qt4 option was removed.
config BR2_PACKAGE_POPPLER_QT
bool "poppler qt option removed"
select BR2_LEGACY

18
package/pinentry/Config.in
View File

@ -7,7 +7,6 @@ menuconfig BR2_PACKAGE_PINENTRY
# At least one backend is needed to avoid build breakage
select BR2_PACKAGE_PINENTRY_NCURSES if \
!BR2_PACKAGE_PINENTRY_GTK2 && \
!BR2_PACKAGE_PINENTRY_QT4 && \
!BR2_PACKAGE_PINENTRY_QT5
help
A collection of simple PIN or pass-phrase entry dialogs
@ -42,28 +41,12 @@ comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++"
depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_PINENTRY_QT4
bool "pinentry-qt4"
depends on BR2_USE_MMU # fork
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI_MODULE
help
The pinentry-qt4 tool
comment "pinentry-qt4 needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_PINENTRY_QT5
bool "pinentry-qt5"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS
depends on !BR2_PACKAGE_PINENTRY_QT4
depends on !BR2_PACKAGE_QT
select BR2_PACKAGE_QT5
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_WIDGETS
@ -71,7 +54,6 @@ config BR2_PACKAGE_PINENTRY_QT5
The pinentry-qt5 tool
comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
depends on !BR2_PACKAGE_PINENTRY_QT4
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS

11
package/pinentry/pinentry.mk
View File

@ -52,15 +52,10 @@ else
PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
endif
# pinentry-qt4/5 backend
ifeq ($(BR2_PACKAGE_PINENTRY_QT4)$(BR2_PACKAGE_PINENTRY_QT5),y)
ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y)
# -pthread needs to be passed for certain toolchains
# http://autobuild.buildroot.net/results/6be/6be109ccedec603a67cebdb31b55865dcce0e128/
PINENTRY_CONF_OPTS += LIBS=-pthread MOC=$(HOST_DIR)/bin/moc
endif
# pinentry-qt5 backend
ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y)
PINENTRY_CONF_OPTS += --enable-pinentry-qt
PINENTRY_DEPENDENCIES += $(if $(BR2_PACKAGE_PINENTRY_QT4),qt,qt5base)
PINENTRY_DEPENDENCIES += qt5base
else
PINENTRY_CONF_OPTS += --disable-pinentry-qt
endif