[Kde-bindings] KDE/kdebindings

[Thomas Moenicke]

SVN commit 632625 by moenicke:

* Fixed linking and header list in smokekde
* Added source files to cmake korundum

CCMAIL:kde-bindings at kde.org



 M  +1 -0      CMakeLists.txt  
 M  +11 -1     kalyptus/kalyptusCxxToSmoke.pm  
 M  +17 -2     korundum/rubylib/korundum/CMakeLists.txt  
 M  +19 -1     smoke/kde/CMakeLists.txt  
 M  +0 -2      smoke/kde/kde_header_list  


--- trunk/KDE/kdebindings/CMakeLists.txt #632624:632625
@@ -19,6 +19,7 @@
 add_subdirectory(smoke)
 if(RUBY_EXECUTABLE)
    add_subdirectory( qtruby )
+#   add_subdirectory( korundum )
 endif(RUBY_EXECUTABLE)
 
 macro_display_feature_log()
--- trunk/KDE/kdebindings/kalyptus/kalyptusCxxToSmoke.pm #632624:632625
@@ -585,10 +585,20 @@
 
 	    # All we want from private methods is to check for virtuals, nothing else
 	    next if ( $m->{Access} =~ /private/ );
-		
 		# Don't generate code for deprecated methods, 
 		# or where the code won't compile/link for obscure reasons. Or even obvious reasons..
 		if ( ($classNode->{astNodeName} eq 'KCharSelectTable' and $name eq 'paintCell')
+			# KDE4
+			|| ($classNode->{astNodeName} eq 'TextEvent' and $name eq 'data')
+			|| ($classNode->{astNodeName} eq 'KApplication' and $name eq 'startKdeinit')
+			|| ($classNode->{astNodeName} eq 'Slave' and $name eq 'Slave')
+			|| ($classNode->{astNodeName} eq 'KIcon' and $name eq 'setOverlays')
+			|| ($classNode->{astNodeName} eq 'KResolver' and $name eq 'setError')
+			|| ($classNode->{astNodeName} eq 'Entry' and $name eq 'setCompatibility')
+			|| ($classNode->{astNodeName} eq 'KTimeZone' and $name eq 'source')
+			|| ($classNode->{astNodeName} eq 'KTzfileTimeZoneSource' and $name eq 'location')
+			|| ($classNode->{astNodeName} eq 'Wallet' and $name eq 'Wallet')
+			# end KDE4
 			|| ($classNode->{astNodeName} eq 'KAnimWidget' and $name eq 'KAnimWidget' and @{$m->{ParamList}} == 2)
 			|| ($classNode->{astNodeName} eq 'KCModuleLoader' and $name eq 'errorModule')
 			|| ($classNode->{astNodeName} eq 'KDCOPActionProxy' and $name eq 'actions')
--- trunk/KDE/kdebindings/korundum/rubylib/korundum/CMakeLists.txt #632624:632625
@@ -1,14 +1,29 @@
 
 add_subdirectory( lib )
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/qtruby/rubylib/qtruby ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/qtruby/rubylib/qtruby ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
+set(korundum_LIB_SRCS 
+   Korundum.cpp 
+   kdehandlers.cpp 
+   )
 
+kde4_add_library(korundum SHARED ${korundum_LIB_SRCS})
+
+target_link_libraries(korundum ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokekde )
+
+set_target_properties(korundum PROPERTIES VERSION 0.0.0 SOVERSION 0 PREFIX "")
+install(TARGETS korundum  DESTINATION ${RUBY_SITE_ARCH_DIR} )
+
+
+########### next target ###############
+
+
+
 ########### install files ###############
 
 
 
-
 #original Makefile.am contents follow:
 
 #INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) -DQT3_SUPPORT
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #632624:632625
@@ -83,7 +83,25 @@
 
 kde4_add_library(smokekde SHARED ${smokekde_LIB_SRCS})
 
-target_link_libraries(smokekde ${QT_QTNETWORK_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${KDE4_KDECORE_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${KDE4_KHTML_LIBS} kjs fontconfig ${KDE4_KUTILS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KNEWSTUFF_LIBS}  ${KDE4_KIO_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_SONNETCORE_LIBS} kmediaplayer ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_SONNETUI_LIBS} kspell2 kntlm)
+target_link_libraries(smokekde 
+    ${QT_QTNETWORK_LIBRARY} 
+    ${QT_QTSQL_LIBRARY} 
+    ${QT_QTOPENGL_LIBRARY} 
+    ${QT_QTXML_LIBRARY} 
+    ${QT_QTSVG_LIBRARY} 
+    ${QT_QTUITOOLS_LIBRARY} 
+    ${QT_QT3SUPPORT_LIBRARY} 
+    ${KDE4_KDECORE_LIBS} 
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS} 
+    ${KDE4_KNOTIFYCONFIG_LIBS}
+    ${KDE4_SONNETUI_LIBS}
+    ${KDE4_KNEWSTUFF_LIBS}
+    ${KDE4_KDNSSD_LIBS}
+    ${KDE4_KHTML_LIBS}
+    ${KDE4_KDE3SUPPORT_LIBS}
+    kmediaplayer
+    kntlm )
 
 set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokekde DESTINATION ${LIB_INSTALL_DIR} )
--- trunk/KDE/kdebindings/smoke/kde/kde_header_list #632624:632625
@@ -129,7 +129,6 @@
 kde_file.h
 kdelibs_export.h
 kdemacros.h
-kdeprint/kiconselectaction.h
 kdeprint/kpreloadobject.h
 kdeprint/kprintdialogpage.h
 kdesktopfile.h
@@ -370,7 +369,6 @@
 ksocks.h
 ksockssocketdevice.h
 ksortablelist.h
-kspeech.h
 ksplashscreen.h
 ksqueezedtextlabel.h
 ksslall.h