[arch-commits] Commit in pinentry/repos (8 files)
Tobias Powalowski
tpowa at archlinux.org
Fri May 25 12:44:10 UTC 2012
Date: Friday, May 25, 2012 @ 08:44:10
Author: tpowa
Revision: 159496
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
pinentry/repos/testing-i686/
pinentry/repos/testing-i686/PKGBUILD
(from rev 159495, pinentry/trunk/PKGBUILD)
pinentry/repos/testing-i686/pinentry.install
(from rev 159495, pinentry/trunk/pinentry.install)
pinentry/repos/testing-i686/qt4-pinentry-window.patch
(from rev 159495, pinentry/trunk/qt4-pinentry-window.patch)
pinentry/repos/testing-x86_64/
pinentry/repos/testing-x86_64/PKGBUILD
(from rev 159495, pinentry/trunk/PKGBUILD)
pinentry/repos/testing-x86_64/pinentry.install
(from rev 159495, pinentry/trunk/pinentry.install)
pinentry/repos/testing-x86_64/qt4-pinentry-window.patch
(from rev 159495, pinentry/trunk/qt4-pinentry-window.patch)
------------------------------------------+
testing-i686/PKGBUILD | 40 +++++++++++++++++++++++++++++
testing-i686/pinentry.install | 20 ++++++++++++++
testing-i686/qt4-pinentry-window.patch | 28 ++++++++++++++++++++
testing-x86_64/PKGBUILD | 40 +++++++++++++++++++++++++++++
testing-x86_64/pinentry.install | 20 ++++++++++++++
testing-x86_64/qt4-pinentry-window.patch | 28 ++++++++++++++++++++
6 files changed, 176 insertions(+)
Copied: pinentry/repos/testing-i686/PKGBUILD (from rev 159495, pinentry/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-05-25 12:44:10 UTC (rev 159496)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pinentry
+pkgver=0.8.1
+pkgrel=4
+pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnupg.org/aegypten2"
+depends=('ncurses' 'libcap>=2.16')
+makedepends=('gtk2' 'qt')
+optdepends=('gtk2: for gtk2 backend'
+ 'qt: for qt4 backend')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+ qt4-pinentry-window.patch)
+install=pinentry.install
+
+build() {
+ 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
+ ./configure --prefix=/usr \
+ --enable-pinentry-curses \
+ --disable-pinentry-gtk \
+ --disable-pinentry-qt \
+ --enable-pinentry-gtk2 \
+ --enable-pinentry-qt4 \
+ --enable-fallback-curses
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+}
+md5sums=('81f99904daee5331eb6738408bb024b6'
+ '450b8713fe42f1bd93311ef84767c3d8')
Copied: pinentry/repos/testing-i686/pinentry.install (from rev 159495, pinentry/trunk/pinentry.install)
===================================================================
--- testing-i686/pinentry.install (rev 0)
+++ testing-i686/pinentry.install 2012-05-25 12:44:10 UTC (rev 159496)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(pinentry.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
Copied: pinentry/repos/testing-i686/qt4-pinentry-window.patch (from rev 159495, pinentry/trunk/qt4-pinentry-window.patch)
===================================================================
--- testing-i686/qt4-pinentry-window.patch (rev 0)
+++ testing-i686/qt4-pinentry-window.patch 2012-05-25 12:44:10 UTC (rev 159496)
@@ -0,0 +1,28 @@
+From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at 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
+
Copied: pinentry/repos/testing-x86_64/PKGBUILD (from rev 159495, pinentry/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-05-25 12:44:10 UTC (rev 159496)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pinentry
+pkgver=0.8.1
+pkgrel=4
+pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnupg.org/aegypten2"
+depends=('ncurses' 'libcap>=2.16')
+makedepends=('gtk2' 'qt')
+optdepends=('gtk2: for gtk2 backend'
+ 'qt: for qt4 backend')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+ qt4-pinentry-window.patch)
+install=pinentry.install
+
+build() {
+ 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
+ ./configure --prefix=/usr \
+ --enable-pinentry-curses \
+ --disable-pinentry-gtk \
+ --disable-pinentry-qt \
+ --enable-pinentry-gtk2 \
+ --enable-pinentry-qt4 \
+ --enable-fallback-curses
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+}
+md5sums=('81f99904daee5331eb6738408bb024b6'
+ '450b8713fe42f1bd93311ef84767c3d8')
Copied: pinentry/repos/testing-x86_64/pinentry.install (from rev 159495, pinentry/trunk/pinentry.install)
===================================================================
--- testing-x86_64/pinentry.install (rev 0)
+++ testing-x86_64/pinentry.install 2012-05-25 12:44:10 UTC (rev 159496)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(pinentry.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
Copied: pinentry/repos/testing-x86_64/qt4-pinentry-window.patch (from rev 159495, pinentry/trunk/qt4-pinentry-window.patch)
===================================================================
--- testing-x86_64/qt4-pinentry-window.patch (rev 0)
+++ testing-x86_64/qt4-pinentry-window.patch 2012-05-25 12:44:10 UTC (rev 159496)
@@ -0,0 +1,28 @@
+From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at 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
+
More information about the arch-commits
mailing list