sw33bf03: #i110523#: work around raptor messing up libxslt (patch by cmc)
This commit is contained in:
parent
d1e7561aa8
commit
e9345d7418
2 changed files with 17 additions and 0 deletions
|
@ -55,6 +55,7 @@
|
|||
#include <rtl/ustring.hxx>
|
||||
|
||||
#include <librdf.h>
|
||||
#include <libxslt/security.h>
|
||||
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
@ -1890,7 +1891,15 @@ librdf_world *librdf_TypeConverter::createWorld() const
|
|||
m_rRep);
|
||||
}
|
||||
//FIXME logger, digest, features?
|
||||
xsltSecurityPrefsPtr origprefs = xsltGetDefaultSecurityPrefs();
|
||||
librdf_world_open(pWorld);
|
||||
xsltSecurityPrefsPtr newprefs = xsltGetDefaultSecurityPrefs();
|
||||
if (newprefs != origprefs) {
|
||||
// #i110523# restore libxslt global configuration
|
||||
// (gratuitously overwritten by raptor_init_parser_grddl_common)
|
||||
// (this is the only reason unordf is linked against libxslt)
|
||||
xsltSetDefaultSecurityPrefs(origprefs);
|
||||
}
|
||||
return pWorld;
|
||||
}
|
||||
|
||||
|
|
|
@ -45,6 +45,13 @@ ENABLE_EXCEPTIONS=TRUE
|
|||
CFLAGS+=-DSYSTEM_REDLAND $(REDLAND_CFLAGS)
|
||||
.ENDIF
|
||||
|
||||
.IF "$(SYSTEM_LIBXSLT)" == "YES"
|
||||
CFLAGS+= $(LIBXSLT_CFLAGS)
|
||||
.ELSE
|
||||
LIBXSLTINCDIR=external$/libxslt
|
||||
CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
|
||||
.ENDIF
|
||||
|
||||
# --- Files --------------------------------------------------------
|
||||
.IF "$(L10N_framework)"==""
|
||||
|
||||
|
@ -68,6 +75,7 @@ DEF1NAME=$(SHL1TARGET)
|
|||
|
||||
SHL1STDLIBS= \
|
||||
$(REDLANDLIB) \
|
||||
$(XSLTLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
$(SALLIB) \
|
||||
|
|
Loading…
Reference in a new issue