[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdoctools
From:       Luigi Toscano <luigi.toscano () tiscali ! it>
Date:       2010-10-24 15:55:47
Message-ID: 20101024155547.1A1E7AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189327 by ltoscano:

Link to libexslt too; this is needed by upstream Docbook XSLT


 M  +4 -4      CMakeLists.txt  
 M  +2 -0      main.cpp  
 M  +2 -0      main_ghelp.cpp  
 M  +3 -0      meinproc.cpp  
 M  +3 -0      meinproc_simple.cpp  


--- trunk/KDE/kdelibs/kdoctools/CMakeLists.txt #1189326:1189327
@@ -44,7 +44,7 @@
 
 kde4_add_plugin(kio_help ${kio_help_PART_SRCS})
 
-target_link_libraries(kio_help  ${KDE4_KDECORE_LIBS} kio ${LIBXML2_LIBRARIES} \
${LIBXSLT_LIBRARIES} ) +target_link_libraries(kio_help  ${KDE4_KDECORE_LIBS} kio \
${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES})  
 install(TARGETS kio_help  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
@@ -56,7 +56,7 @@
 
 kde4_add_plugin(kio_ghelp ${kio_ghelp_PART_SRCS})
 
-target_link_libraries(kio_ghelp  ${KDE4_KDECORE_LIBS} kio ${LIBXML2_LIBRARIES} \
${LIBXSLT_LIBRARIES} ) +target_link_libraries(kio_ghelp  ${KDE4_KDECORE_LIBS} kio \
${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES})  
 install(TARGETS kio_ghelp  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
@@ -80,7 +80,7 @@
 
    kde4_add_executable(meinproc4 NOGUI ${meinproc_SRCS})
 
-   target_link_libraries(meinproc4 ${KDE4_KDECORE_LIBS} ${LIBXML2_LIBRARIES} \
${LIBXSLT_LIBRARIES}) +   target_link_libraries(meinproc4 ${KDE4_KDECORE_LIBS} \
${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES})  
    # "export" this target too so we can use the LOCATION property of the imported \
target in  # FindKDE4Internal.cmake to get the full path to the installed executable \
instead of using FIND_PROGRAM(), Alex @@ -104,7 +104,7 @@
 
    kde4_add_executable(meinproc4_simple NOGUI ${meinproc_qt_SRCS})
 
-   target_link_libraries(meinproc4_simple ${QT_QTCORE_LIBRARIES} \
${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}) +   target_link_libraries(meinproc4_simple \
${QT_QTCORE_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} \
${LIBEXSLT_LIBRARIES})  
    install(TARGETS meinproc4_simple ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdelibs/kdoctools/main.cpp #1189326:1189327
@@ -29,6 +29,7 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+#include <libexslt/exslt.h>
 
 extern "C"
 {
@@ -50,6 +51,7 @@
         LIBXML_TEST_VERSION
         xmlSubstituteEntitiesDefault(1);
         xmlLoadExtDtdDefaultValue = 1;
+        exsltRegisterAll();
 
         HelpProtocol slave(false, argv[2], argv[3]);
         slave.dispatchLoop();
--- trunk/KDE/kdelibs/kdoctools/main_ghelp.cpp #1189326:1189327
@@ -30,6 +30,7 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+#include <libexslt/exslt.h>
 
 extern "C"
 {
@@ -50,6 +51,7 @@
         LIBXML_TEST_VERSION
         xmlSubstituteEntitiesDefault(1);
         xmlLoadExtDtdDefaultValue = 1;
+        exsltRegisterAll();
 
         HelpProtocol slave( true, argv[2], argv[3] );
         slave.dispatchLoop();
--- trunk/KDE/kdelibs/kdoctools/meinproc.cpp #1189326:1189327
@@ -31,6 +31,7 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+#include <libexslt/exslt.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -113,6 +114,8 @@
         return ( 1 );
     }
 
+    exsltRegisterAll();
+
     // Need to set SRCDIR before calling fillInstance
     QString srcdir;
     if ( args->isSet( "srcdir" ) )
--- trunk/KDE/kdelibs/kdoctools/meinproc_simple.cpp #1189326:1189327
@@ -22,6 +22,7 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+#include <libexslt/exslt.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -60,6 +61,8 @@
         return ( 2 );
     }
 
+    exsltRegisterAll();
+
     QByteArray catalogs;
     catalogs += customizationCatalog.toUtf8();
     


[prev in list] [next in list] [prev in thread] [next in thread]