diff options
| author |   Kristian Fiskerstrand <k_f@gentoo.org> | 2015-09-18 18:08:02 +0200 |
|---|---|---|
| committer | Kristian Fiskerstrand <k_f@gentoo.org> | 2015-09-18 18:08:51 +0200 |
| commit | 0de8be361ceb11c54aec127c23269e926515ed26 (patch) | |
| tree | f0ea937f7a141ef0a7ec006f929dffb6e2a8cc18 /app-crypt/pinentry/files | |
| parent | media-gfx/freecad: add dev-python/pyside[svg] (thanks Jon Gerdes, bug 560494). (diff) | |
| download | gentoo-0de8be361ceb11c54aec127c23269e926515ed26.tar.gz gentoo-0de8be361ceb11c54aec127c23269e926515ed26.tar.bz2 gentoo-0de8be361ceb11c54aec127c23269e926515ed26.zip | |
app-crypt/pinentry: Fix Qt4 support
Pinentry 0.9.6 introduced automatic detection of Qt version and added support
for Qt5 using automagic. This revbump removes Qt5 support and explicitly
require Qt4 as in previous versions until this can be set using USE flag
to get proper dependencies.
Additionally upstream renamed the pinentry-qt4 binary to pinentry-qt, so a
symlink is generated to ensure backwards compatibility.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-crypt/pinentry/files')
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch b/app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch new file mode 100644 index 000000000000..802e6ff19618 --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch @@ -0,0 +1,27 @@ +From 41aa99a1886fa07aad5716fb4905843ecfcbffb2 Mon Sep 17 00:00:00 2001 +From: Kristian Fiskerstrand <kristian.fiskerstrand@sumptuouscapital.com> +Date: Fri, 18 Sep 2015 17:22:11 +0200 +Subject: [PATCH] Disable Qt5 support to force Qt4 for now + +Automagic applies in detecting Qt5 which makes dependency specification +difficult. Disabling the auto-detection for Qt5 and keeping Qt4 for now +--- + m4/qt.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/qt.m4 b/m4/qt.m4 +index 0a7ea99..e7abfcc 100644 +--- a/m4/qt.m4 ++++ b/m4/qt.m4 +@@ -30,7 +30,7 @@ AC_DEFUN([FIND_QT], + [ + PKG_CHECK_MODULES(PINENTRY_QT, + Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, +- [have_qt5_libs="yes"], ++ [have_qt5_libs="no"], + [have_qt5_libs="no"]) + + if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then +-- +2.4.6 + |