[git] Pinentry - branch, master, updated. pinentry-0.9.5-17-g13e0980

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  13e09800a997845906bfb10ac3379bad00e6e63d (commit)
       via  11886c530de3b0a7c4dcd932c5c23762f3ccc4b0 (commit)
       via  8d73d2a55a0043202c08beaed9972343b1021327 (commit)
      from  78afb80e5742f8542f21537307c6f39c05c1a7f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 13e09800a997845906bfb10ac3379bad00e6e63d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 18 20:15:08 2015 +0200

    Clarify comment about fds in pinentry_loop2
    
    * pinentry/pinentry.h (pinetry_loop2): Clarify comment.

diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h
index 98db4bc..e154ac5 100644
--- a/pinentry/pinentry.h
+++ b/pinentry/pinentry.h
@@ -212,7 +212,8 @@ typedef int (*pinentry_cmd_handler_t) (pinentry_t pin);
 int pinentry_loop (void);
 
 /* The same as above but allows to specify the i/o descriptors.
- * assuan_fdopen will be called on infd and outfd.
+ * infd and outfd will be duplicated in this function so the caller
+ * still has to close them if necessary.
  */
 int pinentry_loop2 (int infd, int outfd);
 

commit 11886c530de3b0a7c4dcd932c5c23762f3ccc4b0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 18 19:54:04 2015 +0200

    Qt: Make it possible to build qt5 variant static
    
    * qt/main.cpp: Import static platform plugins when necessary.
    
    --
    As pkg-config does not expose all libraries needed to link
    qt5 statically with this patch it is possible to get a
    static build by setting the LIBS variable correctly.

diff --git a/qt/main.cpp b/qt/main.cpp
index 0500b7a..70e08de 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -50,6 +50,19 @@
 #include <pinentry-curses.h>
 #endif
 
+#if QT_VERSION >= 0x050000 && defined(QT_STATIC)
+  #include <QtPlugin>
+  #ifdef Q_OS_WIN
+    #include <windows.h>
+    #include <shlobj.h>
+    Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+  #elif defined(Q_OS_MAC)
+    Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
+  #else
+    Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
+  #endif
+#endif
+
 static QString escape_accel( const QString & s ) {
 
   QString result;

commit 8d73d2a55a0043202c08beaed9972343b1021327
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 18 19:47:42 2015 +0200

    Respect SYSROOT variable when looking for assuan
    
    * m4/libassuan.m4: Respect SYSROOT Variable.
    
    --
    This change makes the libassuan lookup work similar
    to the libgpg-error lookup simplifying cross-compiling
    a bit.

diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index d3d8f2e..c953843 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -24,6 +24,19 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
     if test x${LIBASSUAN_CONFIG+set} != xset ; then
       LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
     fi
+  else
+    case "${SYSROOT}" in
+       /*)
+         if test -x "${SYSROOT}/bin/libassuan-config" ; then
+           LIBASSUAN_CONFIG="${SYSROOT}/bin/libassuan-config"
+         fi
+         ;;
+       '')
+         ;;
+        *)
+         AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+         ;;
+     esac
   fi
 
   AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
@@ -105,7 +118,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
 *** built for $libassuan_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libassuan-prefix
-*** to specify a matching config script.
+*** to specify a matching config script or use \$SYSROOT.
 ***]])
         fi
       fi

-----------------------------------------------------------------------

Summary of changes:
 m4/libassuan.m4     | 15 ++++++++++++++-
 pinentry/pinentry.h |  3 ++-
 qt/main.cpp         | 13 +++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org