diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-08 00:01:46 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-08 00:01:46 +0000 |
| commit | 7d11e9346ebd0f9c378952caee0c82d6ca815f4e (patch) | |
| tree | 37cbc273cef015a41013f52ed6a90fb16eca34f4 /core/pinentry | |
| parent | 334c2a7916a80d08b1c216cfbf02135e64891632 (diff) | |
Fri Jun 8 00:01:46 UTC 2012
Diffstat (limited to 'core/pinentry')
| -rw-r--r-- | core/pinentry/PKGBUILD | 21 | ||||
| -rw-r--r-- | core/pinentry/qt4-pinentry-window.patch | 28 |
2 files changed, 40 insertions, 9 deletions
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD index c94625d29..072a2b244 100644 --- a/core/pinentry/PKGBUILD +++ b/core/pinentry/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146747 2012-01-16 22:52:55Z dreisner $ +# $Id: PKGBUILD 160802 2012-06-06 10:36:53Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry pkgver=0.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64') license=('GPL') @@ -12,11 +12,13 @@ makedepends=('gtk2' 'qt') optdepends=('gtk2: for gtk2 backend' 'qt: for qt4 backend') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz - gtk2-pinentry-segfault.patch) + qt4-pinentry-window.patch) install=pinentry.install build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + #fix: https://bugs.archlinux.org/task/29998 + patch -Np1 -i ../qt4-pinentry-window.patch for file in qt4/*.moc; do /usr/bin/moc ${file/.moc/.h} > ${file} done @@ -27,11 +29,12 @@ build() { --enable-pinentry-gtk2 \ --enable-pinentry-qt4 \ --enable-fallback-curses - make + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install - #rm ${pkgdir}/usr/share/info/dir - #rm ${pkgdir}/usr/bin/pinentry - #ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry } md5sums=('81f99904daee5331eb6738408bb024b6' - 'bd9888fafc56464b2c4deaad5b8edb07') + '450b8713fe42f1bd93311ef84767c3d8') diff --git a/core/pinentry/qt4-pinentry-window.patch b/core/pinentry/qt4-pinentry-window.patch new file mode 100644 index 000000000..8f9faae11 --- /dev/null +++ b/core/pinentry/qt4-pinentry-window.patch @@ -0,0 +1,28 @@ +From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky@redhat.com> +Date: Tue, 1 Feb 2011 14:42:27 +0100 +Subject: [PATCH] Fix qt4 pinentry window created in the background + +This is probably just a workaround. Proper fix is being investigated. +See: +https://bugzilla.redhat.com/show_bug.cgi?id=589532 +http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background +--- + qt4/pinentrydialog.cpp | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp +index 541baf4..d634eb6 100644 +--- a/qt4/pinentrydialog.cpp ++++ b/qt4/pinentrydialog.cpp +@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) + SetForegroundWindow( w->winId() ); + #endif + w->raise(); +- w->activateWindow(); + } + + QPixmap icon( QStyle::StandardPixmap which ) +-- +1.7.3.5 + |