mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/pinentry: remove gtk2 backend support

Browse Source 
As we're about to remove libgtk2, we need to first remove support for
the gtk2 backend of pinentry, which this patch does.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
Thomas Petazzoni
2025-09-10 23:32:26 +02:00
committed by Arnout Vandecappelle
parent 565344aba2
commit 0fd437511e
3 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Config.in.legacy
View File

@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.11" comment "Legacy options removed in 2025.11"
config BR2_PACKAGE_PINENTRY_GTK2
bool "gtk2 backend of pinentry has been removed"
select BR2_LEGACY
help
Due to the removal of libgtk2, the gtk2 backend of pinentry
has been removed.
config BR2_PACKAGE_OPENCV4_WITH_GTK config BR2_PACKAGE_OPENCV4_WITH_GTK
bool "opencv4 gtk support has been removed" bool "opencv4 gtk support has been removed"
select BR2_LEGACY select BR2_LEGACY

22
package/pinentry/Config.in
View File

@@ -6,7 +6,6 @@ menuconfig BR2_PACKAGE_PINENTRY
select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGPG_ERROR
# At least one backend is needed to avoid build breakage # At least one backend is needed to avoid build breakage
select BR2_PACKAGE_PINENTRY_NCURSES if \ select BR2_PACKAGE_PINENTRY_NCURSES if \
!BR2_PACKAGE_PINENTRY_GTK2 && \
!BR2_PACKAGE_PINENTRY_QT5 !BR2_PACKAGE_PINENTRY_QT5
help help
A collection of simple PIN or pass-phrase entry dialogs A collection of simple PIN or pass-phrase entry dialogs
@@ -46,27 +45,6 @@ config BR2_PACKAGE_PINENTRY_NCURSES
help help
The pinentry-ncurses tool The pinentry-ncurses tool
config BR2_PACKAGE_PINENTRY_GTK2
bool "pinentry-gtk2"
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz
select BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
The pinentry-gtk2 tool
comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_PINENTRY_QT5 config BR2_PACKAGE_PINENTRY_QT5
bool "pinentry-qt5" bool "pinentry-qt5"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP

12
package/pinentry/pinentry.mk
View File

@@ -13,10 +13,12 @@ PINENTRY_DEPENDENCIES = \
libassuan libgpg-error \ libassuan libgpg-error \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \
host-pkgconf host-pkgconf
# --disable-libcap to avoid PAM dependency
PINENTRY_CONF_OPTS += \ PINENTRY_CONF_OPTS += \
--with-libassuan-prefix=$(STAGING_DIR)/usr \ --with-libassuan-prefix=$(STAGING_DIR)/usr \
--with-libgpg-error-prefix=$(STAGING_DIR)/usr \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \
--without-libcap # requires PAM --without-libcap \
--disable-pinentry-gtk2
# Force the path to "gpgrt-config" (from the libgpg-error package) to # Force the path to "gpgrt-config" (from the libgpg-error package) to
# avoid using the one on host, if present. # avoid using the one on host, if present.
@@ -58,14 +60,6 @@ else
PINENTRY_CONF_OPTS += --disable-ncurses PINENTRY_CONF_OPTS += --disable-ncurses
endif endif
# pinentry-gtk2 backend
ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y)
PINENTRY_CONF_OPTS += --enable-pinentry-gtk2
PINENTRY_DEPENDENCIES += libgtk2
else
PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
endif
# pinentry-qt5 backend # pinentry-qt5 backend
ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y) ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y)
PINENTRY_CONF_OPTS += --enable-pinentry-qt PINENTRY_CONF_OPTS += --enable-pinentry-qt