Update pinentry to 0.9.0 and remove patches
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 9 Mar 2015 10:12:38 +0000 (11:12 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 9 Mar 2015 10:12:38 +0000 (11:12 +0100)
* packages/packages.current (pinentry): Update.
* patches/pinentry-0.8.4-beta8: Removed. All patches applied.

Makefile.am
packages/packages.current
patches/pinentry-0.8.4-beta8/0001-Set-some-accessibility-information.patch [deleted file]
patches/pinentry-0.8.4-beta8/0002-Use-raiseWindow-also-for-confirm-dialogs.patch [deleted file]
patches/pinentry-0.8.4-beta8/0003-Add-fallbacks-for-SetForegroundWindow.patch [deleted file]
patches/pinentry-0.8.4-beta8/0004-Check-for-MOC-also-if-pinentry-qt-is-disabled.patch [deleted file]

index e97a1b6..16f2984 100644 (file)
@@ -59,10 +59,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gpgme-1.5.1/0001-Handle-modern-keyserver-output-which-may-emit-the-fi.patch \
         patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
         patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
-        patches/pinentry-0.8.4-beta8/0001-Set-some-accessibility-information.patch \
-        patches/pinentry-0.8.4-beta8/0002-Use-raiseWindow-also-for-confirm-dialogs.patch \
-        patches/pinentry-0.8.4-beta8/0003-Add-fallbacks-for-SetForegroundWindow.patch \
-        patches/pinentry-0.8.4-beta8/0004-Check-for-MOC-also-if-pinentry-qt-is-disabled.patch \
         patches/pthreads-w32-2-8-0-release/01-make.patch \
         patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
 
index a1a4048..a1ac9c2 100644 (file)
@@ -427,9 +427,11 @@ chk  d065be185f5bac8ea07b210ab7756e79b83b63d4
 file dirmngr/dirmngr-1.1.1.tar.bz2
 chk  e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 
-# checked: 2014-07-16 ah (I don't think its unstable :P)
-file pinentry/unstable/pinentry-0.8.4-beta8.tar.bz2
-chk  de4ba5ef9a1ced4e4f8543feac553d4cf68dea00
+# last changed: 2015-03-09
+# by: ah
+# verified: Sig D869 2123 C406 5DEA 5E0F  3AB5 249B 39D2 4F25 E3B6
+file pinentry/pinentry-0.9.0.tar.bz2
+chk  f8e5c774c35fbb91d84e82559baf76f6b4513236
 
 # checked: 2014-07-16 ah
 file scute/scute-1.4.0.tar.bz2
diff --git a/patches/pinentry-0.8.4-beta8/0001-Set-some-accessibility-information.patch b/patches/pinentry-0.8.4-beta8/0001-Set-some-accessibility-information.patch
deleted file mode 100755 (executable)
index 8cbc22b..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 41d046022e912c76cb424c906064745e732f01f3 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Wed, 30 Jul 2014 11:34:26 +0200
-Subject: [PATCH] Set some accessibility information
-
-    * qt4/main.cpp (qt_cmd_handler): Build buttons with accessibile
-    Description.
-    * qt4/pinentrydialog.cpp (setDescription, setError, setOkText)
-    (setCancelText, setQualityBar): Set an accessible description.
-    * qt4/pinentryconfirm.cpp (PinentryConfirm): Set message
-    box contents also as accessible values.
-    * NEWS: Mention it and the copy/paste change from last year.
----
- NEWS                    | 4 +++-
- qt4/main.cpp            | 5 ++++-
- qt4/pinentryconfirm.cpp | 2 ++
- qt4/pinentrydialog.cpp  | 8 +++++++-
- 4 files changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index a9c0057..fbc3708 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,7 +1,9 @@
- Noteworthy changes in version 0.8.4 (unreleased)
- ------------------------------------------------
-
-- *
-+ * Qt4: New option to enable pasting the passphrase from clipboard
-+
-+ * Qt4: Improved accessiblity
-
-
- Noteworthy changes in version 0.8.3 (2013-04-26)
-diff --git a/qt4/main.cpp b/qt4/main.cpp
-index 7fdef37..106999e 100644
---- a/qt4/main.cpp
-+++ b/qt4/main.cpp
-@@ -215,8 +215,11 @@ qt_cmd_handler (pinentry_t pe)
-       };
-
-       for ( size_t i = 0 ; i < sizeof buttonLabels / sizeof *buttonLabels ; ++i )
--        if ( (buttons & buttonLabels[i].button) && !buttonLabels[i].label.isEmpty() )
-+        if ( (buttons & buttonLabels[i].button) && !buttonLabels[i].label.isEmpty() ) {
-             box.button( buttonLabels[i].button )->setText( buttonLabels[i].label );
-+            box.button( buttonLabels[i].button )->setAccessibleDescription ( buttonLabels[i].label );
-+
-+        }
-
-       box.setIconPixmap( icon() );
-
-diff --git a/qt4/pinentryconfirm.cpp b/qt4/pinentryconfirm.cpp
-index b22aef5..f7a1d63 100644
---- a/qt4/pinentryconfirm.cpp
-+++ b/qt4/pinentryconfirm.cpp
-@@ -29,6 +29,8 @@ PinentryConfirm::PinentryConfirm(Icon icon, int timeout, const QString &title,
-       connect(_timer, SIGNAL(timeout()), this, SLOT(slotTimeout()));
-       _timer->start(timeout*1000);
-     }
-+    setAccessibleDescription (desc);
-+    setAccessibleName (title);
- }
-
- void PinentryConfirm::slotTimeout()
-diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
-index a8dbb42..b16a74f 100644
---- a/qt4/pinentrydialog.cpp
-+++ b/qt4/pinentrydialog.cpp
-@@ -198,6 +198,7 @@ void PinEntryDialog::setDescription( const QString& txt )
- {
-   _desc->setVisible( !txt.isEmpty() );
-   _desc->setText( txt );
-+  _desc->setAccessibleDescription ( txt );
-   _icon->setPixmap( icon() );
-   setError( QString::null );
- }
-@@ -211,6 +212,7 @@ void PinEntryDialog::setError( const QString& txt )
- {
-   if( !txt.isNull() )_icon->setPixmap( icon( QStyle::SP_MessageBoxCritical ) );
-   _error->setText( txt );
-+  _error->setAccessibleDescription ( txt );
-   _error->setVisible( !txt.isEmpty() );
- }
-
-@@ -243,19 +245,23 @@ QString PinEntryDialog::prompt() const
- void PinEntryDialog::setOkText( const QString& txt )
- {
-   _ok->setText( txt );
-+  _ok->setAccessibleDescription ( txt );
-   _ok->setVisible( !txt.isEmpty() );
- }
-
- void PinEntryDialog::setCancelText( const QString& txt )
- {
-   _cancel->setText( txt );
-+  _cancel->setAccessibleDescription ( txt );
-   _cancel->setVisible( !txt.isEmpty() );
- }
-
- void PinEntryDialog::setQualityBar( const QString& txt )
- {
--  if (_have_quality_bar)
-+  if (_have_quality_bar) {
-     _quality_bar_label->setText( txt );
-+    _quality_bar_label->setAccessibleDescription ( txt );
-+  }
- }
-
- void PinEntryDialog::setQualityBarTT( const QString& txt )
---
-1.9.1
diff --git a/patches/pinentry-0.8.4-beta8/0002-Use-raiseWindow-also-for-confirm-dialogs.patch b/patches/pinentry-0.8.4-beta8/0002-Use-raiseWindow-also-for-confirm-dialogs.patch
deleted file mode 100755 (executable)
index 6be4a22..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 47476d2f288a22c29567ae2c179ce0472db4257e Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Wed, 6 Aug 2014 15:01:54 +0200
-Subject: [PATCH 2/3] Use raiseWindow also for confirm dialogs
-
-    This should fix the case that the dialog opened
-    in the foreground but a warning / confirm dialog
-    opened in the background.
-
-    * qt4/pinentryconfirm.cpp, qt4/pinentryconfirm.h (showEvent):
-    New overwrite base class method to call raiseWindow.
-    * NEWS: Mention this.
----
- NEWS                    | 1 +
- qt4/pinentryconfirm.cpp | 8 ++++++++
- qt4/pinentryconfirm.h   | 3 +++
- 3 files changed, 12 insertions(+)
-
-diff --git a/NEWS b/NEWS
-index fbc3708..2741f5c 100644
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,7 @@ Noteworthy changes in version 0.8.4 (unreleased)
-
-  * Qt4: Improved accessiblity
-
-+ * Qt4: Raise confirm message windows into foreground
-
- Noteworthy changes in version 0.8.3 (2013-04-26)
- ------------------------------------------------
-diff --git a/qt4/pinentryconfirm.cpp b/qt4/pinentryconfirm.cpp
-index f7a1d63..dfbd19f 100644
---- a/qt4/pinentryconfirm.cpp
-+++ b/qt4/pinentryconfirm.cpp
-@@ -18,6 +18,7 @@
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- #include "pinentryconfirm.h"
-+#include "pinentrydialog.h"
- #include <QAbstractButton>
-
- PinentryConfirm::PinentryConfirm(Icon icon, int timeout, const QString &title,
-@@ -31,6 +32,13 @@ PinentryConfirm::PinentryConfirm(Icon icon, int timeout, const QString &title,
-     }
-     setAccessibleDescription (desc);
-     setAccessibleName (title);
-+    raiseWindow (this);
-+}
-+
-+void PinentryConfirm::showEvent( QShowEvent* event )
-+{
-+    QDialog::showEvent( event );
-+    raiseWindow( this );
- }
-
- void PinentryConfirm::slotTimeout()
-diff --git a/qt4/pinentryconfirm.h b/qt4/pinentryconfirm.h
-index 3113750..44fb3ae 100644
---- a/qt4/pinentryconfirm.h
-+++ b/qt4/pinentryconfirm.h
-@@ -36,6 +36,9 @@ class PinentryConfirm : public QMessageBox
-
-     private:
-       QTimer *_timer;
-+
-+    protected:
-+    /* reimp */ void showEvent( QShowEvent* event );
- };
-
- #endif
---
-1.9.1
diff --git a/patches/pinentry-0.8.4-beta8/0003-Add-fallbacks-for-SetForegroundWindow.patch b/patches/pinentry-0.8.4-beta8/0003-Add-fallbacks-for-SetForegroundWindow.patch
deleted file mode 100755 (executable)
index 013e1bd..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From f4d14ffcf2e04b1938c00a0ef1504e0e932631fd Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Wed, 6 Aug 2014 15:05:25 +0200
-Subject: [PATCH 3/3] Add fallbacks for SetForegroundWindow
-
-    If that foreground window fails pinentry-qt now tries to
-    attach to the current foreground process and then tries
-    to set the foreground window again. If that fails it also
-    calls ShowWindow as a last resort.
-
-    * qt4/pinentrydialog.cpp (raiseWindow): Add fallbacks in
-    case SetForegroundWindow fails.
----
- NEWS                   |  3 +++
- qt4/pinentrydialog.cpp | 59 +++++++++++++++++++++++++++++++++-----------------
- 2 files changed, 42 insertions(+), 20 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 2741f5c..5bd874f 100644
---- a/NEWS
-+++ b/NEWS
-@@ -7,6 +7,9 @@ Noteworthy changes in version 0.8.4 (unreleased)
-
-  * Qt4: Raise confirm message windows into foreground
-
-+ * Qt4 (Windows): Improve the way pinentry-qt raises itself in
-+ the foreground.
-+
- Noteworthy changes in version 0.8.3 (2013-04-26)
- ------------------------------------------------
-
-diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
-index b16a74f..3a6dacc 100644
---- a/qt4/pinentrydialog.cpp
-+++ b/qt4/pinentrydialog.cpp
-@@ -45,31 +45,50 @@
-    versions.  This is the reason why gpg-agent employs its
-    AllowSetForegroundWindow callback machinery to ask the supposed to
-    be be calling process to allow a pinentry to go into the
--   foreground.  */
--// #ifdef Q_WS_WIN
--// void SetForegroundWindowEx( HWND hWnd )
--// {
--//    //Attach foreground window thread to our thread
--//    const DWORD ForeGroundID = GetWindowThreadProcessId(::GetForegroundWindow(),NULL);
--//    const DWORD CurrentID   = GetCurrentThreadId();
--
--//    AttachThreadInput ( ForeGroundID, CurrentID, TRUE );
--//    //Do our stuff here
--//    HWND hLastActivePopupWnd = GetLastActivePopup( hWnd );
--//    SetForegroundWindow( hLastActivePopupWnd );
--
--//    //Detach the attached thread
--//    AttachThreadInput ( ForeGroundID, CurrentID, FALSE );
--// }// End SetForegroundWindowEx
--// #endif
-+   foreground.
-
--void raiseWindow( QWidget* w )
--{
-+   [ah] This is a Hack to workaround the fact that Foregrounding
-+   a Window is so restricted that it AllowSetForegroundWindow
-+   does not always work (e.g. when the ForegroundWindow timeout
-+   has not expired.
-+   */
- #ifdef Q_WS_WIN
--    SetForegroundWindow( w->winId() );
-+WINBOOL SetForegroundWindowEx( HWND hWnd )
-+{
-+   //Attach foreground window thread to our thread
-+   const DWORD ForeGroundID = GetWindowThreadProcessId(::GetForegroundWindow(),NULL);
-+   const DWORD CurrentID   = GetCurrentThreadId();
-+   WINBOOL retval;
-+
-+   AttachThreadInput ( ForeGroundID, CurrentID, TRUE );
-+   //Do our stuff here
-+   HWND hLastActivePopupWnd = GetLastActivePopup( hWnd );
-+   retval = SetForegroundWindow( hLastActivePopupWnd );
-+
-+   //Detach the attached thread
-+   AttachThreadInput ( ForeGroundID, CurrentID, FALSE );
-+   return retval;
-+}// End SetForegroundWindowEx
- #endif
-+
-+void raiseWindow( QWidget* w )
-+{
-+    /* Maybe Qt will become agressive enough one day that
-+     * this is enough on windows too*/
-     w->raise();
-     w->activateWindow();
-+#ifdef Q_WS_WIN
-+    /* In the meantime we do our own attention grabbing */
-+    if (!SetForegroundWindow (w->winId()) &&
-+            !SetForegroundWindowEx (w->winId()))  {
-+        OutputDebugString("SetForegroundWindow (ex) failed");
-+        /* Yet another fallback which will not work on some
-+         * versions and is not recommended by msdn */
-+        if (!ShowWindow (w->winId(), SW_SHOWNORMAL)) {
-+            OutputDebugString ("ShowWindow failed.");
-+        }
-+    }
-+#endif
- }
-
- QPixmap icon( QStyle::StandardPixmap which )
---
-1.9.1
diff --git a/patches/pinentry-0.8.4-beta8/0004-Check-for-MOC-also-if-pinentry-qt-is-disabled.patch b/patches/pinentry-0.8.4-beta8/0004-Check-for-MOC-also-if-pinentry-qt-is-disabled.patch
deleted file mode 100755 (executable)
index d4eacea..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 52cf95c4fd97dc38856e72aa3e42a135d010df06 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Wed, 6 Aug 2014 16:09:55 +0200
-Subject: [PATCH 4/4] Check for MOC also if pinentry-qt is disabled
-
-  * configure.ac: Call QT_PATH_MOC if pinentry_qt4 is not no.
-
---
-  Previously the MOC lookup from m4/qt.m4 would only be called
-  if pinentry-qt was at least maybe. The MOC variable defined by
-  this macro is also used in pinentry-qt4 though.
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index b4133b0..595c2aa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -427,6 +427,7 @@ fi)
- fi
-
- if test "$pinentry_qt4" != "no"; then
-+QT_PATH_MOC
- PKG_CHECK_MODULES(QT4_GUI, QtGui,,
- if test "$pinentry_qt4" = "yes"; then
-     AC_MSG_ERROR([[
-diff -u a/configure.orig b/configure
---- a/configure.orig   2014-08-06 14:14:43.887295901 +0000
-+++ b/configure        2014-08-06 14:14:53.003225375 +0000
-@@ -11081,6 +11081,72 @@
-
- if test "$pinentry_qt4" != "no"; then
-
-+   qt_bindirs=""
-+   for dir in $qt_dirs; do
-+      qt_bindirs="$qt_bindirs:$dir/bin:$dir/src/moc"
-+   done
-+   qt_bindirs="$qt_bindirs:/usr/bin:/usr/X11R6/bin:/usr/local/qt/bin"
-+   if test ! "$ac_qt_bindir" = "NO"; then
-+      qt_bindirs="$ac_qt_bindir:$qt_bindirs"
-+   fi
-+
-+   # Extract the first word of "moc", so it can be a program name with args.
-+set dummy moc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_MOC+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MOC in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MOC="$MOC" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $qt_bindirs
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no"
-+  ;;
-+esac
-+fi
-+MOC=$ac_cv_path_MOC
-+if test -n "$MOC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5
-+$as_echo "$MOC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+   if test "$MOC" = no; then
-+    #AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-+    #Please check whether you installed Qt correctly.
-+    #You need to have a running moc binary.
-+    #configure tried to run $ac_cv_path_moc and the test didn't
-+    #succeed. If configure shouldn't have tried this one, set
-+    #the environment variable MOC to the right one before running
-+    #configure.
-+    #])
-+    have_moc="no"
-+   else
-+    have_moc="yes"
-+
-+   fi
-+
-+
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4_GUI" >&5
- $as_echo_n "checking for QT4_GUI... " >&6; }