[git] GpgOL - branch, master, updated. gpgol-1.1.3-1-g7ada63a

by Werner Koch cvs at cvs.gnupg.org
Mon Apr 29 11:10:23 CEST 2013


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 extension for MS Outlook".

The branch, master has been updated
       via  7ada63ab3c958dfbad3dba9192427bed704dc3dd (commit)
      from  ad9ebe2ae7c02cea7405419bc8abec7889431738 (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 7ada63ab3c958dfbad3dba9192427bed704dc3dd
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 29 10:43:24 2013 +0200

    Changes to use the w64-mingw32 toolchain.
    
    * autogen.sh: Use i686-w64-mingw32 as default toolchain.
    * src/common.c (OEMRESOURCE): Add
    * src/ext-commands.cpp (_WIN32_IE): Define to 6.0

diff --git a/NEWS b/NEWS
index 6293cdc..56d0a8c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes for version 1.1.4 (unreleased)
+=================================================
+
+
 Noteworthy changes for version 1.1.3 (2011-12-27)
 =================================================
 
diff --git a/autogen.sh b/autogen.sh
index f4d7ace..e3e75d7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -62,7 +62,10 @@ if test "$1" = "--build-w32"; then
 
     # See whether we have the Debian cross compiler package or the
     # old mingw32/cpd system
-    if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then
+    if i686-w64-mingw32-gcc --version >/dev/null 2>&1 ; then
+        host=i686-w64-mingw32
+        crossbindir="crossbindir-is-not-anymore-needed"
+    elif i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then
         host=i586-mingw32msvc
         crossbindir=/usr/$host/bin
     else
@@ -88,8 +91,8 @@ if test "$1" = "--build-w32"; then
         fi
     fi
 
-    ./configure --enable-maintainer-mode --prefix=${w32root}  \
-             --host=i586-mingw32msvc --build=${build} \
+    $tsdir/configure --enable-maintainer-mode --prefix=${w32root}  \
+             --host=${host} --build=${build} \
              --with-gpg-error-prefix=${w32root} \
 	     --with-gpgme-prefix=${w32root} \
 	     --with-libassuan-prefix=${w32root}
diff --git a/configure.ac b/configure.ac
index 79eb8c7..ebec300 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ min_automake_version="1.9.4"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.1.3])
-m4_define([my_isgit], [no])
+m4_define([my_version], [1.1.4])
+m4_define([my_isgit], [yes])
 
 m4_define([git_commit], m4_esyscmd([git branch -v 2>/dev/null \
           | awk '/^\* / {printf "%s",$3}']))
diff --git a/src/common.c b/src/common.c
index 43239c7..68cae2d 100644
--- a/src/common.c
+++ b/src/common.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#define OEMRESOURCE    /* Required for OBM_CHECKBOXES.  */
 #include <windows.h>
 #include <shlobj.h>
 #ifndef CSIDL_APPDATA
diff --git a/src/ext-commands.cpp b/src/ext-commands.cpp
index 04140c5..85feb2d 100644
--- a/src/ext-commands.cpp
+++ b/src/ext-commands.cpp
@@ -21,7 +21,11 @@
 #include <config.h>
 #endif
 
-#define _WIN32_IE 0x400 /* Need TBIF_COMMAND et al.  */
+/* Need TBIF_COMMAND et al. (0x0400 would be sufficient but elsewhere
+   we require 0x600 anyway). */
+#ifndef _WIN32_IE
+# define _WIN32_IE 0x0600
+#endif
 #include <windows.h>
 
 #include "mymapi.h"

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

Summary of changes:
 NEWS                 |    4 ++++
 autogen.sh           |    9 ++++++---
 configure.ac         |    4 ++--
 src/common.c         |    1 +
 src/ext-commands.cpp |    6 +++++-
 5 files changed, 18 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org




More information about the Gnupg-commits mailing list