Re: Build failure with latest ICU 64.1

[Andreas Sturmlechner]

On Samstag, 30. März 2019 09:25:24 CET Andreas Sturmlechner wrote:
> On Freitag, 29. März 2019 13:50:01 CET Miklos Vajna wrote:
> > Can you see if the attached patch helps? If so, we can get it merged
> > upstream.
> 
> Thanks, it does help, but it seems the real issue is in ICU - Gentoo xmlsec
> maintainer has filed a PR upstream and I'm rebuilding LO again:
> 
> https://github.com/unicode-org/icu/pull/572

Indeed, fixing ICU with the above patch made LO build successfully again, no 
need for xmlsec changes.

Regards,
Andreas



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build failure with latest ICU 64.1

[Andreas Sturmlechner]

On Freitag, 29. März 2019 13:50:01 CET Miklos Vajna wrote:
> Can you see if the attached patch helps? If so, we can get it merged
> upstream.

Thanks, it does help, but it seems the real issue is in ICU - Gentoo xmlsec 
maintainer has filed a PR upstream and I'm rebuilding LO again:

https://github.com/unicode-org/icu/pull/572

Regards,
Andreas


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build failure with latest ICU 64.1

[Andreas Sturmlechner]

On Freitag, 29. März 2019 13:50:01 CET Miklos Vajna wrote:
> Can you see if the attached patch helps? If so, we can get it merged
> upstream.

Thanks, it does help, but it seems the real issue is in ICU - Gentoo xmlsec 
maintainer has filed a PR upstream and I'm rebuilding LO again:

https://github.com/unicode-org/icu/pull/572

Regards,
Andreas



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build failure with latest ICU 64.1

[Miklos Vajna]

Hi,

On Fri, Mar 29, 2019 at 12:43:41PM +0100, Andreas Sturmlechner 
 wrote:
> (this is from system-xmlsec-1.2.27)

Can you see if the attached patch helps? If so, we can get it merged
upstream.

Thanks,

Miklos
From d0c7516dd97599fb59d8616e8adf94f19ec48de1 Mon Sep 17 00:00:00 2001
From: Miklos Vajna 
Date: Fri, 29 Mar 2019 13:47:12 +0100
Subject: [PATCH] base64: move start of C++ guard below includes

Resolves problems around building against newer ICU, see
.
---
 include/xmlsec/base64.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/xmlsec/base64.h b/include/xmlsec/base64.h
index 36d8a493..7e13862f 100644
--- a/include/xmlsec/base64.h
+++ b/include/xmlsec/base64.h
@@ -11,15 +11,15 @@
 #ifndef __XMLSEC_BASE64_H__
 #define __XMLSEC_BASE64_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include 
 
 #include 
 #include 
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * XMLSEC_BASE64_LINESIZE:
  *
-- 
2.16.4



signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build failure with latest ICU 64.1

[Andreas Sturmlechner]

On Friday, 29 March 2019 at 11:51, Stephan Bergmann wrote:

> > In file included from 
> > /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:64,
> >   from /usr/include/unicode/localpointer.h:45,
> >   from /usr/include/unicode/uenum.h:23,
> >   from /usr/include/unicode/ucnv.h:53,
> >   from /usr/include/libxml2/libxml/encoding.h:31,
> >   from /usr/include/libxml2/libxml/parser.h:810,
> >   from /usr/include/libxml2/libxml/globals.h:18,
> >   from /usr/include/libxml2/libxml/threads.h:35,
> >   from /usr/include/libxml2/libxml/xmlmemory.h:218,
> >   from /usr/include/libxml2/libxml/tree.h:1307,
> 
> smells like any of the above files is #include'ed from within an extern 
> "C" block?

Indeed, /usr/include/xmlsec1/xmlsec/base64.h has:

#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */

#include 

#include 


(this is from system-xmlsec-1.2.27)

Regards,
Andreas



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build failure with latest ICU 64.1

[Stephan Bergmann]

On 29/03/2019 11:14, Andreas Sturmlechner wrote:

[build CXX] xmlsecurity/source/xmlsec/biginteger.cxx
S=/var/tmp/portage/app-office/libreoffice-6.2.1.2/work/libreoffice-6.2.1.2 && I=$S/instdir && 
W=$S/workdir &&  mkdir -p $W/CxxObject/xmlsecurity/source/xmlsec/ $W/Dep/CxxObject/xmlsecurity/source/xmlsec/ 
&& cd /var/tmp/portage/app-office/libreoffice-6.2.1.2/work/libreoffice-6.2.1.2 &&
x86_64-pc-linux-gnu-g++ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -DCPPU_ENV=gcc3 -DLINUX -DNDEBUG 
-DOSL_DEBUG_LEVEL=0 -DUNIX -DUNX -DX86_64 -D_PTHREADS -D_REENTRANT   -DXMLSEC_NO_XSLT -DXSECXMLSEC_DLLIMPLEMENTATION 
-DXSECGPG_DLLIMPLEMENTATION  -DSYSTEM_LIBXML  -DSYSTEM_XMLSEC  -DXMLSEC_CRYPTO_NSS  -DSYSTEM_NSS  -DSYSTEM_NSS   
-fvisibility=hidden-Wall -Wno-missing-braces -Wnon-virtual-dtor -Wendif-labels -Wextra -Wundef -Wunreachable-code 
-Wunused-macros -finput-charset=UTF-8 -fmessage-length=0 -fno-common -pipe  -Wduplicated-cond -Wlogical-op 
-Wshift-overflow=2 -Wunused-const-variable=1 -Wno-cast-function-type -fvisibility-inlines-hidden 
-fstack-protector-strong -fPIC -Wshadow -Woverloaded-virtual -std=gnu++2a   -DEXCEPTIONS_ON -fexceptions 
-fno-enforce-eh-specs -march=native -mtune=native -O2 -pipe   -DLIBO_INTERNAL_ONLY  -c 
$S/xmlsecurity/source/xmlsec/biginteger.cxx -o $W/CxxObject/xmlsecurity/source/xmlsec/biginteger.o  -I$S/include  
-I/usr/lib64/icedtea8/include -I/usr/lib64/icedtea8/include/linux -I$S/config_host  -I$S/xmlsecurity/inc 
-I$S/xmlsecurity/source/gpg -I$S/xmlsecurity/source/xmlsec -I$W/UnpackedTarball/xmlsec/include  
-I$W/CustomTarget/officecfg/registry -I$W/UnoApiHeadersTarget/udkapi/normal -I$W/UnoApiHeadersTarget/offapi/normal 
-I/usr/include   -I/usr/include/gpgme++   -isystem /usr/include/libxml2   -DXMLSEC_CRYPTO_NSS=1 
-D__XMLSEC_FUNCTION__=__func__ -DXMLSEC_NO_SIZE_T -DXMLSEC_NO_AES=1 -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_GOST2012=1 
-DXMLSEC_DL_LIBLTDL=1 -isystem /usr/include/xmlsec1 -isystem /usr/include/libxml2 -isystem /usr/include/nss -isystem 
/usr/include/nspr   -isystem /usr/include/nss -isystem /usr/include/nspr   -isystem /usr/include/nss -isystem 
/usr/include/nspr
In file included from 
/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:64,
  from /usr/include/unicode/localpointer.h:45,
  from /usr/include/unicode/uenum.h:23,
  from /usr/include/unicode/ucnv.h:53,
  from /usr/include/libxml2/libxml/encoding.h:31,
  from /usr/include/libxml2/libxml/parser.h:810,
  from /usr/include/libxml2/libxml/globals.h:18,
  from /usr/include/libxml2/libxml/threads.h:35,
  from /usr/include/libxml2/libxml/xmlmemory.h:218,
  from /usr/include/libxml2/libxml/tree.h:1307,


smells like any of the above files is #include'ed from within an extern 
"C" block?



  from /usr/include/xmlsec1/xmlsec/base64.h:18,
  from 
/var/tmp/portage/app-office/libreoffice-6.2.1.2/work/libreoffice-6.2.1.2/xmlsecurity/inc/xmlsec-wrapper.h:32,
  from 
/var/tmp/portage/app-office/libreoffice-6.2.1.2/work/libreoffice-6.2.1.2/xmlsecurity/source/xmlsec/biginteger.cxx:23:
/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/stl_construct.h:72:3:
 error: template with C linkage
template
^~~~

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice