diff options
| author | Thorsten Behrens <thorsten.behrens@cib.de> | 2017-11-29 04:48:26 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-04 03:27:12 +0100 |
| commit | 4c7289c3d769217045e3c4f3fc3a3ab5108600f7 (patch) | |
| tree | 11c7192244ad255ed445a2a45fd4252cda45f29d /external/libgpg-error | |
| parent | 04982dc8f56e3a960b4d42b0ec57fc5cb8a01aa3 (diff) | |
gpg4libre: remove silly afxres.h / MFC dependency from gpgme
Change-Id: Ibc74b89aca6a26952c27cd313f7c8203a507641d
Reviewed-on: https://gerrit.libreoffice.org/45458
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external/libgpg-error')
| -rw-r--r-- | external/libgpg-error/UnpackedTarball_libgpg-error.mk | 1 | ||||
| -rw-r--r-- | external/libgpg-error/w32-build-fixes-4.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk index 02ad356444ee..dadef68689d7 100644 --- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk +++ b/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: diff --git a/external/libgpg-error/w32-build-fixes-4.patch b/external/libgpg-error/w32-build-fixes-4.patch new file mode 100644 index 000000000000..1d4e052a560f --- /dev/null +++ b/external/libgpg-error/w32-build-fixes-4.patch @@ -0,0 +1,13 @@ +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@ |