diff options
| author | Thorsten Behrens <thorsten.behrens@cib.de> | 2017-11-29 04:48:26 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-12-04 23:30:04 +0100 |
| commit | 6fabdde7c7748ad55140f814c2eee74ccc2a0821 (patch) | |
| tree | 48f2d4a28e1cc0e63083f5009abd7ea611de0197 | |
| parent | a76e28636a4f3c293b9e10135ca9100885289136 (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>
(cherry picked from commit 4c7289c3d769217045e3c4f3fc3a3ab5108600f7)
Reviewed-on: https://gerrit.libreoffice.org/45766
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 | ||||
| -rw-r--r-- | external/gpgmepp/w32-build-fixes-2.patch | 12 | ||||
| -rw-r--r-- | external/libassuan/UnpackedTarball_libassuan.mk | 1 | ||||
| -rw-r--r-- | external/libassuan/w32-build-fixes-2.patch | 12 | ||||
| -rw-r--r-- | external/libgpg-error/UnpackedTarball_libgpg-error.mk | 1 | ||||
| -rw-r--r-- | external/libgpg-error/w32-build-fixes-4.patch | 13 |
6 files changed, 40 insertions, 0 deletions
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index 8f69b8d2af96..bcddcca1a218 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/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: diff --git a/external/gpgmepp/w32-build-fixes-2.patch b/external/gpgmepp/w32-build-fixes-2.patch new file mode 100644 index 000000000000..062c14409cbc --- /dev/null +++ b/external/gpgmepp/w32-build-fixes-2.patch @@ -0,0 +1,12 @@ +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 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 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@ |