diff options
author | Alexey Shvetsov <alexxy@gentoo.org> | 2010-02-09 00:21:21 +0000 |
---|---|---|
committer | Alexey Shvetsov <alexxy@gentoo.org> | 2010-02-09 00:21:21 +0000 |
commit | 827452574882bd623822c617af4d45cd11bce3dc (patch) | |
tree | 5a165f455a54b9ae3abc87a2e340808889a93544 /kde-base/kdebindings-csharp | |
parent | [kde-base/qguiplatformplugin_kde] Version bump to KDE SC 4.4.0 (diff) | |
download | gentoo-2-827452574882bd623822c617af4d45cd11bce3dc.tar.gz gentoo-2-827452574882bd623822c617af4d45cd11bce3dc.tar.bz2 gentoo-2-827452574882bd623822c617af4d45cd11bce3dc.zip |
[kde-base/kdebindings-csharp] Version bump to KDE SC 4.4.0
(Portage version: 2.2_rc62/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base/kdebindings-csharp')
3 files changed, 161 insertions, 1 deletions
diff --git a/kde-base/kdebindings-csharp/ChangeLog b/kde-base/kdebindings-csharp/ChangeLog index 3c61be582c25..abeb5ebc3a8f 100644 --- a/kde-base/kdebindings-csharp/ChangeLog +++ b/kde-base/kdebindings-csharp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdebindings-csharp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.19 2010/01/25 15:04:47 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/ChangeLog,v 1.20 2010/02/09 00:21:21 alexxy Exp $ + +*kdebindings-csharp-4.4.0 (08 Feb 2010) + + 08 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> + +kdebindings-csharp-4.4.0.ebuild, + +files/kdebindings-csharp-4.4-build-fixes.patch: + Version bump to KDE SC 4.4.0 *kdebindings-csharp-4.3.5 (25 Jan 2010) 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 new file mode 100644 index 000000000000..01c17d4110e4 --- /dev/null +++ b/kde-base/kdebindings-csharp/files/kdebindings-csharp-4.4-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-4.4.0.ebuild b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild new file mode 100644 index 000000000000..edf7ad1f8390 --- /dev/null +++ b/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/kdebindings-csharp-4.4.0.ebuild,v 1.1 2010/02/09 00:21:21 alexxy Exp $ + +EAPI="2" + +KMNAME="kdebindings" +KMMODULE="csharp" +WEBKIT_REQUIRED="optional" +inherit kde4-meta mono + +DESCRIPTION="C# bindings for KDE and Qt" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="akonadi +phonon plasma qscintilla webkit" + +DEPEND=" + dev-lang/mono + $(add_kdebase_dep smoke 'akonadi?,phonon?,qscintilla?,webkit?') +" +RDEPEND="${DEPEND}" + +KMEXTRACTONLY="smoke/" + +PATCHES=( "${FILESDIR}"/${PN}-4.4-build-fixes.patch ) + +pkg_setup() { + kde4-meta_pkg_setup + + if use plasma && ! use webkit; then + eerror + eerror "The plasma USE flag requires the webkit USE flag to be enabled." + eerror + eerror "Please enable webkit or disable plasma." + die "plasma requires webkit" + fi +} + +src_prepare() { + kde4-meta_src_prepare + + sed -i "/add_subdirectory( examples )/ s:^:#:" csharp/plasma/CMakeLists.txt +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_enable webkit QTWEBKIT_SHARP) + $(cmake-utils_use_enable plasma PLASMA_SHARP) + $(cmake-utils_use_enable phonon PHONON_SHARP) + $(cmake-utils_use_enable qscintilla QSCINTILLA_SHARP) + $(cmake-utils_use_enable akonadi KdepimLibs) + $(cmake-utils_use_enable akonadi) + ) + kde4-meta_src_configure +} + +src_compile() { + # Parallel builds seem broken, check later + MAKEOPTS=-j1 + kde4-meta_src_compile +} |