[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - configure.ac external/gpgmepp external/libassuan external/libgpg-error
Thorsten Behrens
Thorsten.Behrens at CIB.de
Mon Dec 4 22:30:55 UTC 2017
configure.ac | 6 ++----
external/gpgmepp/UnpackedTarball_gpgmepp.mk | 1 +
external/gpgmepp/w32-build-fixes-2.patch | 12 ++++++++++++
external/libassuan/UnpackedTarball_libassuan.mk | 1 +
external/libassuan/w32-build-fixes-2.patch | 12 ++++++++++++
external/libgpg-error/UnpackedTarball_libgpg-error.mk | 1 +
external/libgpg-error/w32-build-fixes-4.patch | 13 +++++++++++++
7 files changed, 42 insertions(+), 4 deletions(-)
New commits:
commit e045e971a69f75d36069ed005d014ae3a682d944
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Tue Nov 28 16:02:43 2017 +0100
Remove arch-pinning for gpgme on Windows again
With e0d94237878d4949573fc9b6d97eea3146cada6d the dependency on gcc
is gone, so we should be able to build on all cygwin flavours again
for all Windows arch targets.
Well almost - we still have windres on cygwin32 only able to produce
pe-i386 targets, so let's exclude the case cyg32 and WIN64 for the
moment.
Change-Id: Ibe7f967585995586985177d4c36cc33d9850d9de
Reviewed-on: https://gerrit.libreoffice.org/45422
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 8444bf1d7314f7ff2ea4d17da19b4d276c4086ae)
Reviewed-on: https://gerrit.libreoffice.org/45768
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/configure.ac b/configure.ac
index 20a730cb8678..d0caf9491ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10138,11 +10138,9 @@ fi
AC_SUBST(ENABLE_PDFIUM)
SYSTEM_GPGMEPP=
-# need matching cygwin arch for building gpgme sadly, for the while
if test "$_os" = "Linux" -o "$_os" = "Darwin" \
- -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) \
- -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" -a "$WINDOWS_SDK_ARCH" = "x64" \) ; then
-
+ -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
+ -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) ; then
dnl ===================================================================
dnl Check for system gpgme
dnl ===================================================================
commit 6fabdde7c7748ad55140f814c2eee74ccc2a0821
Author: Thorsten Behrens <thorsten.behrens at cib.de>
Date: Wed Nov 29 04:48:26 2017 +0100
gpg4libre: remove silly afxres.h / MFC dependency from gpgme
Change-Id: Ibc74b89aca6a26952c27cd313f7c8203a507641d
Reviewed-on: https://gerrit.libreoffice.org/45458
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 4c7289c3d769217045e3c4f3fc3a3ab5108600f7)
Reviewed-on: https://gerrit.libreoffice.org/45766
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
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@
More information about the Libreoffice-commits
mailing list