[kde-base/kdebindings-csharp:4.4] Make it work, fix bug 307995

2 files changed, 41 insertions, 93 deletions

diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
deleted file mode 100644
index 01c17d4110e..00000000000
--- a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-build-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- csharp/qtscript/CMakeLists.txt
-+++ csharp/qtscript/CMakeLists.txt
-@@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(qtscript-sharp MODULE ${SRC_CPP})
--TARGET_LINK_LIBRARIES(qtscript-sharp smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtscript-sharp smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qtscript "${SRC_CS}" ALL)
---- csharp/qtwebkit/CMakeLists.txt
-+++ csharp/qtwebkit/CMakeLists.txt
-@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(qtwebkit-sharp MODULE ${SRC_CPP})
--TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(qtwebkit "${SRC_CS}" ALL)
---- csharp/qyoto/CMakeLists.txt
-+++ csharp/qyoto/CMakeLists.txt
-@@ -39,13 +39,13 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CM
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- 
- ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
- TARGET_LINK_LIBRARIES (qyotoshared smokeqtcore smokeqtgui smokeqtxml smokeqtopengl smokeqtsql smokeqtnetwork smokeqtnetwork smokeqtdbus smokeqtsvg
--                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QNETWORK_LIBRARY})
- set_target_properties(qyotoshared PROPERTIES VERSION 1.0.0 SOVERSION 1 COMPILE_DEFINITIONS QYOTOSHARED_BUILDING)
- 
- ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
- TARGET_LINK_LIBRARIES (qyoto qyotoshared
-                        smokeqtcore smokeqtgui smokeqtxml smokeqtopengl smokeqtsql smokeqtnetwork smokeqtnetwork smokeqtdbus smokeqtsvg
--                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+                       ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
- 
- CSHARP_ADD_LIBRARY(qt-dotnet ${SRC_CS_QYOTO} COMPILE_FLAGS /warn:0 "/keyfile:${KEYFILE}" UNSAFE)
- SET_PROPERTY(TARGET qt-dotnet PROPERTY pkg-config_template_basename "qyoto")
---- csharp/soprano/CMakeLists.txt
-+++ csharp/soprano/CMakeLists.txt
-@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
- ADD_LIBRARY(soprano-sharp MODULE ${SRC_CPP})
- ADD_DEPENDENCIES(soprano-sharp smokesoprano)
--TARGET_LINK_LIBRARIES(soprano-sharp smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(soprano-sharp smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${SOPRANO_LIBRARIES})
- 
- SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
- ADD_CS_LIBRARY(soprano "${SRC_CS}" ALL)
---- csharp/CMakeLists.txt	2009-09-02 13:30:38.045355025 +0300
-+++ csharp/CMakeLists.txt	2009-09-02 13:31:40.426071410 +0300
-@@ -3,6 +3,7 @@
- OPTION(ENABLE_QTTEST "build QtTest" ON)
- OPTION(ENABLE_QTUITOOLS_SHARP "build QtUiTools" ON)
- OPTION(ENABLE_QTWEBKIT_SHARP "build QtWebKit" ON)
-+OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" ON)
- OPTION(ENABLE_PHONON_SHARP "build PhononSharp" OFF)
- OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
- OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
-@@ -15,7 +16,8 @@
- set(QTTEST_ENABLED "no")
- SET(QTWEBKIT_ENABLED "no")
- SET(QTUITOOLS_ENABLED "no")
--SET(QTWEBKIT_ENABLED "no")
-+SET(QTWEBKIT_SHARP_ENABLED "no")
-+SET(PLASMA_SHARP_ENABLED "no")
- SET(PHONON_SHARP_ENABLED "no")
- SET(QSCINTILLA_SHARP_ENABLED "no")
- SET(AKONADI_ENABLED "no")
-@@ -102,8 +104,10 @@
-             set(AKONADI_ENABLED "yes")
-         endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- 
--        SET(PLASMA_SHARP_ENABLED "yes")
--        ADD_SUBDIRECTORY(plasma)
-+        IF(ENABLE_PLASMA_SHARP)
-+         SET(PLASMA_SHARP_ENABLED "yes")
-+         ADD_SUBDIRECTORY(plasma)
-+        ENDIF(ENABLE_PLASMA_SHARP)
- 
-     ENDIF (CMAKE_CSharp_COMPILER_LOADED)
- endif(ENABLE_QYOTO)
-@@ -114,6 +118,7 @@
- message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
- message(STATUS "Build NepomukSharp... " ${NEPOMUK_SHARP_ENABLED})
- message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
-+message(STATUS "Build QtWebkitSharp... " ${QTWEBKIT_SHARP_ENABLED})
- message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
- message(STATUS "Build KHTMLSharp... " ${KHTML_SHARP_ENABLED})
- message(STATUS "Build KTextEditorSharp... " ${KHTML_SHARP_ENABLED})
diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.1-make-stuff-optional.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.1-make-stuff-optional.patch
new file mode 100644
index 00000000000..2dc071ab25d
--- /dev/null
+++ b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4.1-make-stuff-optional.patch
@@ -0,0 +1,41 @@
+--- csharp/CMakeLists.txt	2009-09-02 13:30:38.045355025 +0300
++++ csharp/CMakeLists.txt	2009-09-02 13:31:40.426071410 +0300
+@@ -3,6 +3,7 @@
+ OPTION(ENABLE_QTTEST "build QtTest" ON)
+ OPTION(ENABLE_QTUITOOLS_SHARP "build QtUiTools" ON)
+ OPTION(ENABLE_QTWEBKIT_SHARP "build QtWebKit" ON)
++OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" ON)
+ OPTION(ENABLE_PHONON_SHARP "build PhononSharp" OFF)
+ OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
+ OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
+@@ -15,7 +16,8 @@
+ set(QTTEST_ENABLED "no")
+ SET(QTWEBKIT_ENABLED "no")
+ SET(QTUITOOLS_ENABLED "no")
+-SET(QTWEBKIT_ENABLED "no")
++SET(QTWEBKIT_SHARP_ENABLED "no")
++SET(PLASMA_SHARP_ENABLED "no")
+ SET(PHONON_SHARP_ENABLED "no")
+ SET(QSCINTILLA_SHARP_ENABLED "no")
+ SET(AKONADI_ENABLED "no")
+@@ -102,8 +104,10 @@
+             set(AKONADI_ENABLED "yes")
+         endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+ 
+-        SET(PLASMA_SHARP_ENABLED "yes")
+-        ADD_SUBDIRECTORY(plasma)
++        IF(ENABLE_PLASMA_SHARP)
++         SET(PLASMA_SHARP_ENABLED "yes")
++         ADD_SUBDIRECTORY(plasma)
++        ENDIF(ENABLE_PLASMA_SHARP)
+ 
+     ENDIF (CMAKE_CSharp_COMPILER_LOADED)
+ endif(ENABLE_QYOTO)
+@@ -114,6 +118,7 @@
+ message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
+ message(STATUS "Build NepomukSharp... " ${NEPOMUK_SHARP_ENABLED})
+ message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
++message(STATUS "Build QtWebkitSharp... " ${QTWEBKIT_SHARP_ENABLED})
+ message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
+ message(STATUS "Build KHTMLSharp... " ${KHTML_SHARP_ENABLED})
+ message(STATUS "Build KTextEditorSharp... " ${KHTML_SHARP_ENABLED})