[Gpg4win-commits] [git] Gpg4win - branch, gpg4win-2, updated. gpg4win-2.3.3-2-g140c45e

[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 "GnuPG for Windows".

The branch, gpg4win-2 has been updated
       via  140c45e243bda9b8d03e6e9738f03448d18464e0 (commit)
      from  a10c092a8a388623e8b65c0e18dda0673c397b19 (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 140c45e243bda9b8d03e6e9738f03448d18464e0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 18 09:59:16 2016 +0200

    Don't require winpthread in stable branch
    
    * configure.ac, src/inst-gpg4win.nsi, src/unist-gpg4win.nsi:
    Remove winpthread.
    --
    Stable is supposed to be build on debian wheezy where winpthread
    is not pulled in as a dependency by mingw.

diff --git a/configure.ac b/configure.ac
index b4027c5..78dc17e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,7 +260,6 @@ done
 # Additional runtime libraries from mingw.
 GPG4WIN_RUNTIME_LIBRARY(libgcc_s_sjlj-1)
 GPG4WIN_RUNTIME_LIBRARY(libstdc++-6)
-GPG4WIN_RUNTIME_LIBRARY(libwinpthread-1)
 
 AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
 AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index 0e63295..cf9e93e 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -91,7 +91,6 @@ Section "-gpg4win" SEC_gpg4win
   # list symbol names.
   File /oname=libstdc++-6.dll     "${BUILD_DIR}/libstdc++-6.dll-x"
   File /oname=libgcc_s_sjlj-1.dll "${BUILD_DIR}/libgcc_s_sjlj-1.dll-x"
-  File /oname=libwinpthread-1.dll "${BUILD_DIR}/libwinpthread-1.dll-x"
 
 !endif
 
diff --git a/src/uninst-gpg4win.nsi b/src/uninst-gpg4win.nsi
index ba54fd4..2ab0f9e 100644
--- a/src/uninst-gpg4win.nsi
+++ b/src/uninst-gpg4win.nsi
@@ -39,7 +39,6 @@ Section "-un.gpg4win"
   # Delete the runtime libaries
   Delete "$INSTDIR\libstdc++-6.dll"
   Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libwinpthread-1.dll"
 
   # Delete standard stuff.
   Delete "$INSTDIR\share\gpg4win\README.*.txt"

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

Summary of changes:
 configure.ac           | 1 -
 src/inst-gpg4win.nsi   | 1 -
 src/uninst-gpg4win.nsi | 1 -
 3 files changed, 3 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org