Hello community, here is the log from the commit of package mono-qt4 for openSUSE:Factory checked in at 2012-01-27 15:22:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-qt4 (Old) and /work/SRC/openSUSE:Factory/.mono-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mono-qt4", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-qt4/mono-qt4.changes 2011-12-08 11:29:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mono-qt4.new/mono-qt4.changes 2012-01-27 15:22:21.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 21:01:04 CET 2012 - [email protected] + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:35:08 CET 2012 - [email protected] + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- qyoto-4.7.4.tar.bz2 New: ---- qyoto-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-qt4.spec ++++++ --- /var/tmp/diff_new_pack.5OOswA/_old 2012-01-27 15:22:22.000000000 +0100 +++ /var/tmp/diff_new_pack.5OOswA/_new 2012-01-27 15:22:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mono-qt4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: mono-qt4 -Version: 4.7.4 -Release: 1 -License: GPL-2.0+ +Version: 4.8.0 +Release: 0 Summary: Mono Qt4 kdebindings library -Url: https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto +License: GPL-2.0+ Group: Development/Languages/Mono +Url: https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto Source0: qyoto-%{version}.tar.bz2 Patch1: qyoto-remove-examples.patch BuildRequires: cmake @@ -49,7 +47,7 @@ %prep %setup -q -n qyoto-%{version} -%patch1 +%patch1 -p1 %build %cmake_kde4 -d build @@ -60,7 +58,6 @@ %make_install %package -n libqyoto2 -License: GPL-2.0+ Summary: Mono bindings for Qt4 libraries Group: Development/Languages/Mono @@ -68,7 +65,6 @@ Shared library for the .NET/Mono bindings for the Qt4 libraries. %package devel -License: GPL-2.0+ Summary: Development libraries for Mono-Qt4 Group: Development/Languages/Mono Requires: %{name} = %{version} ++++++ qyoto-4.7.4.tar.bz2 -> qyoto-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/CMakeLists.txt new/qyoto-4.8.0/CMakeLists.txt --- old/qyoto-4.7.4/CMakeLists.txt 2011-06-22 18:33:32.000000000 +0200 +++ new/qyoto-4.8.0/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -3,14 +3,17 @@ cmake_minimum_required(VERSION 2.6) find_package(Qt4 REQUIRED) -find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg QSci QImageBlitz Phonon) +find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg QtScript QtTest QtUiTools QtWebKit QSci QImageBlitz Phonon) include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_BUILD_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR}) include(MacroOptionalFindPackage) include(MacroOptionalAddBindings) include(MacroLogFeature) enable_language(CSharp OPTIONAL) -set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/) + +if (NOT LIB_INSTALL_DIR) + set (LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) +endif (NOT LIB_INSTALL_DIR) set(KEYFILE ${CMAKE_CURRENT_SOURCE_DIR}/key.snk) install(FILES ${KEYFILE} DESTINATION share/qyoto ) @@ -26,7 +29,6 @@ src/methodcall.cpp src/methodreturnvalue.cpp src/modelfunctions.cpp - src/qdbus_interop.cpp src/qmetatype_interop.cpp src/qobject_interop.cpp src/qvariant_interop.cpp @@ -38,8 +40,12 @@ src/virtualmethodcall.cpp src/virtualmethodreturnvalue.cpp ) +if (SMOKE_QTDBUS_LIBRARY) + SET(SRC_QYOTO ${SRC_QYOTO} src/qdbus_interop.cpp) + add_definitions(-DUSING_QTDBUS) +endif (SMOKE_QTDBUS_LIBRARY) -SET(SRC_CS_QYOTO src/SmokeInvocation.cs +SET(SRC_CS_QYOTO_IN src/SmokeInvocation.cs src/SmokeMarshallers.cs src/Qyoto.cs src/QyotoMetaData.cs @@ -53,6 +59,17 @@ opengl/*.cs qdbus/*.cs) +if (WIN32) + # Microsoft's .NET compiler needs backslashes. Two are needed + # because CMake uses backslash as an escape character. + foreach (arg ${SRC_CS_QYOTO_IN}) + string (REPLACE "/" "\\\\" arg ${arg}) + SET(SRC_CS_QYOTO ${SRC_CS_QYOTO} ${arg}) + endforeach (arg ${SRC_CS_QYOTO_IN}) +else (WIN32) + SET (SRC_CS_QYOTO ${SRC_CS_QYOTO_IN}) +endif (WIN32) + LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) ADD_LIBRARY (qyoto SHARED ${SRC_QYOTO}) @@ -63,9 +80,14 @@ ${SMOKE_QTOPENGL_LIBRARY} ${SMOKE_QTSQL_LIBRARY} ${SMOKE_QTNETWORK_LIBRARY} - ${SMOKE_QTDBUS_LIBRARY} ${SMOKE_QTSVG_LIBRARY} - ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY}) + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTNETWORK_LIBRARY}) +if (SMOKE_QTDBUS_LIBRARY) + TARGET_LINK_LIBRARIES (qyoto ${SMOKE_QTDBUS_LIBRARY} + ${QT_QTDBUS_LIBRARY}) +endif (SMOKE_QTDBUS_LIBRARY) set_target_properties(qyoto PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_DEFINITIONS QYOTO_BUILDING) @@ -78,10 +100,17 @@ FILE(WRITE ${library_target_dir}/qt-dotnet.dll.config "<configuration><dllmap dll=\"qyoto\" target=\"libqyoto.so.2\"/></configuration>") install_assembly(qt-dotnet DESTINATION lib PACKAGE qyoto) -INSTALL(TARGETS qyoto EXPORT QyotoExport LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(TARGETS qyoto EXPORT QyotoExport + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qyoto PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL(FILES src/emitsignal.h src/callbacks.h src/invokeslot.h src/marshall.h src/marshall_macros.h src/methodcall.h src/methodreturnvalue.h src/qyoto.h src/qyotosmokebinding.h src/signalreturnvalue.h src/slotreturnvalue.h src/smokeqyoto.h src/virtualmethodcall.h src/virtualmethodreturnvalue.h DESTINATION include/qyoto) -INSTALL(EXPORT QyotoExport DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qyoto/cmake NAMESPACE QYOTO_ ) +INSTALL(EXPORT QyotoExport DESTINATION share/qyoto/cmake NAMESPACE QYOTO_ ) add_subdirectory(tools) add_subdirectory(examples EXCLUDE_FROM_ALL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/cmake/CMakeDetermineCSharpCompiler.cmake new/qyoto-4.8.0/cmake/CMakeDetermineCSharpCompiler.cmake --- old/qyoto-4.7.4/cmake/CMakeDetermineCSharpCompiler.cmake 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/cmake/CMakeDetermineCSharpCompiler.cmake 2011-12-20 20:11:07.000000000 +0100 @@ -8,15 +8,16 @@ # loading this file to force a compiler. if(NOT CMAKE_CSharp_COMPILER) - # prefer the environment variable CSC - if($ENV{CSC} MATCHES ".+") + # prefer the environment variable CSC, but not if it's .NET 2.0, + # because Qyoto uses .NET 3.5 features + if($ENV{CSC} MATCHES ".+" AND NOT $ENV{CSC} MATCHES "2.0") if (EXISTS $ENV{CSC}) message(STATUS "Found compiler set in environment variable CSC: $ENV{CSC}.") set(CMAKE_CSharp_COMPILER $ENV{CSC}) else (EXISTS $ENV{CSC}) message(SEND_ERROR "Could not find compiler set in environment variable CSC:\n$ENV{CSC}.") endif (EXISTS $ENV{CSC}) - endif($ENV{CSC} MATCHES ".+") + endif($ENV{CSC} MATCHES ".+" AND NOT $ENV{CSC} MATCHES "2.0") # if no compiler has been specified yet, then look for one if (NOT CMAKE_CSharp_COMPILER) @@ -26,8 +27,8 @@ # still not found, try csc.exe if (NOT CMAKE_CSharp_COMPILER) get_filename_component(dotnet_path "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework;InstallRoot]" PATH) - find_program(CMAKE_CSharp_COMPILER NAMES csc PATHS "${dotnet_path}/Framework/v2.0.50727") - file(TO_NATIVE_PATH "${dotnet_path}/Framework/v2.0.50727" native_path) + find_program(CMAKE_CSharp_COMPILER NAMES csc PATHS "${dotnet_path}/Framework/v3.5") + file(TO_NATIVE_PATH "${dotnet_path}/Framework/v3.5" native_path) message(STATUS "Looking for csc: ${CMAKE_CSharp_COMPILER}") # give up diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/phonon/CMakeLists.txt new/qyoto-4.8.0/phonon/CMakeLists.txt --- old/qyoto-4.7.4/phonon/CMakeLists.txt 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/phonon/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -10,10 +10,21 @@ SET(SRC_CPP src/phonon.cpp src/phononhandlers.cpp) -SET(SRC_CS src/PhononBinding.cs +SET(SRC_CS_IN src/PhononBinding.cs src/AssemblyInfo.cs phonon/*.cs) +if (WIN32) + # Microsoft's .NET compiler needs backslashes. Two are needed + # because CMake uses backslash as an escape character. + foreach (arg ${SRC_CS_IN}) + string (REPLACE "/" "\\\\" arg ${arg}) + SET(SRC_CS ${SRC_CS} ${arg}) + endforeach (arg ${SRC_CS_IN}) +else (WIN32) + SET (SRC_CS ${SRC_CS_IN}) +endif (WIN32) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/generator ${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES} ${PHONON_INCLUDES}) LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) @@ -23,5 +34,11 @@ CSHARP_ADD_LIBRARY(phonon "${SRC_CS}" REFERENCES qt-dotnet COMPILE_FLAGS /warn:0 /keyfile:${KEYFILE}) ADD_DEPENDENCIES(phonon qt-dotnet phonon-sharp ${SMOKE_PHONON_LIBRARY}) -INSTALL(TARGETS phonon-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS phonon-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(phonon-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(phonon DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/qimageblitz/CMakeLists.txt new/qyoto-4.8.0/qimageblitz/CMakeLists.txt --- old/qyoto-4.7.4/qimageblitz/CMakeLists.txt 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/qimageblitz/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -24,5 +24,12 @@ CSHARP_ADD_LIBRARY(qimageblitz "${SRC_CS}" REFERENCES qt-dotnet COMPILE_FLAGS /warn:0 /keyfile:${KEYFILE}) ADD_DEPENDENCIES(qimageblitz qt-dotnet qimageblitz-sharp ${SMOKE_QIMAGEBLITZ_LIBRARY}) -INSTALL(TARGETS qimageblitz-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qimageblitz-sharp + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qimageblitz-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(qimageblitz DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/qscintilla/CMakeLists.txt new/qyoto-4.8.0/qscintilla/CMakeLists.txt --- old/qyoto-4.7.4/qscintilla/CMakeLists.txt 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/qscintilla/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -23,5 +23,12 @@ CSHARP_ADD_LIBRARY(qscintilla "${SRC_CS}" REFERENCES qt-dotnet COMPILE_FLAGS /warn:0 /keyfile:${KEYFILE}) ADD_DEPENDENCIES(qscintilla qt-dotnet qscintilla-sharp ${SMOKE_QSCI_LIBRARY}) -INSTALL(TARGETS qscintilla-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qscintilla-sharp + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qscintilla-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(qscintilla DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/qtscript/CMakeLists.txt new/qyoto-4.8.0/qtscript/CMakeLists.txt --- old/qyoto-4.7.4/qtscript/CMakeLists.txt 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/qtscript/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -7,10 +7,21 @@ SET(SRC_CPP src/qtscript.cpp src/qtscripthandlers.cpp) -SET(SRC_CS src/QtScript.cs +SET(SRC_CS_IN src/QtScript.cs src/AssemblyInfo.cs qtscript/*.cs) +if (WIN32) + # Microsoft's .NET compiler needs backslashes. Two are needed + # because CMake uses backslash as an escape character. + foreach (arg ${SRC_CS_IN}) + string (REPLACE "/" "\\\\" arg ${arg}) + SET(SRC_CS ${SRC_CS} ${arg}) + endforeach (arg ${SRC_CS_IN}) +else (WIN32) + SET (SRC_CS ${SRC_CS_IN}) +endif (WIN32) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES}) LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) ADD_LIBRARY(qtscript-sharp SHARED ${SRC_CPP}) @@ -20,5 +31,12 @@ SET_PROPERTY(TARGET qtscript PROPERTY pkg-config_template_basename ${PROJECT_NAME}) ADD_DEPENDENCIES(qtscript qt-dotnet qtscript-sharp ${SMOKE_QTSCRIPT_LIBRARY}) message(STATUS "hello " ${LIB_INSTALL_DIR}) -INSTALL(TARGETS qtscript-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qtscript-sharp + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qtscript-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(qtscript DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/qttest/CMakeLists.txt new/qyoto-4.8.0/qttest/CMakeLists.txt --- old/qyoto-4.7.4/qttest/CMakeLists.txt 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/qttest/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -6,10 +6,21 @@ SET(SRC_CPP src/qttest.cpp src/qttesthandlers.cpp) -SET(SRC_CS src/QtTest.cs +SET(SRC_CS_IN src/QtTest.cs src/AssemblyInfo.cs qttest/*.cs) +if (WIN32) + # Microsoft's .NET compiler needs backslashes. Two are needed + # because CMake uses backslash as an escape character. + foreach (arg ${SRC_CS_IN}) + string (REPLACE "/" "\\\\" arg ${arg}) + SET(SRC_CS ${SRC_CS} ${arg}) + endforeach (arg ${SRC_CS_IN}) +else (WIN32) + SET (SRC_CS ${SRC_CS_IN}) +endif (WIN32) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/generator ${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES}) LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) @@ -20,5 +31,11 @@ SET_PROPERTY(TARGET qttest PROPERTY pkg-config_template_basename ${PROJECT_NAME}) ADD_DEPENDENCIES(qttest qt-dotnet) -INSTALL(TARGETS qttest-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qttest-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qttest-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(qttest DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/qtuitools/CMakeLists.txt new/qyoto-4.8.0/qtuitools/CMakeLists.txt --- old/qyoto-4.7.4/qtuitools/CMakeLists.txt 2011-06-22 18:33:32.000000000 +0200 +++ new/qyoto-4.8.0/qtuitools/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -6,19 +6,37 @@ SET(SRC_CPP src/qtuitools.cpp src/qtuitoolshandlers.cpp) -SET(SRC_CS src/QtUiTools.cs +SET(SRC_CS_IN src/QtUiTools.cs src/AssemblyInfo.cs qtuitools/*.cs) +if (WIN32) + # Microsoft's .NET compiler needs backslashes. Two are needed + # because CMake uses backslash as an escape character. + foreach (arg ${SRC_CS_IN}) + string (REPLACE "/" "\\\\" arg ${arg}) + SET(SRC_CS ${SRC_CS} ${arg}) + endforeach (arg ${SRC_CS_IN}) +else (WIN32) + SET (SRC_CS ${SRC_CS_IN}) +endif (WIN32) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/generator ${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES}) LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) ADD_LIBRARY(qtuitools-sharp SHARED ${SRC_CPP}) -TARGET_LINK_LIBRARIES(qtuitools-sharp ${SMOKE_QUITOOLS_LIBRARY} qyoto ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTUITOOLS_LIBRARY}) +TARGET_LINK_LIBRARIES(qtuitools-sharp ${SMOKE_QTUITOOLS_LIBRARY} qyoto ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTUITOOLS_LIBRARY}) CSHARP_ADD_LIBRARY(qtuitools "${SRC_CS}" REFERENCES qt-dotnet COMPILE_FLAGS /warn:0 /keyfile:${KEYFILE}) SET_PROPERTY(TARGET qtuitools PROPERTY pkg-config_template_basename ${PROJECT_NAME}) ADD_DEPENDENCIES(qtuitools qt-dotnet qtuitools-sharp ${SMOKE_QUITOOLS_LIBRARY}) -INSTALL(TARGETS qtuitools-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qtuitools-sharp + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qtuitools-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(qtuitools DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/qtwebkit/CMakeLists.txt new/qyoto-4.8.0/qtwebkit/CMakeLists.txt --- old/qyoto-4.7.4/qtwebkit/CMakeLists.txt 2011-05-20 22:33:35.000000000 +0200 +++ new/qyoto-4.8.0/qtwebkit/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -6,10 +6,21 @@ SET(SRC_CPP src/qtwebkit.cpp src/qtwebkithandlers.cpp) -SET(SRC_CS src/QtWebKit.cs +SET(SRC_CS_IN src/QtWebKit.cs src/AssemblyInfo.cs qtwebkit/*.cs) +if (WIN32) + # Microsoft's .NET compiler needs backslashes. Two are needed + # because CMake uses backslash as an escape character. + foreach (arg ${SRC_CS_IN}) + string (REPLACE "/" "\\\\" arg ${arg}) + SET(SRC_CS ${SRC_CS} ${arg}) + endforeach (arg ${SRC_CS_IN}) +else (WIN32) + SET (SRC_CS ${SRC_CS_IN}) +endif (WIN32) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/generator ${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES}) LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH}) @@ -20,5 +31,12 @@ SET_PROPERTY(TARGET qtwebkit PROPERTY pkg-config_template_basename ${PROJECT_NAME}) ADD_DEPENDENCIES(qtwebkit qt-dotnet qtwebkit-sharp ${SMOKE_QTWEBKIT_LIBRARY}) -INSTALL(TARGETS qtwebkit-sharp LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qtwebkit-sharp + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(qtwebkit-sharp PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) INSTALL_ASSEMBLY(qtwebkit DESTINATION ${LIB_INSTALL_DIR} PACKAGE qyoto) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/src/qyoto.cpp new/qyoto-4.8.0/src/qyoto.cpp --- old/qyoto-4.7.4/src/qyoto.cpp 2011-05-20 22:33:36.000000000 +0200 +++ new/qyoto-4.8.0/src/qyoto.cpp 2011-12-20 20:11:07.000000000 +0100 @@ -65,12 +65,14 @@ #include <qtopengl_smoke.h> #include <qtnetwork_smoke.h> #include <qtsvg_smoke.h> +#ifdef USING_QTDBUS #include <qtdbus_smoke.h> +#endif // USING_QTDBUS extern bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); extern bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); -extern Q_DECL_IMPORT TypeHandler Qyoto_handlers[]; +extern Q_DECL_EXPORT TypeHandler Qyoto_handlers[]; extern bool IsContainedInstanceQt(smokeqyoto_object *o); extern const char * qyoto_resolve_classname_qt(smokeqyoto_object * o); @@ -376,7 +378,9 @@ init_qtopengl_Smoke(); init_qtnetwork_Smoke(); init_qtsvg_Smoke(); + #ifdef USING_QTDBUS init_qtdbus_Smoke(); + #endif // USING_QTDBUS qyoto_install_handlers(Qyoto_handlers); QByteArray prefix("Qyoto."); @@ -388,7 +392,9 @@ INIT_BINDING(qtopengl) INIT_BINDING(qtnetwork) INIT_BINDING(qtsvg) + #ifdef USING_QTDBUS INIT_BINDING(qtdbus) + #endif // USING_QTDBUS #if QT_VERSION >= 0x40300 QInternal::registerCallback(QInternal::EventNotifyCallback, qyoto_event_notify); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/src/slotreturnvalue.cpp new/qyoto-4.8.0/src/slotreturnvalue.cpp --- old/qyoto-4.7.4/src/slotreturnvalue.cpp 2011-05-20 22:33:36.000000000 +0200 +++ new/qyoto-4.8.0/src/slotreturnvalue.cpp 2011-12-20 20:11:07.000000000 +0100 @@ -13,7 +13,9 @@ * * ***************************************************************************/ +#ifdef USING_QTDBUS #include <QtDBus> +#endif // USING_QTDBUS #include "slotreturnvalue.h" #include "qyoto.h" @@ -31,9 +33,12 @@ QByteArray t(type().name()); t.replace("const ", ""); t.replace("&", ""); + #ifdef USING_QTDBUS if (t == "QDBusVariant") { *reinterpret_cast<QDBusVariant*>(o[0]) = *(QDBusVariant*) _stack[0].s_class; - } else { + } else + #endif // USING_QTDBUS + { // Save any address in zeroth element of the arrary of 'void*'s passed to // qt_metacall() void * ptr = o[0]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qyoto-4.7.4/tools/uics/CMakeLists.txt new/qyoto-4.8.0/tools/uics/CMakeLists.txt --- old/qyoto-4.7.4/tools/uics/CMakeLists.txt 2011-05-20 22:33:36.000000000 +0200 +++ new/qyoto-4.8.0/tools/uics/CMakeLists.txt 2011-12-20 20:11:07.000000000 +0100 @@ -22,6 +22,10 @@ add_executable(uics_bin ${uics_bin_SRCS}) set_target_properties(uics_bin PROPERTIES OUTPUT_NAME uics) set_target_properties(uics_bin PROPERTIES COMPILE_FLAGS -DQT_UIC_CS_GENERATOR) +if (WIN32) + # So that ui4.h gets the right value of QDESIGNER_UILIB_EXPORT + set_target_properties(uics_bin PROPERTIES COMPILE_FLAGS "-DQT_UIC_CS_GENERATOR -DQDESIGNER_UILIB_LIBRARY") +endif (WIN32) target_link_libraries(uics_bin ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) ++++++ qyoto-remove-examples.patch ++++++ --- /var/tmp/diff_new_pack.5OOswA/_old 2012-01-27 15:22:22.000000000 +0100 +++ /var/tmp/diff_new_pack.5OOswA/_new 2012-01-27 15:22:22.000000000 +0100 @@ -1,7 +1,9 @@ ---- CMakeLists.txt 2011-06-22 18:33:32.000000000 +0200 -+++ CMakeLists.txt 2011-08-24 13:13:19.127160540 +0200 -@@ -84,7 +84,6 @@ - INSTALL(EXPORT QyotoExport DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qyoto/cmake NAMESPACE QYOTO_ ) +Index: qyoto-4.7.98/CMakeLists.txt +=================================================================== +--- qyoto-4.7.98.orig/CMakeLists.txt ++++ qyoto-4.7.98/CMakeLists.txt +@@ -113,7 +113,6 @@ src/smokeqyoto.h src/virtualmethodcall.h + INSTALL(EXPORT QyotoExport DESTINATION share/qyoto/cmake NAMESPACE QYOTO_ ) add_subdirectory(tools) -add_subdirectory(examples EXCLUDE_FROM_ALL) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
