36 Commits
Author SHA1 Message Date
Caolán McNamara 3a6c93982b const up libassuan
Change-Id: I4009bca1f8a33bb5a9518c46531ac39fead80d2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2025-07-24 09:49:07 +02:00
Xisco Fauli dbff1a3506 libassuan: upgrade to 3.0.2
Downloaded from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-3.0.2.tar.bz2

Change-Id: I007756045035517ef17eaa45086b3858eaf49f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181870
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-02-19 11:40:42 +01:00
Christian Lohmaier 79d74f036f libassuan: upgrade to 3.0.1
Downloaded from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-3.0.1.tar.bz2

Change-Id: Ie56dd4d88998c6b2a825a502aa34bae3436d2b25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169198
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2024-07-25 15:21:19 +02:00
Christian Lohmaier b77bcf2838 run autoconf/autoreconf via wsl in wsl-as-helper case
Change-Id: I9bcdfe352fd378e1bf09e15b8d8f7dcea82c0b5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166341
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26 14:02:20 +02:00
Xisco Fauli 0343d7153e libassuan: upgrade to 2.5.7
Change-Id: I6114c7a77395f14e83d2315ac6f9b6829ddb1c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165456
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-03-28 15:44:42 +01:00
Taichi Haradaguchi 88019e3ac3 Update libassuan to 2.5.6
Change-Id: Iea5af01231e67c24d34287929a54f5ec86af47ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153545
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001722@ymail.ne.jp>
2023-06-24 05:29:19 +02:00
Stephan Bergmann 8279d89d6e external/libassuan: Fix fallout of defining __STDC__ on Windows
...since 1bb0e17712 "Fix autoconf>=2.70
gcc-wrapper breakage", which had the side effect of preventing various
deprecated function declarations in system headers (e.g., isascii in addition to
__isascii).  This went unnoticed so far due to the traditionally lax handling of
missing function declarations in C, and only now started to cause

> conversion.c(94,9): error: call to undeclared function 'isascii'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
>           if ((isascii (*istr) && isprint (*istr)) || (*istr >= 0x80))
>                ^

etc. with clang-cl 15 trunk after
<https://github.com/llvm/llvm-project/commit/7d644e1215b376ec5e915df9ea2eeb56e2d94626>
"[C11/C2x] Change the behavior of the implicit function declaration warning".

Where undeclared functions have been used in Windows-only code, they have been
replaced with their __STDC__-declared counterparts, and for occurrences in
shared code Windows-only macro definitions have been introduced (as would have
done in the system headers too, if __STDC__ was not defined) to not clutter the
shared code with #ifdefs.

Also, for getpid (resp. _getpid), the #include <process.h> was apparently
missing from the upstream code, even without our __STDC__ hack in
external/libassuan/ExternalProject_libassuan.mk (but never caused errors until
now, either).

Change-Id: I7442394d0c6e633bca1f6c7331d7ee51651179a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133339
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-04-22 23:38:33 +02:00
Luboš Luňák ea68de2968 use gb_DEBUGINFO_FLAGS consistently in gbuild ExternalProject's
A number of them didn't use it at all, others had it hand-written
in various ways.

Change-Id: Iaf86325f9cdc032926bac917dc3eef4e34661544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132818
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-04-12 13:57:32 +02:00
Jan-Marek Glogowski 4537886ec1 externals: always provide platform configure flags
No idea why we just provided the platform flags when cross-
compiling. In the curious case, where the host platform is
detected as x86_64-pc-mingw32 per default and we actually
want to override it with x86_64-pc-cygwin, we don't do a
cross compile, but must override the host platform.

But there is additional special handling needed for the omitted
cross-platform build in the special case of --host=i686-pc-cygwin
and --build=x86_64-pc-cygwin, where we deliberatly ignore cross
building; Windows is already a slow build, so try to keep this
optimization (AMD64 can execute x86 binaries).

There is the theoretical case, where the externals config.guess
would have detected something else and that "magically" even
worked, while the LO detected triplet would fail, but this
should be fixed in the external in any way.

Change-Id: Ib7a9719e0e406fe90334b7611dc3f01b51692bfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129153
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2022-01-31 10:31:04 +01:00
Thorsten Behrens 568a5bba2a Update libassuan to 2.5.5
Change-Id: Icd1034f4c6b43605f5d43fe28f7e0d191311daf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127664
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-01-05 09:52:51 +01:00
Thorsten Behrens 1bb0e17712 Fix autoconf>=2.70 gcc-wrapper breakage
Re-generated configure file gets confused & claims not finding C89-
compatible compiler for gcc-wrapper-building libassuan with msvc
underneath.

Work-around the problem by telling toolchain right off that this
_is_ a std c compliant compiler.

Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-12-28 21:14:58 +01:00
Jan-Marek Glogowski 8a4173987e WASM: add initial support for Emscripten cross build
- configure with:
- --host=wasm64-local-emscripten
- had to make a few externals optional, so adding:
  - --disable-nss
  - --disable-cmis
  - --disable-curl

Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-05-05 21:14:54 +02:00
Jan-Marek Glogowski 4108665b63 WIN cross: fix gpg-related library builds
Cross compiling these libraries requires to supply the cross-
compiler via the CC_FOR_BUILD environment variable. Since we have
to use the gcc-wrappers, we now need two different invocations
with different inclues and libraries, but just have fixed
environment variables. Also, the CC_FOR_BUILD clashes with LO's
own variant, but that is easy to fix.

So this change includes:
- gcc-wrappers: new option --wrapper-env-prefix to add a prefix
  to the environment variable names
- gcc-wrappers: new option --wrapper-print-cmdline to dump the
  real command called, when a verbose build is executed
- gcc-wrappers: default to exe, if the output has no extension
- unify build flags for gpg related libraries

Change-Id: I4e6a6ba3c6e09237c8ffefa40ce61131290a3852
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102482
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-09-11 18:43:48 +02:00
Thorsten Behrens d400009e7c gpg4libre: update gpgme, libassuan and libgpg-error
seen upstream & removed here:

- external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch
- external/gpgmepp/version.patch
- external/libgpg-error/clang-cl.patch
- external/libgpg-error/libgpg-error_gawk5.patch

Change-Id: Iea2b681fa839ae55cb954c2ad3edf4291b149dbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/61322
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-13 00:29:09 +02:00
Luboš Luňák 0adc9b615f GBUILD_TRACE, support for finding out where the build time is spent
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.

Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-16 14:49:45 +01:00
Andrea Gelmini 09425ab9f1 Removed executable permission on data files
chmod -x for .patch, .pptm, and .vb

Change-Id: I98e1221e48df22e8b58aaf305898cbe301f187ce
Reviewed-on: https://gerrit.libreoffice.org/52568
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-04 03:19:33 +02:00
Stephan Bergmann 24d0704fa4 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.

Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa
Reviewed-on: https://gerrit.libreoffice.org/50959
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-08 18:08:14 +01:00
Thorsten Behrens 814ff5301d libassuan: upgrade to release 2.5.1
Change-Id: Ic6ec245b0011676b1346ea75c016b3af02a0361c
Reviewed-on: https://gerrit.libreoffice.org/46205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-11 18:05:27 +01:00
Thorsten Behrens bade2dff0f external: fix host setup for gpgme and libassuan
Change-Id: I9315a2158dce7d06a875787428e17eb75826de37
Reviewed-on: https://gerrit.libreoffice.org/46222
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-11 17:08:37 +01:00
Caolán McNamara a58c44457b fix fuzzer build
Change-Id: I87933b78126ffbf29999f4d17b212df21560bdbd
Reviewed-on: https://gerrit.libreoffice.org/46080
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-08 15:15:37 +01:00
Stephan Bergmann 7a9fe4d735 tdf#114086: Fix macOS paths of external GPG libraries
Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7
Reviewed-on: https://gerrit.libreoffice.org/45825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-05 08:17:40 +01:00
Thorsten Behrens 293df86b2e 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 <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-04 03:27:50 +01:00
Thorsten Behrens 4c7289c3d7 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>
2017-12-04 03:27:12 +01:00
Stephan Bergmann e0d9423787 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 <afxres.h>
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
  {
      BYTE    bRed;
      BYTE    bGreen;
      BYTE    bBlue;
      BYTE    bExtra;
  } 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 <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-28 08:35:06 +01:00
Stephan Bergmann b00ba26c56 Missing --tag=RC
...causing failure

> make[5]: Entering directory 'workdir/UnpackedTarball/libassuan/src'
> C:/cygwin64/bin/sh.exe ../libtool --mode=compile windres --preprocessor=[...]' `echo -DHAVE_CONFIG_H -I. -I..  | sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i versioninfo.rc -o versioninfo.lo
> libtool: compile: unable to infer tagged configuration
> libtool: compile: specify a tag with `--tag'
> make[5]: *** [Makefile:1172: versioninfo.lo] Error 1

for me.  (And note how e.g. workdir/UnpackedTarball/libgpg-error/src/Makefile.am
contains such a --tag=RC, too.)

Change-Id: I3919a59d5443c558d9bc37fd0a851ea161f44406
Reviewed-on: https://gerrit.libreoffice.org/45344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-27 22:58:40 +01:00
Stephan Bergmann d5f8b759b8 Pass $(verbose) into ExternalProject_libassuan
Change-Id: I66771b49933a9092ad0c07c5ebaabfb3d80dcdcd
Reviewed-on: https://gerrit.libreoffice.org/45343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-27 22:58:11 +01:00
Thorsten Behrens ff54dc5e63 libassuan: cleanup patchset
As noted by Stephan in gerrit#42745

Change-Id: Id8fd3000e7469b9eb2a0c5301ef9ce71b8a77723
Reviewed-on: https://gerrit.libreoffice.org/45242
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-25 00:28:29 +01:00
Stephan Bergmann e8e5bd65d3 Pass $(MAKE) into external/libassuan
Change-Id: I82d775645018b6ce92e4cbc1c8cd67af958bfa21
Reviewed-on: https://gerrit.libreoffice.org/45165
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-24 08:50:52 +01:00
David Ostrovsky 5f981d30e2 gpg4libre: build libassuan natively on windows
Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114
Reviewed-on: https://gerrit.libreoffice.org/42745
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-22 17:54:58 +01:00
Thorsten Behrens 91987a559b fix windows packaging
Change-Id: Id9e306877125b66f908d24048d236c55483330d0
Reviewed-on: https://gerrit.libreoffice.org/43916
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-10-26 23:44:21 +02:00
Thorsten Behrens 16598d526e gpg4libre: enable OpenPGP support for Mac
Change-Id: Iad7d6b045be90efb32da3ffb1c19753b58b1753d
Reviewed-on: https://gerrit.libreoffice.org/43616
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-10-26 12:55:48 +02:00
Thorsten Behrens 1f873596ed gpg4libre: get rpath right for gpgme
Also add initial crossbuild support, and avoid extraneous build
targets (docs, arcane lang support)

Change-Id: I51afa2ff91c576b35dcb73124396188b780ed84e
Reviewed-on: https://gerrit.libreoffice.org/34898
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-03-05 09:56:56 +00:00
Thorsten Behrens dc003d59ea gpg4libre: fix gpgme build dependencies
Change-Id: If71b144f008e35ee248421d922ab2a1a4463d093
Reviewed-on: https://gerrit.libreoffice.org/34361
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-17 09:58:14 +00:00
Thorsten Behrens f37fcda0e9 gpg4libre: fix build for older autoconf/automake versions
- serial-tests fix from Richard Jones' libguestfs (lgplv2+)
  (needed for automake < 1.12)
- m4_esyscmd fix from slurm project (gplv2+), needed for
  autoconf < 2.62 or so
- m4_argn from m4 sugar (gplv3+ with autoconf exceptions)
- AC_CHECK_FUNCS does not like nested macros, so outline dependend
  AC_CHECK_HEADERS
- only build c and c++ bindings for gpgme, we don't need anything
  else internally.

Change-Id: Ic65ca92119efda585ebc9acbfb7c6c2ac2585451
Reviewed-on: https://gerrit.libreoffice.org/34349
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-02-17 09:19:58 +00:00
Katarina Behrens 4a53df9cd7 gpg4libre: Build internal libgpg-error, libassuan and gpgme(pp)
Change-Id: I1953e7062b872340b844771adc8ebe40f524cc76
Reviewed-on: https://gerrit.libreoffice.org/34227
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-16 12:14:02 +00:00
Katarina Behrens c6315e162a gpg4libre: Download external gpgme and dependent libs
in particular, libgpg-error and libassuan
This only downloads and unpacks the tarball. Building them needs
some work still

Change-Id: I562fd01571929ddfb47a319038f88ea8dbfb4bdd
Reviewed-on: https://gerrit.libreoffice.org/33712
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-03 14:15:38 +00:00