[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - configure.ac

[Lionel Elie Mamane]

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 90f5b169d3625afcc6684643251d05155aac6d51
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jun 27 10:07:32 2013 +0200

    we now need librdf_world_set_raptor_init_handler from librdf
    
    Change-Id: I4e3b56fd8c088983a8a01eb6ccf88691d6fd93ef
    (cherry picked from commit 2728808553e5a248d1e4dc1361e4784400a75e7b)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    
    Conflicts:
    	configure.ac

diff --git a/configure.ac b/configure.ac
index 02ffc14..299ee69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8560,7 +8560,7 @@ if test "$with_system_redland" = "yes"; then
     SYSTEM_REDLAND=YES
     dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
     dnl raptor2: need at least 2.0.7 for CVE-2012-0037
-    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8 raptor2 >= 2.0.7)
+    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.16 raptor2 >= 2.0.7)
     libo_MINGW_CHECK_DLL([REDLAND], [librdf])
     libo_MINGW_TRY_DLL([RAPTOR], [libraptor])
     libo_MINGW_TRY_DLL([RASQAL], [librasqal])
commit f52bafd6da58d126140fdd9915b567e88926d737
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jun 27 07:29:43 2013 +0200

    unoxml needs to link with raptor2 now
    
    Change-Id: Icbe5ac8e20b5a05fdba4ed7b8a287c3d9e94d2da
    (cherry picked from commit 2b5203c9ac4b6a95fa77f1a31fdb7b13e736d37e)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    
    Conflicts:
    	configure.ac

diff --git a/configure.ac b/configure.ac
index 17f792d..02ffc14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8559,7 +8559,8 @@ if test "$with_system_redland" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_REDLAND=YES
     dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
-    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
+    dnl raptor2: need at least 2.0.7 for CVE-2012-0037
+    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8 raptor2 >= 2.0.7)
     libo_MINGW_CHECK_DLL([REDLAND], [librdf])
     libo_MINGW_TRY_DLL([RAPTOR], [libraptor])
     libo_MINGW_TRY_DLL([RASQAL], [librasqal])