[Kde-bindings] KDE/kdebindings/ruby/akonadi

[Richard Dale]

SVN commit 814125 by rdale:

* The Akonadi extension wasn't starting properly as it was loading QtRuby which was
   already loaded
* The extension isn't a plugin so don't build an embedded version of QtRuby for it

CCMAIL: kde-bindings at kde.org

 M  +2 -15     CMakeLists.txt  
 M  +1 -1      akonadi.cpp  
 M  +1 -1      akonadi.rb  


--- trunk/KDE/kdebindings/ruby/akonadi/CMakeLists.txt #814124:814125
@@ -1,23 +1,10 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-#
-# The akonadi plugin extension needs to be run inside Akonadi, and so QtRuby must
-# be compiled with this flag as it can't be assumed that Ruby was initialized
-# in the main() function. The qtrubyshared library cannot be used, and instead
-# all the QtRuby sources are compiled with the akonadi extension sources.
-#
-add_definitions (-DRUBY_EMBEDDED)
+set(akonadi_LIBRARY_SRC akonadi.cpp akonadihandlers.cpp)
 
-set(akonadi_LIBRARY_SRC akonadi.cpp akonadihandlers.cpp
-   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/qtruby.cpp
-   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/Qt.cpp
-   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/handlers.cpp
-   ${CMAKE_SOURCE_DIR}/ruby/qtruby/src/marshall_types.cpp
-   )
-
 add_library(akonadi MODULE ${akonadi_LIBRARY_SRC})
-target_link_libraries(akonadi ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeakonadi)
+target_link_libraries(akonadi ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeakonadi qtruby4shared)
 set_target_properties(akonadi PROPERTIES PREFIX "")
 install(TARGETS akonadi DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES akonadi.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/akonadi)
--- trunk/KDE/kdebindings/ruby/akonadi/akonadi.cpp #814124:814125
@@ -53,7 +53,7 @@
 Q_DECL_EXPORT void
 Init_akonadi()
 {
-    rb_require("Qt4");    // need to initialize the core runtime first
+//    rb_require("Qt4");    // need to initialize the core runtime first
     rb_require("korundum4");
     init_akonadi_Smoke();
 
--- trunk/KDE/kdebindings/ruby/akonadi/akonadi.rb #814124:814125
@@ -1,6 +1,6 @@
 =begin
 /***************************************************************************
-                          akonadi.rb  -  Akonadi plugins in Ruby
+                          akonadi.rb  -  Akonadi ruby client lib
                              -------------------
     begin                : Thurs May 29 2008
     copyright            : (C) 2008 by Richard Dale