[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp external/libassuan external/libgpg-error

2018-05-08 Thread Stephan Bergmann 
 external/gpgmepp/ExternalPackage_gpgmepp.mk   |6 ++
 external/gpgmepp/ExternalProject_gpgmepp.mk   |1 +
 external/gpgmepp/UnpackedTarball_gpgmepp.mk   |1 +
 external/gpgmepp/rpath.patch  |   12 
 external/libassuan/UnpackedTarball_libassuan.mk   |1 +
 external/libassuan/rpath.patch|   11 +++
 external/libgpg-error/ExternalProject_libgpg-error.mk |3 ---
 external/libgpg-error/UnpackedTarball_libgpg-error.mk |1 -
 external/libgpg-error/disable-rpath-option.patch  |   13 -
 9 files changed, 32 insertions(+), 17 deletions(-)

New commits:
commit 4f7028dd292e22f09cd505b529d93713747ebd6b
Author: Stephan Bergmann 
Date:   Thu Mar 8 14:17:07 2018 +0100

Related tdf#117105 fix RPATHS of gpgme and assuan

libgpg-error doesn't need RPATH at all

...as it doesn't link against any of our libs

Change-Id: Iaf0df9d5dc5eefb976d2041f24b2921cb3e3b1ba
Reviewed-on: https://gerrit.libreoffice.org/50953
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 5a13e78562bdd0871ad5866676a8a50659692af9)

Remove apparently unused external/libgpg-error/disable-rpath-option.patch

...which only patched configure.ac not configure, and the latter does not 
appear
to be regenerated from the former in ExternalProject_libgpg-error

Change-Id: Id0132ed8fd8ea3a5012e4a2bc309bd5f3983ad11
Reviewed-on: https://gerrit.libreoffice.org/50954
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4cb1f0a5ff1c3e74c650f17d9a164e97c34e9327)

Fix external/libassuan Linux RPATH

In other external projects using libtool, we fix that by patching configure,
resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case 
block
that sets the Linux-specific value.  But here we run autoreconf in
ExternalProject_libassuan, so that patch in configure would be overwritten. 
 The
relevant code in configure comes from autoconf boilerplate, so we cannot 
just do
the same patch in configure.ac.  But we can reset hardcode_libdir_flag_spec
sufficiently late in configure.ac so that things still work as intended.

Reviewed-on: https://gerrit.libreoffice.org/50959
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 24d0704fa468b300558a3f904ae853fcb7fca312)

Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa

Improve gpgmepp -> libassuan/libgpg-error lib dependencies

...so that other executables than svidl would benefit, too

Change-Id: I208ebbc04189c2f25eace19ef0875349cf63d3f0
Reviewed-on: https://gerrit.libreoffice.org/50963
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 598cf9f76176c6bef00402755d0e941a036c6a2d)

Fix external/gpgmepp Linux RPATH

In other external projects using libtool, we fix that by patching configure,
resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case 
block
that sets the Linux-specific value.  But here we run autoreconf in
ExternalProject_libassuan, so that patch in configure would be overwritten. 
 The
relevant code in configure comes from autoconf boilerplate, so we cannot 
just do
the same patch in configure.ac.  But we can reset hardcode_libdir_flag_spec
sufficiently late in configure.ac so that things still work as intended.

Disable tests that would build executabes linking against libgpgme.so, 
which in
turn links against the libassuan and libgpg-error libs, which would no 
longer be
found by the linker because of the dropped -rpath flags.  (Alternatives 
might
be to pass in LD_LIBRARY_PATH or to link with --allow-shlib-undefined.)

Reviewed-on: https://gerrit.libreoffice.org/50960
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit d4347f5d585232e1b025b4199ded53e6619d6242)

Change-Id: I7e37abf802d213347bd80383b7980d85cf0762d4
Reviewed-on: https://gerrit.libreoffice.org/53789
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk 
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 3e841b5d98df..67c3dc64ffd3 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -29,6 +29,12 @@ $(eval $(call 
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32sp
 
 endif

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp external/libassuan external/libgpg-error

2017-12-04 Thread Thorsten Behrens 
 external/gpgmepp/ExternalProject_gpgmepp.mk   |8 +---
 external/libassuan/ExternalProject_libassuan.mk   |   11 ++-
 external/libgpg-error/ExternalProject_libgpg-error.mk |   12 +---
 3 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 29228e83df009cf76ac819ed024527be1092f065
Author: Thorsten Behrens 
Date:   Mon Dec 4 00:12:10 2017 +0100

gpg4libre: pass windows arch down to windres

At least for cygwin64 windres, a wider number of cross-building
targets are supported. Utilize that for getting suitable versionrc
arch built, obviating the need to disable x86_64 on cyg32 and vice
versa.

Change-Id: I9770a3c1d6602a9747b5b3caa4961d66c471f4e4
Reviewed-on: https://gerrit.libreoffice.org/45763
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 293df86b2ec38727f3b966b2c272ab4b05b227b7)
Reviewed-on: https://gerrit.libreoffice.org/45767
Reviewed-by: Katarina Behrens 

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 7aaa42a12b40..806cd6817e3b 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_ExternalProject_use_externals,gpgmepp,\
 ))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_gpgmepp_host := $(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_gpgmepp_target := $(if $(filter 
INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call 
gb_Executable_get_target,cpp)
$(call gb_ExternalProject_run,build,\
autoreconf \
@@ -37,10 +39,10 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): 
$(call gb_Executable_

$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
$(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
-  --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+  --host=$(gb_ExternalProject_libgpg-error_host) \
+  RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
   MAKE=$(MAKE) \
-  RC='windres --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) 
-I$(ATL_INCLUDE)'\' \
- && $(MAKE) \
+   && $(MAKE) \
)
 else
 $(call gb_ExternalProject_get_state_target,gpgmepp,build):
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index fdadb2851042..f477280c0172 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -20,22 +20,23 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\
 ))
 
 ifeq ($(COM),MSC)
+gb_ExternalProject_libassuan_host := $(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
+gb_ExternalProject_libassuan_target := $(if $(filter 
INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,libassuan,build): $(call 
gb_Executable_get_target,cpp)
$(call gb_ExternalProject_run,build,\
-   autoreconf \
-   && ./configure \
+ autoreconf \
+ && ./configure \
--enable-static \
--disable-shared \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(CXXFLAGS)" \
GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
-   --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+   --host=$(gb_ExternalProject_libgpg-error_host) \
+   RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
MAKE=$(MAKE) \
-   RC='windres --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) 
-I$(ATL_INCLUDE)'\' \
  && $(MAKE) \
)
-
 else
 $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_ExternalProject_run,build,\
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index ecb96f00b496..efd13f2c02e4 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -16,6 +16,8 @@ $(eval $(call

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp external/libassuan external/libgpg-error

2017-11-28 Thread Stephan Bergmann 
 external/gpgmepp/ExternalProject_gpgmepp.mk   |3 ++-
 external/libassuan/ExternalProject_libassuan.mk   |3 ++-
 external/libgpg-error/ExternalProject_libgpg-error.mk |3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c38c8d36d0c8b49d713f0ec8eeab99a5a1446c50
Author: Stephan Bergmann 
Date:   Mon Nov 27 14:13:15 2017 +0100

Use Executable_cpp instead of default gcc as preprocessor for windres

...to avoid having GCC as yet another prerequisite on Windows.

Cygwin 'man windres' states:  "The default preprocessor argument is 'gcc -E
-xc-header -DRC_INVOKED'."  Of those arguments, -E and -xc-header are not
relevant for Executable_cpp, so only -DRC_INVOKED is kept.

Additional arguments that turned out to be necessary are:

-I$(ATL_INCLUDE)
So that
  #include 
in workdir/UnpackedTarball/libgpg-error/src/versioninfo.rc is found.  (Not 
sure
how the original code using gcc found this.)

-+
So that using a C++ style comment in
  #include "winres.h"   // extract from windows header
in afxres.h does not cause a "Syntax error in #include" from Executable_cpp.

$(SOLARINC)
So that
   #include "winres.h"   // extract from windows header
in afxres.h is found.  (Not sure how the original code using gcc found 
this.)

-DWINAPI_FAMILY=0
Because dlgs.h (included indirectly from afxres.h) contains
  #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
  [...]
  typedef struct tagCRGB
  {
  BYTEbRed;
  BYTEbGreen;
  BYTEbBlue;
  BYTEbExtra;
  } CRGB;   /* RGB Color */
and the WINAPI_FAMILY_PARTITION conditional (defined in winapifamily.h) 
would be
true, causing the output to contain those "typedef struct tagCRGB ..." 
tokens
that windres apparently doesn't expect (failing with "windres: can't open 
file
`tagCRGB': No such file or directory").  (Not sure how the original code 
using
gcc avoided this.)

Change-Id: Ic2d031c72025f2e9dbde26c774215d2d2d0a43a9
Reviewed-on: https://gerrit.libreoffice.org/45334
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit e0d94237878d4949573fc9b6d97eea3146cada6d)
Reviewed-on: https://gerrit.libreoffice.org/45392
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index afd6ab6344f9..7aaa42a12b40 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,gpgmepp,\
 ))
 
 ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,gpgmepp,build):
+$(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call 
gb_Executable_get_target,cpp)
$(call gb_ExternalProject_run,build,\
autoreconf \
&& ./configure \
@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
$(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
   --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
   MAKE=$(MAKE) \
+  RC='windres --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) 
-I$(ATL_INCLUDE)'\' \
  && $(MAKE) \
)
 else
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index 21d034455dca..fdadb2851042 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\
 ))
 
 ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,libassuan,build):
+$(call gb_ExternalProject_get_state_target,libassuan,build): $(call 
gb_Executable_get_target,cpp)
$(call gb_ExternalProject_run,build,\
autoreconf \
&& ./configure \
@@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
--host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
MAKE=$(MAKE) \
+   RC='windres --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC) 
-I$(ATL_INCLUDE)'\' \
  && $(MAKE) \
)
 
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index ef22e3926b69..ecb96f00b496 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++