gpg4libre: remove silly afxres.h / MFC dependency from gpgme

Change-Id: Ibc74b89aca6a26952c27cd313f7c8203a507641d
Reviewed-on: https://gerrit.libreoffice.org/45458Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 4c7289c3)
Reviewed-on: https://gerrit.libreoffice.org/45766Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

external/gpgmepp/UnpackedTarball_gpgmepp.mk

@@ -22,5 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-win32-macro.patch.1) \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \
     $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \
+    external/gpgmepp/w32-build-fixes-2.patch \
 ))
 # vim: set noet sw=4 ts=4:

external/gpgmepp/w32-build-fixes-2.patch

+Avoid MFC dependency - can go with very basic includes instead
+
+--- src/versioninfo.rc.in~	2017-03-28 15:12:30.000000000 +0200
++++ src/versioninfo.rc.in	2017-11-29 04:22:18.607421900 +0100
+@@ -14,7 +14,6 @@
+ 
+ #line __LINE__ "versioninfo.rc.in"
+ 
+-#include <afxres.h>
+ 
+ 
+ VS_VERSION_INFO VERSIONINFO

external/libassuan/UnpackedTarball_libassuan.mk

@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
     external/libassuan/find-libgpg-error.patch \
     external/libassuan/fix-autoconf-macros.patch \
     $(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
+    external/libassuan/w32-build-fixes-2.patch \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libassuan/w32-build-fixes-2.patch

+Avoid MFC dependency - can go with very basic includes instead
+
+--- src/versioninfo.rc.in~	2015-10-16 15:40:36.000000000 +0200
++++ src/versioninfo.rc.in	2017-11-29 04:19:57.870117200 +0100
+@@ -14,7 +14,6 @@
+ 
+ #line __LINE__ "versioninfo.rc.in"
+ 
+-#include <afxres.h>
+ 
+ 
+ VS_VERSION_INFO VERSIONINFO

external/libgpg-error/UnpackedTarball_libgpg-error.mk

@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
+	external/libgpg-error/w32-build-fixes-4.patch \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libgpg-error/w32-build-fixes-4.patch

+Avoid MFC dependency - can go with very basic includes instead
+
+--- src/versioninfo.rc.in~	2017-02-28 14:48:38.000000000 +0100
++++ src/versioninfo.rc.in	2017-11-29 01:41:47.549804600 +0100
+@@ -14,8 +14,6 @@
+ 
+ #line __LINE__ "versioninfo.rc.in"
+ 
+-#include <afxres.h>
+-
+ 
+ VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @BUILD_FILEVERSION@