Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 861954 Details for
Bug 819939
>=app-crypt/pinentry-1.2.0: automagic dependency on dev-qt/qtx11extras
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
pinentry-1.2.1-automagic-capslock.patch
pinentry-1.2.1-automagic-capslock.patch (text/plain), 2.14 KB, created by
Sam James
on 2023-05-19 06:48:19 UTC
(
hide
)
Description:
pinentry-1.2.1-automagic-capslock.patch
Filename:
MIME Type:
Creator:
Sam James
Created:
2023-05-19 06:48:19 UTC
Size:
2.14 KB
patch
obsolete
>https://dev.gnupg.org/T6161 >https://bugs.gentoo.org/819939 >https://bugs.gentoo.org/837719 >--- a/configure.ac >+++ b/configure.ac >@@ -528,8 +529,13 @@ fi > dnl > dnl Check for KF5WaylandClient library > dnl >+ >+AC_ARG_ENABLE(kf5-wayland, >+ AS_HELP_STRING([--enable-kf5-wayland],[use KF5WaylandClient for capslock indication on Wayland]), >+ [want_kf5_wayland=$enableval], [want_kf5_wayland=maybe]) >+ > have_kf5waylandclient=no >-if test "$have_w32_system" != "yes"; then >+AS_IF([test "$have_w32_system" != "yes" && test "$want_kf5_wayland" != "no"], [ > PKG_CHECK_MODULES( > KF5WAYLANDCLIENT, > [KF5WaylandClient >= 5.60], >@@ -539,7 +545,7 @@ if test "$have_w32_system" != "yes"; then > have_kf5waylandclient=no > ] > ) >-fi >+]) > > dnl > dnl Check for Qt5 pinentry program. >--- a/m4/qt.m4 >+++ b/m4/qt.m4 >@@ -33,6 +33,10 @@ AC_DEFUN([FIND_QT], > enable_pinentry_qt5=$enableval, > enable_pinentry_qt5="try") > >+ AC_ARG_ENABLE(qtx11extras, >+ AS_HELP_STRING([--enable-qtx11extras],[use Qt5X11Extras for capslock indication on X11]), >+ [want_qtx11extras=$enableval], [want_qtx11extras=maybe]) >+ > have_qt5_libs="no"; > require_qt_cpp11="no"; > >@@ -63,20 +67,22 @@ AC_DEFUN([FIND_QT], > fi > fi > >- if test "$have_x11" = "yes"; then >+ have_qt5_x11extras=no >+ AS_IF([test "$have_x11" = "yes" && test "$want_qtx11extras" != "no"], [ > PKG_CHECK_MODULES( > PINENTRY_QT_X11_EXTRAS, > Qt5X11Extras >= 5.1.0, > [have_qt5_x11extras="yes"], >- [ >- AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) >- have_qt5_x11extras="no" >- ]) >- if test "$have_qt5_x11extras" = "yes"; then >+ [have_qt5_x11extras="no"] >+ ) >+ ]) >+ >+ AS_IF([test "$have_qt5_x11extras" = "yes"], [ > PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS" > PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS" >- fi >- fi >+ ], [ >+ AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) >+ ]) > > AC_CHECK_TOOL(MOC, moc) > AC_MSG_CHECKING([moc version])
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 819939
: 861954