* [gentoo-commits] gentoo-x86 commit in kde-base/kdebindings-csharp/files: kdebindings-csharp-build-fixes.patch
@ 2009-08-04 0:13 Alex Alexander (wired)
0 siblings, 0 replies; 3+ messages in thread
From: Alex Alexander (wired) @ 2009-08-04 0:13 UTC (permalink / raw
To: gentoo-commits
wired 09/08/04 00:13:35
Added: kdebindings-csharp-build-fixes.patch
Log:
Version bump KDE 4.3.0
(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.1 kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch?rev=1.1&content-type=text/plain
Index: kdebindings-csharp-build-fixes.patch
===================================================================
--- kdebindings.orig/csharp/qtscript/CMakeLists.txt
+++ kdebindings/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 smokeqt smokeqtscript qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(qtscript-sharp smokeqt 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)
--- kdebindings.orig/csharp/qtwebkit/CMakeLists.txt
+++ kdebindings/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 smokeqt smokeqtwebkit qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(qtwebkit-sharp smokeqt 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)
--- kdebindings.orig/csharp/qyoto/CMakeLists.txt
+++ kdebindings/csharp/qyoto/CMakeLists.txt
@@ -39,11 +39,11 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CM
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
-TARGET_LINK_LIBRARIES (qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES (qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY})
set_target_properties(qyotoshared PROPERTIES VERSION 1.0.0 SOVERSION 1)
ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
-TARGET_LINK_LIBRARIES (qyoto qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES (qyoto qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
SET(CS_FLAGS -debug -define:DEBUG -unsafe -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(qt-dotnet "${SRC_CS_QYOTO}" ALL)
--- kdebindings.orig/csharp/soprano/CMakeLists.txt
+++ kdebindings/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 smokeqt smokesoprano qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(soprano-sharp smokeqt 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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/kdebindings-csharp/files: kdebindings-csharp-build-fixes.patch
@ 2009-09-02 10:41 Alex Alexander (wired)
0 siblings, 0 replies; 3+ messages in thread
From: Alex Alexander (wired) @ 2009-09-02 10:41 UTC (permalink / raw
To: gentoo-commits
wired 09/09/02 10:41:46
Modified: kdebindings-csharp-build-fixes.patch
Log:
added plasma use, fixed -webkit build fail
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.2 kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch?r1=1.1&r2=1.2
Index: kdebindings-csharp-build-fixes.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebindings-csharp/files/kdebindings-csharp-build-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebindings-csharp-build-fixes.patch 4 Aug 2009 00:13:35 -0000 1.1
+++ kdebindings-csharp-build-fixes.patch 2 Sep 2009 10:41:46 -0000 1.2
@@ -1,5 +1,5 @@
---- kdebindings.orig/csharp/qtscript/CMakeLists.txt
-+++ kdebindings/csharp/qtscript/CMakeLists.txt
+--- 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})
@@ -9,8 +9,8 @@
SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(qtscript "${SRC_CS}" ALL)
---- kdebindings.orig/csharp/qtwebkit/CMakeLists.txt
-+++ kdebindings/csharp/qtwebkit/CMakeLists.txt
+--- 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})
@@ -20,8 +20,8 @@
SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(qtwebkit "${SRC_CS}" ALL)
---- kdebindings.orig/csharp/qyoto/CMakeLists.txt
-+++ kdebindings/csharp/qyoto/CMakeLists.txt
+--- csharp/qyoto/CMakeLists.txt
++++ csharp/qyoto/CMakeLists.txt
@@ -39,11 +39,11 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CM
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
@@ -36,8 +36,8 @@
SET(CS_FLAGS -debug -define:DEBUG -unsafe -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(qt-dotnet "${SRC_CS_QYOTO}" ALL)
---- kdebindings.orig/csharp/soprano/CMakeLists.txt
-+++ kdebindings/csharp/soprano/CMakeLists.txt
+--- 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})
@@ -47,3 +47,44 @@
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")
+@@ -126,8 +128,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 (GMCS_EXECUTABLE AND GACUTIL_EXECUTABLE AND MONO_CECIL_FOUND)
+ endif(ENABLE_QYOTO)
+@@ -138,6 +142,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})
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/kdebindings-csharp/files: kdebindings-csharp-build-fixes.patch
@ 2010-03-02 10:28 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-02 10:28 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/02 10:28:40
Removed: kdebindings-csharp-build-fixes.patch
Log:
Remove masked and Qt 4.6 incompatible version wrt #295573.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-02 10:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-02 10:28 [gentoo-commits] gentoo-x86 commit in kde-base/kdebindings-csharp/files: kdebindings-csharp-build-fixes.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2009-09-02 10:41 Alex Alexander (wired)
2009-08-04 0:13 Alex Alexander (wired)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox