diff options
| author |   Sam James <sam@gentoo.org> | 2024-03-19 08:53:28 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-03-19 09:07:43 +0000 |
| commit | d4318a72783d60913a98818f9af02b118333e7d2 (patch) | |
| tree | 38ab25b35391450978ec82609e3f7c2999058c96 /app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch | |
| parent | mate-base/mate-settings-daemon: fix mate-desktop dep on 1.27.1 (diff) | |
| download | gentoo-d4318a72783d60913a98818f9af02b118333e7d2.tar.gz gentoo-d4318a72783d60913a98818f9af02b118333e7d2.tar.bz2 gentoo-d4318a72783d60913a98818f9af02b118333e7d2.zip | |
app-crypt/pinentry: fix qt symlink typo, patch fixes
* re symlink: Not that we're aware of anything needing it...
* Pull in a patch for fixing ifdefs for Qt. Reported by asturm.
* Fix our own automagic patch.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch')
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch b/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch index 1236fb83f16d..a9f59ae66682 100644 --- a/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch +++ b/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch @@ -131,8 +131,8 @@ https://bugs.gentoo.org/837719 + ]) + + 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" ++ PINENTRY_QT5_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT5_CFLAGS $PINENTRY_QT5_X11_EXTRAS_CFLAGS" ++ PINENTRY_QT5_LIBS="$LIBX11_LIBS $PINENTRY_QT5_LIBS $PINENTRY_QT5_X11_EXTRAS_LIBS" + ], [ + AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) + ]) |