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/libassuan | |
| 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/libassuan')
| -rw-r--r-- | external/libassuan/UnpackedTarball_libassuan.mk | 1 | ||||
| -rw-r--r-- | external/libassuan/w32-build-fixes-2.patch | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/libassuan/UnpackedTarball_libassuan.mk b/external/libassuan/UnpackedTarball_libassuan.mk index f23608eb6a6c..b969fecc6097 100644 --- a/external/libassuan/UnpackedTarball_libassuan.mk +++ b/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: diff --git a/external/libassuan/w32-build-fixes-2.patch b/external/libassuan/w32-build-fixes-2.patch new file mode 100644 index 000000000000..918405d15193 --- /dev/null +++ b/external/libassuan/w32-build-fixes-2.patch @@ -0,0 +1,12 @@ +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 |