diff options
3 files changed, 96 insertions, 2 deletions
diff --git a/kde-base/kdebindings-csharp/Manifest b/kde-base/kdebindings-csharp/Manifest index 82d435478d8..2b1a9f4fcd0 100644 --- a/kde-base/kdebindings-csharp/Manifest +++ b/kde-base/kdebindings-csharp/Manifest @@ -1,8 +1,9 @@ +AUX kdebindings-csharp-9999-build-fixes.patch 4750 RMD160 a0a7ff494851da27f34af84f40375cdeaf0b2fb8 SHA1 3c2bee22445c6ebd748c1262ed3ebeb798331dea SHA256 62c21602db7a44cf6c058a89de892074581091f3096627663f46302dadd683d4 AUX kdebindings-csharp-build-fixes.patch 4461 RMD160 39443416a09e87fdfc533b2656ef851693559f60 SHA1 0c77db7022ee6ff99c5c1d7c5960338c13391264 SHA256 33fe31520b3772fc4d72495ecd534e212942e5e0513c52e24faba1e1356eca7b DIST kdebindings-4.3.82.tar.xz 4045188 RMD160 cdfbd68c4641a434242c1d9dc728ef8ccd49b30d SHA1 ee817a44cc356f73a8f4a681874a4c66373b10ae SHA256 09789016988524e5f9f292be429e449f8b04a3c4889468fee207a5a41fff254c DIST kdebindings-4.3.85.tar.bz2 5004008 RMD160 15601381e150cb2d677636823083853edda6b7e7 SHA1 bcdb44bb4644ac0393ccb465ceb9f931778a873d SHA256 caf049ed50ec14fc3a6f9387cc31d020bcf97ea7b381d80b9d90c78e4095b73a EBUILD kdebindings-csharp-4.3.82.ebuild 1349 RMD160 353dde63d9c8c9b34ebf39c5e1c3d28c6e5a721c SHA1 ef0a931f9250fb491412e106a6aeb9ef59d37053 SHA256 5db6f99cff026da71992823102f60dc184147229a6f2a17f25cd7d533034f49b EBUILD kdebindings-csharp-4.3.85.ebuild 1349 RMD160 353dde63d9c8c9b34ebf39c5e1c3d28c6e5a721c SHA1 ef0a931f9250fb491412e106a6aeb9ef59d37053 SHA256 5db6f99cff026da71992823102f60dc184147229a6f2a17f25cd7d533034f49b EBUILD kdebindings-csharp-4.3.9999.ebuild 1326 RMD160 08c312ad48e236dfc22201db04069a3749b05d97 SHA1 65d1460dba87f6756e3bc59999ffc149e1f37969 SHA256 c66bb83cf9bf4efb0bbe3ebcab9bd8d2057435eb194a0fc8993a76eac5c47b8e -EBUILD kdebindings-csharp-9999.ebuild 1333 RMD160 17218cf7a3ca889864c82ff4454ab7f9778b62ff SHA1 5ceb24aca2637bbfe4234308cf0a19ba599e96a7 SHA256 6381d98a487f3f5cf2ce70447cf49792c8694c7f5e8de74a225be48029f5749c +EBUILD kdebindings-csharp-9999.ebuild 1332 RMD160 c3ab54cc403221a666eb3c04e8a4fd224d2bef63 SHA1 ef7c4ca99c3d033eb817445fbfb4a8b423b32252 SHA256 cc3ed3d149b5d938fe35dab98b60ee96029511c200aaea9448e3dc7e40b864a3 MISC metadata.xml 553 RMD160 07bd37da27f0090d0a4a2b2972a0345810590eda SHA1 1062f220972b268718182c5cc282a81546403037 SHA256 771ea1c1f71de07e2b1ea4304a79ba9e0dab1234c2e2a0889cf6944a5d0e3f87 diff --git a/kde-base/kdebindings-csharp/files/kdebindings-csharp-9999-build-fixes.patch b/kde-base/kdebindings-csharp/files/kdebindings-csharp-9999-build-fixes.patch new file mode 100644 index 00000000000..01c17d4110e --- /dev/null +++ b/kde-base/kdebindings-csharp/files/kdebindings-csharp-9999-build-fixes.patch @@ -0,0 +1,93 @@ +--- 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/kdebindings-csharp-9999.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild index c63e74fbe22..972dc373d8e 100644 --- a/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild +++ b/kde-base/kdebindings-csharp/kdebindings-csharp-9999.ebuild @@ -21,7 +21,7 @@ RDEPEND="${DEPEND}" KMEXTRACTONLY="smoke/" -PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch ) +PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch ) pkg_setup() { kde4-meta_pkg_setup |