[arch-commits] Commit in pinentry/repos (7 files)

Tobias Powalowski tpowa at archlinux.org
Wed Jun 6 10:36:53 UTC 2012


    Date: Wednesday, June 6, 2012 @ 06:36:53
  Author: tpowa
Revision: 160802

db-move: moved pinentry from [testing] to [core] (x86_64)

Added:
  pinentry/repos/core-x86_64/PKGBUILD
    (from rev 160800, pinentry/repos/testing-x86_64/PKGBUILD)
  pinentry/repos/core-x86_64/pinentry.install
    (from rev 160800, pinentry/repos/testing-x86_64/pinentry.install)
  pinentry/repos/core-x86_64/qt4-pinentry-window.patch
    (from rev 160800, pinentry/repos/testing-x86_64/qt4-pinentry-window.patch)
Deleted:
  pinentry/repos/core-x86_64/PKGBUILD
  pinentry/repos/core-x86_64/gtk2-pinentry-segfault.patch
  pinentry/repos/core-x86_64/pinentry.install
  pinentry/repos/testing-x86_64/

------------------------------+
 PKGBUILD                     |   77 +++++++++++++++++++++--------------------
 gtk2-pinentry-segfault.patch |   11 -----
 pinentry.install             |   40 ++++++++++-----------
 qt4-pinentry-window.patch    |   28 ++++++++++++++
 4 files changed, 88 insertions(+), 68 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-06-06 10:36:52 UTC (rev 160801)
+++ core-x86_64/PKGBUILD	2012-06-06 10:36:53 UTC (rev 160802)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=pinentry
-pkgver=0.8.1
-pkgrel=3
-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
-        gtk2-pinentry-segfault.patch)
-install=pinentry.install
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  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 
-  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')

Copied: pinentry/repos/core-x86_64/PKGBUILD (from rev 160800, pinentry/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-06-06 10:36:53 UTC (rev 160802)
@@ -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')

Deleted: core-x86_64/gtk2-pinentry-segfault.patch
===================================================================
--- core-x86_64/gtk2-pinentry-segfault.patch	2012-06-06 10:36:52 UTC (rev 160801)
+++ core-x86_64/gtk2-pinentry-segfault.patch	2012-06-06 10:36:53 UTC (rev 160802)
@@ -1,11 +0,0 @@
---- gtk+-2/pinentry-gtk-2.c.orig	2010-03-03 05:19:55.000000000 -0600
-+++ gtk+-2/pinentry-gtk-2.c	2010-07-07 00:11:30.413572124 -0500
-@@ -145,7 +145,7 @@
- {
-   gdk_keyboard_ungrab (gdk_event_get_time (event));
-   /* Unmake window transient for the root window.  */
--  gdk_window_set_transient_for (win->window, NULL);
-+  gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
- }
- 
- 

Deleted: core-x86_64/pinentry.install
===================================================================
--- core-x86_64/pinentry.install	2012-06-06 10:36:52 UTC (rev 160801)
+++ core-x86_64/pinentry.install	2012-06-06 10:36:53 UTC (rev 160802)
@@ -1,20 +0,0 @@
-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/core-x86_64/pinentry.install (from rev 160800, pinentry/repos/testing-x86_64/pinentry.install)
===================================================================
--- core-x86_64/pinentry.install	                        (rev 0)
+++ core-x86_64/pinentry.install	2012-06-06 10:36:53 UTC (rev 160802)
@@ -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/core-x86_64/qt4-pinentry-window.patch (from rev 160800, pinentry/repos/testing-x86_64/qt4-pinentry-window.patch)
===================================================================
--- core-x86_64/qt4-pinentry-window.patch	                        (rev 0)
+++ core-x86_64/qt4-pinentry-window.patch	2012-06-06 10:36:53 UTC (rev 160802)
@@ -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