[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-188-g82d21f2

by Werner Koch cvs at cvs.gnupg.org
Wed May 15 16:43:10 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 for Windows".

The branch, master has been updated
       via  82d21f2e443cde5c73b2146127ec7e4a3a8d238a (commit)
      from  1c12d48044a47d2ff9fff6803fa03232c1ea4fff (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 82d21f2e443cde5c73b2146127ec7e4a3a8d238a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 15 16:24:39 2013 +0200

    Temporary fix for mingw off_t mess.
    
    * patches/gpgol-1.1.3/02-off_t.postcfg-build: New.
    * Makefile.am (EXTRA_DIST): Add patch
    --
    
    The problem with w64-mingw32's off_t hack is that it is incompatible
    to Windows.  It works nicely with most software but the DLL's using
    off_t in the public API (e.g. libgpgme) can't be used by MSVC build
    programs.  That is a regression.
    
    The tentative plan to fix this in gpgme is to use int32_t instead of
    off_t on Windows.

diff --git a/Makefile.am b/Makefile.am
index f69d03e..68216c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
 	patches/dirmngr-1.1.0/01-mmap.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch \
         patches/gpgol-1.1.3/01-w64-ming64.patch  \
+        patches/gpgol-1.1.3/02-off_t.postcfg-build \
         patches/gpa-0.9.0/01-title-prop.patch \
 	patches/libetpan-0.57/01-gnutls_compat.patch \
         patches/scute-1.2.0/01-bugfixes.patch \
diff --git a/patches/gpgol-1.1.3/02-off_t.postcfg-build b/patches/gpgol-1.1.3/02-off_t.postcfg-build
new file mode 100755
index 0000000..da91dac
--- /dev/null
+++ b/patches/gpgol-1.1.3/02-off_t.postcfg-build
@@ -0,0 +1,6 @@
+#! /bin/sh
+#
+# Hack to force 64 bit off_t for gpgol
+#
+set -e
+echo '#define _FILE_OFFSET_BITS 64' >>config.h

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

Summary of changes:
 Makefile.am                                |    1 +
 patches/gpgol-1.1.3/02-off_t.postcfg-build |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100755 patches/gpgol-1.1.3/02-off_t.postcfg-build


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



More information about the Gpg4win-commits mailing list