rpms/kdebindings/devel kdebindings-4.3.75-smoke-trunk.patch, NONE, 1.1 kdebindings-4.3.75-generator-trunk.patch, 1.2, 1.3 kdebindings.spec, 1.262, 1.263
Kevin Kofler
kkofler at fedoraproject.org
Thu Nov 26 18:15:03 UTC 2009
- Previous message: rpms/findutils/devel findutils-4.4.2-selinux-gnulib.patch, NONE, 1.1 findutils-4.4.2-selinux.patch, NONE, 1.1 findutils-4.4.2-fts-remount.patch, 1.1, 1.2 findutils-4.4.2-xautofs.patch, 1.1, 1.2 findutils.spec, 1.66, 1.67 findutils-4.4.0-selinux.patch, 1.2, NONE
- Next message: rpms/telepathy-gabble/devel proxy.patch, NONE, 1.1 telepathy-gabble.spec, 1.70, 1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8210/devel
Modified Files:
kdebindings-4.3.75-generator-trunk.patch kdebindings.spec
Added Files:
kdebindings-4.3.75-smoke-trunk.patch
Log Message:
* Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496
- update generator and smoke to the current trunk for more fixes
kdebindings-4.3.75-smoke-trunk.patch:
CMakeLists.txt | 36 ++++
akonadi/CMakeLists.txt | 110 +++---------
akonadi/akonadi_includes.h | 107 ++++++++++++
akonadi/smokeconfig.xml | 143 ++++++++++++++++
kde/CMakeLists.txt | 2
kdevplatform/CMakeLists.txt | 116 +++----------
kdevplatform/kdevplatform_includes.h | 270 +++++++++++++++++++++++++++++++
kdevplatform/smokeconfig.xml | 281 +++++++++++++++++++++++++++++++++
khtml/CMakeLists.txt | 2
ktexteditor/CMakeLists.txt | 2
nepomuk/CMakeLists.txt | 98 +++--------
nepomuk/nepomuk_includes.h | 42 ++++
nepomuk/smokeconfig.xml | 74 ++++++++
okular/CMakeLists.txt | 108 ++----------
okular/okular_includes.h | 24 ++
okular/smokeconfig.xml | 86 ++++++++++
phonon/CMakeLists.txt | 2
plasma/CMakeLists.txt | 2
qimageblitz/CMakeLists.txt | 2
qsci/CMakeLists.txt | 2
qt/CMakeLists.txt | 2
qtcore/CMakeLists.txt | 2
qtdbus/CMakeLists.txt | 38 ++++
qtdbus/config.xml.cmake | 11 +
qtdbus/qtdbus_includes.h | 2
qtdbus/smokeconfig.xml | 57 ++++++
qtdbus_smoke.h | 16 +
qtgui/CMakeLists.txt | 2
qtnetwork/CMakeLists.txt | 2
qtopengl/CMakeLists.txt | 43 +++++
qtopengl/config.xml.cmake | 12 +
qtopengl/qtopengl_includes.h | 3
qtopengl/smokeconfig.xml | 55 ++++++
qtopengl_smoke.h | 16 +
qtscript/CMakeLists.txt | 2
qtsql/CMakeLists.txt | 41 ++++
qtsql/config.xml.cmake | 11 +
qtsql/qtsql_includes.h | 2
qtsql/smokeconfig.xml | 56 ++++++
qtsql_smoke.h | 16 +
qtsvg/CMakeLists.txt | 43 +++++
qtsvg/config.xml.cmake | 12 +
qtsvg/qtsvg_includes.h | 3
qtsvg/smokeconfig.xml | 44 +++++
qtsvg_smoke.h | 16 +
qttest/CMakeLists.txt | 2
qtuitools/CMakeLists.txt | 2
qtwebkit/CMakeLists.txt | 2
qtxml/CMakeLists.txt | 41 ++++
qtxml/config.xml.cmake | 11 +
qtxml/qtxml_includes.h | 2
qtxml/smokeconfig.xml | 70 ++++++++
qtxml_smoke.h | 16 +
qtxmlpatterns/CMakeLists.txt | 43 +++++
qtxmlpatterns/config.xml.cmake | 12 +
qtxmlpatterns/qtxmlpatterns_includes.h | 3
qtxmlpatterns/smokeconfig.xml | 79 +++++++++
qtxmlpatterns_smoke.h | 16 +
qwt/CMakeLists.txt | 2
qwt/smokeconfig.xml | 1
smoke.h | 4
solid/CMakeLists.txt | 2
soprano/CMakeLists.txt | 2
63 files changed, 1991 insertions(+), 335 deletions(-)
--- NEW FILE kdebindings-4.3.75-smoke-trunk.patch ---
Index: khtml/CMakeLists.txt
===================================================================
--- khtml/CMakeLists.txt (revision 1048496)
+++ khtml/CMakeLists.txt (revision 1054759)
@@ -81,6 +81,6 @@
smokekde
smokeqt
)
-set_target_properties(smokekhtml PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokekhtml PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokekhtml DESTINATION ${LIB_INSTALL_DIR} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/khtml_smoke.h DESTINATION include/smoke)
Index: qt/CMakeLists.txt
===================================================================
--- qt/CMakeLists.txt (revision 1048496)
+++ qt/CMakeLists.txt (revision 1054759)
@@ -86,7 +86,7 @@
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY} )
-set_target_properties(smokeqt PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqt PROPERTIES VERSION 2.1.0 SOVERSION 3 )
# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
# for Qt only installs
Index: qtdbus_smoke.h
===================================================================
--- qtdbus_smoke.h (revision 0)
+++ qtdbus_smoke.h (revision 1054759)
@@ -0,0 +1,16 @@
+#ifndef QTDBUS_SMOKE_H
+#define QTDBUS_SMOKE_H
+
+#include <smoke.h>
+
+// Defined in smokedata.cpp, initialized by init_qtdbus_Smoke(), used by all .cpp files
+extern "C" SMOKE_EXPORT Smoke* qtdbus_Smoke;
+extern "C" SMOKE_EXPORT void init_qtdbus_Smoke();
+extern "C" SMOKE_EXPORT void delete_qtdbus_Smoke();
+
+#ifndef QGLOBALSPACE_CLASS
+#define QGLOBALSPACE_CLASS
+class QGlobalSpace { };
+#endif
+
+#endif
Index: qtsql_smoke.h
===================================================================
--- qtsql_smoke.h (revision 0)
+++ qtsql_smoke.h (revision 1054759)
@@ -0,0 +1,16 @@
+#ifndef QTSQL_SMOKE_H
+#define QTSQL_SMOKE_H
+
+#include <smoke.h>
+
+// Defined in smokedata.cpp, initialized by init_qtsql_Smoke(), used by all .cpp files
+extern "C" SMOKE_EXPORT Smoke* qtsql_Smoke;
+extern "C" SMOKE_EXPORT void init_qtsql_Smoke();
+extern "C" SMOKE_EXPORT void delete_qtsql_Smoke();
+
+#ifndef QGLOBALSPACE_CLASS
+#define QGLOBALSPACE_CLASS
+class QGlobalSpace { };
+#endif
+
+#endif
Index: qtgui/CMakeLists.txt
===================================================================
--- qtgui/CMakeLists.txt (revision 1048496)
+++ qtgui/CMakeLists.txt (revision 1054759)
@@ -68,7 +68,7 @@
target_link_libraries(smokeqtgui smokeqtcore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} )
-set_target_properties(smokeqtgui PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqtgui PROPERTIES VERSION 2.1.0 SOVERSION 3 )
# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
# for Qt only installs
Index: qtxml_smoke.h
===================================================================
--- qtxml_smoke.h (revision 0)
+++ qtxml_smoke.h (revision 1054759)
@@ -0,0 +1,16 @@
+#ifndef QTXML_SMOKE_H
+#define QTXML_SMOKE_H
+
+#include <smoke.h>
+
+// Defined in smokedata.cpp, initialized by init_qtxml_Smoke(), used by all .cpp files
+extern "C" SMOKE_EXPORT Smoke* qtxml_Smoke;
+extern "C" SMOKE_EXPORT void init_qtxml_Smoke();
+extern "C" SMOKE_EXPORT void delete_qtxml_Smoke();
+
+#ifndef QGLOBALSPACE_CLASS
+#define QGLOBALSPACE_CLASS
+class QGlobalSpace { };
+#endif
+
+#endif
Index: qtwebkit/CMakeLists.txt
===================================================================
--- qtwebkit/CMakeLists.txt (revision 1048496)
+++ qtwebkit/CMakeLists.txt (revision 1054759)
@@ -24,7 +24,7 @@
target_link_libraries(smokeqtwebkit smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
-set_target_properties(smokeqtwebkit PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqtwebkit PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokeqtwebkit DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtwebkit_smoke.h DESTINATION include/smoke )
Index: qtcore/CMakeLists.txt
===================================================================
--- qtcore/CMakeLists.txt (revision 1048496)
+++ qtcore/CMakeLists.txt (revision 1054759)
@@ -79,7 +79,7 @@
target_link_libraries(smokeqtcore ${QT_QTCORE_LIBRARY} )
-set_target_properties(smokeqtcore PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqtcore PROPERTIES VERSION 2.1.0 SOVERSION 3 )
# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
# for Qt only installs
Index: phonon/CMakeLists.txt
===================================================================
--- phonon/CMakeLists.txt (revision 1048496)
+++ phonon/CMakeLists.txt (revision 1054759)
@@ -47,7 +47,7 @@
target_link_libraries(smokephonon smokeqt ${QT_QTCORE_LIBS} ${QT_QTGUI_LIBS} ${PHONON_LIBS})
-set_target_properties(smokephonon PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokephonon PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokephonon DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/phonon_smoke.h DESTINATION include/smoke)
Index: qtdbus/config.xml.cmake
===================================================================
--- qtdbus/config.xml.cmake (revision 0)
+++ qtdbus/config.xml.cmake (revision 1054759)
@@ -0,0 +1,11 @@
+<config>
+ <resolveTypedefs>true</resolveTypedefs>
+ <qtMode>true</qtMode>
+ <generator>smoke</generator>
+ <definesList>@CMAKE_BINARY_DIR@/smoke/qtdefines</definesList>
+ <includeDirs>
+ <dir>@QT_INCLUDE_DIR@</dir>
+ <dir>@QT_QTCORE_INCLUDE_DIR@</dir>
+ <dir>@QT_QTDBUS_INCLUDE_DIR@</dir>
+ </includeDirs>
+</config>
Index: qtdbus/smokeconfig.xml
===================================================================
--- qtdbus/smokeconfig.xml (revision 0)
+++ qtdbus/smokeconfig.xml (revision 1054759)
@@ -0,0 +1,57 @@
+<config>
+ <moduleName>qtdbus</moduleName>
+ <parentModules>
+ <module>qtcore</module>
+ </parentModules>
+ <parts>1</parts>
+ <scalarTypes>
+ <!-- QString is a class, but represented as a scalar (#) in munged names -->
+ <typeName>QString</typeName>
+ </scalarTypes>
+ <voidpTypes>
+ <!-- both are classes, but they are represented as Smoke::t_voidp -->
+ <typeName>QStringList</typeName>
+ <typeName>QString</typeName>
+ </voidpTypes>
+ <exclude>
+ <!-- we don't want private stuff in smoke.. -->
+ <signature>.*::d</signature>
+ <signature>.*::d_ptr</signature>
+ <signature>.*::q_ptr</signature>
+ <signature>.*\(.*Private.*\).*</signature>
+ <!-- Thread related stuff belongs to the bindings language -->
+ <signature>.*QtConcurrent.*</signature>
+ <signature>.*QDomNode.*</signature>
+ <!-- this doesn't link, internal stuff.. -->
+ <signature>.*qFindString.*</signature>
+ <!-- windows internal helper functions -->
+ <signature>.*qFrom.*Endian_helper.*</signature>
+ </exclude>
+ <functions>
+ <!-- include functions starting with 'q' -->
+ <name>^q.*</name>
+ <name>.*::q.*</name>
+ <!-- and operators -->
+ <name>.*operator.*</name>
+ </functions>
+ <classList>
+ <class>QDBusAbstractAdaptor</class>
[...2501 lines suppressed...]
@@ -1,101 +1,59 @@
FIND_PACKAGE(Akonadi REQUIRED)
+FIND_PACKAGE(KdepimLibs REQUIRED)
-IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
- ADD_DEFINITIONS(-DGCC_VISIBILITY)
-ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
-
include_directories( ${CMAKE_SOURCE_DIR}/smoke )
-set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
-set(qt_includes ${QT_INCLUDE_DIR})
-set(kde_includes ${KDE4_INCLUDE_DIR})
-set(akonadi_includes ${KDEPIMLIBS_INCLUDE_DIR})
-if(OPENGL_FOUND AND OPENGL_GLU_FOUND)
- set(KDE_HAVE_GL "yes")
-else(OPENGL_FOUND AND OPENGL_GLU_FOUND)
- set(KDE_HAVE_GL "no")
-endif(OPENGL_FOUND AND OPENGL_GLU_FOUND)
-
-set(qtflags "-lQtCore -lQtGui")
-FOREACH(filename ${QT_INCLUDES})
- set(all_includes "-I${filename} ${all_includes}")
-ENDFOREACH(filename)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
-
########### next target ###############
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ -I "${AKONADI_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/akonadi_includes.h
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
+include_directories (${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/akonadi )
-set(smokeakonadi_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
-)
+set(smokeakonadi_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp)
-# Needed to make QSqlRelationalDelegate compile
-ADD_DEFINITIONS (-DQT_GUI_LIB)
+IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
+ ADD_DEFINITIONS(-DGCC_VISIBILITY)
+ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
-include_directories( ${KDEPIMLIBS_INCLUDE_DIRS} )
-include_directories( ${KDEPIMLIBS_INCLUDE_DIR}/akonadi )
-
kde4_add_library(smokeakonadi SHARED ${smokeakonadi_LIB_SRCS})
target_link_libraries(smokeakonadi
${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_AKONADI_CONTACT_LIBS}
+ ${KDEPIMLIBS_AKONADI_KABC_LIBS}
${KDEPIMLIBS_AKONADI_KMIME_LIBS}
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
smokekde
smokeqt )
-set_target_properties(smokeakonadi PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeakonadi PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokeakonadi DESTINATION ${LIB_INSTALL_DIR} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/akonadi_smoke.h DESTINATION include/smoke )
Index: qimageblitz/CMakeLists.txt
===================================================================
--- qimageblitz/CMakeLists.txt (revision 1048496)
+++ qimageblitz/CMakeLists.txt (revision 1054759)
@@ -26,7 +26,7 @@
target_link_libraries(smokeqimageblitz smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QIMAGEBLITZ_LIBRARIES})
-set_target_properties(smokeqimageblitz PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqimageblitz PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokeqimageblitz DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qimageblitz_smoke.h DESTINATION include/smoke )
Index: qtscript/CMakeLists.txt
===================================================================
--- qtscript/CMakeLists.txt (revision 1048496)
+++ qtscript/CMakeLists.txt (revision 1054759)
@@ -25,7 +25,7 @@
target_link_libraries(smokeqtscript smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTSCRIPT_LIBRARY})
-set_target_properties(smokeqtscript PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqtscript PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokeqtscript DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtscript_smoke.h DESTINATION include/smoke )
Index: qwt/smokeconfig.xml
===================================================================
--- qwt/smokeconfig.xml (revision 1048496)
+++ qwt/smokeconfig.xml (revision 1054759)
@@ -18,6 +18,7 @@
</functions>
<exclude>
<signature>.*QwtData::operator=\(const QwtData&\).*</signature>
+ <signature>.*QwtSpline::d_data</signature>
</exclude>
<classList>
<class>QwtAbstractScaleDraw</class>
Index: qwt/CMakeLists.txt
===================================================================
--- qwt/CMakeLists.txt (revision 1048496)
+++ qwt/CMakeLists.txt (revision 1054759)
@@ -44,7 +44,7 @@
target_link_libraries(smokeqwt smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${Qwt5_Qt4_LIBRARY})
-set_target_properties(smokeqwt PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeqwt PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokeqwt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/qwt_smoke.h DESTINATION include/smoke)
Index: plasma/CMakeLists.txt
===================================================================
--- plasma/CMakeLists.txt (revision 1048496)
+++ plasma/CMakeLists.txt (revision 1054759)
@@ -47,7 +47,7 @@
smokekde
smokeqt )
-set_target_properties(smokeplasma PROPERTIES VERSION 2.1.0 SOVERSION 2.1 )
+set_target_properties(smokeplasma PROPERTIES VERSION 2.1.0 SOVERSION 3 )
install(TARGETS smokeplasma DESTINATION ${LIB_INSTALL_DIR} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/plasma_smoke.h DESTINATION include/smoke )
kdebindings-4.3.75-generator-trunk.patch:
generators/dump/CMakeLists.txt | 2
generators/smoke/CMakeLists.txt | 2
generators/smoke/globals.h | 8 -
generators/smoke/helpers.cpp | 141 +++++++++++++-------------------
generators/smoke/writeClasses.cpp | 40 +++++++--
generators/smoke/writeSmokeDataFile.cpp | 15 ++-
generatorvisitor.cpp | 49 +++++++----
main.cpp | 2
type.h | 10 ++
9 files changed, 154 insertions(+), 115 deletions(-)
Index: kdebindings-4.3.75-generator-trunk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.75-generator-trunk.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebindings-4.3.75-generator-trunk.patch 26 Nov 2009 17:36:35 -0000 1.2
+++ kdebindings-4.3.75-generator-trunk.patch 26 Nov 2009 18:15:03 -0000 1.3
@@ -1,7 +1,7 @@
Index: generatorvisitor.cpp
===================================================================
--- generatorvisitor.cpp (revision 1048496)
-+++ generatorvisitor.cpp (revision 1052427)
++++ generatorvisitor.cpp (revision 1054740)
@@ -463,6 +463,18 @@
}
}
@@ -71,7 +71,7 @@ Index: generatorvisitor.cpp
Index: main.cpp
===================================================================
--- main.cpp (revision 1048496)
-+++ main.cpp (revision 1052427)
++++ main.cpp (revision 1054740)
@@ -85,7 +85,7 @@
} else if (args[i] == "-d") {
ParserOptions::definesList = QFileInfo(args[++i]);
@@ -84,7 +84,7 @@ Index: main.cpp
Index: type.h
===================================================================
--- type.h (revision 1048496)
-+++ type.h (revision 1052427)
++++ type.h (revision 1054740)
@@ -269,7 +269,7 @@
{
public:
@@ -119,7 +119,7 @@ Index: type.h
Index: generators/dump/CMakeLists.txt
===================================================================
--- generators/dump/CMakeLists.txt (revision 1048496)
-+++ generators/dump/CMakeLists.txt (revision 1052427)
++++ generators/dump/CMakeLists.txt (revision 1054740)
@@ -3,6 +3,6 @@
set(generator_dump_SRC
generator_dump.cpp)
@@ -131,7 +131,7 @@ Index: generators/dump/CMakeLists.txt
Index: generators/smoke/helpers.cpp
===================================================================
--- generators/smoke/helpers.cpp (revision 1048496)
-+++ generators/smoke/helpers.cpp (revision 1052427)
++++ generators/smoke/helpers.cpp (revision 1054740)
@@ -346,6 +346,22 @@
return publicDtorFound;
}
@@ -328,7 +328,7 @@ Index: generators/smoke/helpers.cpp
Index: generators/smoke/writeSmokeDataFile.cpp
===================================================================
--- generators/smoke/writeSmokeDataFile.cpp (revision 1048496)
-+++ generators/smoke/writeSmokeDataFile.cpp (revision 1052427)
++++ generators/smoke/writeSmokeDataFile.cpp (revision 1054740)
@@ -54,9 +54,8 @@
// These classes need to be indexed as well.
foreach (const QString& className, includedClasses) {
@@ -341,10 +341,34 @@ Index: generators/smoke/writeSmokeDataFi
usedTypes << meth->type();
foreach (const Parameter& param, meth->parameters()) {
usedTypes << param.type();
+@@ -452,6 +451,8 @@
+ if (isExternal && !declaredVirtualMethods.contains(klass))
+ continue;
+
++ QList<const Method*> virtualMethods = Util::virtualMethodsForClass(klass);
++
+ int xcall_index = 1;
+ foreach (const Method& meth, klass->methods()) {
+ if (isExternal && !declaredVirtualMethods[klass].contains(&meth))
+@@ -487,6 +488,14 @@
+ flags += "|Smoke::mf_attribute";
+ if (meth.isQPropertyAccessor())
+ flags += "|Smoke::mf_property";
++
++ // Simply checking for flags() & Method::Virtual won't be enough, because methods can override virtuals without being
++ // declared 'virtual' themselves (and they're still virtual, then).
++ if (virtualMethods.contains(&meth))
++ flags += "|Smoke::mf_virtual";
++ if (meth.flags() & Method::PureVirtual)
++ flags += "|Smoke::mf_purevirtual";
++
+ flags.replace("0|", "");
+ out << flags;
+ if (meth.type() == Type::Void) {
Index: generators/smoke/globals.h
===================================================================
--- generators/smoke/globals.h (revision 1048496)
-+++ generators/smoke/globals.h (revision 1052427)
++++ generators/smoke/globals.h (revision 1054740)
@@ -89,7 +89,7 @@
void generateGetAccessor(QTextStream& out, const QString& className, const Field& field, const Type* type, int index);
void generateSetAccessor(QTextStream& out, const QString& className, const Field& field, const Type* type, int index);
@@ -384,7 +408,7 @@ Index: generators/smoke/globals.h
Index: generators/smoke/writeClasses.cpp
===================================================================
--- generators/smoke/writeClasses.cpp (revision 1048496)
-+++ generators/smoke/writeClasses.cpp (revision 1052427)
++++ generators/smoke/writeClasses.cpp (revision 1054740)
@@ -246,7 +246,7 @@
<< " }\n";
}
@@ -479,7 +503,7 @@ Index: generators/smoke/writeClasses.cpp
Index: generators/smoke/CMakeLists.txt
===================================================================
--- generators/smoke/CMakeLists.txt (revision 1048496)
-+++ generators/smoke/CMakeLists.txt (revision 1052427)
++++ generators/smoke/CMakeLists.txt (revision 1054740)
@@ -6,6 +6,6 @@
writeSmokeDataFile.cpp
helpers.cpp)
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- kdebindings.spec 26 Nov 2009 17:36:35 -0000 1.262
+++ kdebindings.spec 26 Nov 2009 18:15:03 -0000 1.263
@@ -54,7 +54,7 @@
Name: kdebindings
Version: 4.3.75
-Release: 0.3.%{alphatag}%{?dist}
+Release: 0.4.%{alphatag}%{?dist}
Summary: KDE bindings to non-C++ languages
# http://techbase.kde.org/Policies/Licensing_Policy
@@ -75,8 +75,10 @@ Patch2: kdebindings-4.3.75-no-rpath.pat
## upstream patches
# 4.4 trunk:
-# update generator to trunk rev 1052427 for fixes
+# update generator to the current trunk for fixes
Patch100: kdebindings-4.3.75-generator-trunk.patch
+# update smoke to the current trunk for fixes
+Patch101: kdebindings-4.3.75-smoke-trunk.patch
BuildRequires: akonadi-devel >= 1.1.0
@@ -289,8 +291,11 @@ Falcon plugin for the Kross archtecture
pushd generator
%patch100 -p0 -b .generator-trunk
popd
+pushd smoke
+%patch101 -p0 -b .smoke-trunk
+popd
-# do the no-rpath hack last, after the upstream backport
+# do the no-rpath hack last, after the upstream backports
%patch2 -p1 -b .no-rpath
sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
@@ -555,6 +560,9 @@ fi
%changelog
+* Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496
+- update generator and smoke to the current trunk for more fixes
+
* Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
- update generator to trunk rev 1052427 for fixes
- Previous message: rpms/findutils/devel findutils-4.4.2-selinux-gnulib.patch, NONE, 1.1 findutils-4.4.2-selinux.patch, NONE, 1.1 findutils-4.4.2-fts-remount.patch, 1.1, 1.2 findutils-4.4.2-xautofs.patch, 1.1, 1.2 findutils.spec, 1.66, 1.67 findutils-4.4.0-selinux.patch, 1.2, NONE
- Next message: rpms/telepathy-gabble/devel proxy.patch, NONE, 1.1 telepathy-gabble.spec, 1.70, 1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list