diff --git a/kdebindings-4.5.2-mono28.patch b/kdebindings-4.5.2-mono28.patch new file mode 100644 index 0000000..475eac5 --- /dev/null +++ b/kdebindings-4.5.2-mono28.patch @@ -0,0 +1,12 @@ +diff -up kdebindings-4.5.2/csharp/kimono/CMakeLists.txt.mono28 kdebindings-4.5.2/csharp/kimono/CMakeLists.txt +--- kdebindings-4.5.2/csharp/kimono/CMakeLists.txt.mono28 2010-05-20 06:43:57.000000000 -0500 ++++ kdebindings-4.5.2/csharp/kimono/CMakeLists.txt 2010-10-23 14:50:51.696379925 -0500 +@@ -22,7 +22,7 @@ TARGET_LINK_LIBRARIES(kimono qyoto smoke + ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) + + # write FindPackage modules for these +-pkg_search_module(LIBMONO mono) ++pkg_search_module(LIBMONO mono-2 mono) + pkg_search_module(GLIB2 glib-2.0) + + macro_log_feature(LIBMONO_FOUND "libmono" "Mono library" "http://www.mono-project.com" FALSE "" "Required to compile kimonopluginfactory") diff --git a/kdebindings.spec b/kdebindings.spec index 85bd02b..a974d7d 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -8,12 +8,10 @@ # php, ruby and csharp depend on smoke %define php 1 %define ruby 1 -%if 0%{?fedora} < 15 # arch'es matching mono's Arch set %ifnarch sparc64 %define csharp 1 %endif -%endif %define java 0 %endif @@ -54,12 +52,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstreamable patches # fix build with newer sip/PyQt (borrowed from opensuse) Patch51: kdebindings-4.5.1-sip_api_8.patch -# fix errors found by valgrind -Patch52: kdebindings-4.5.2-generator-invalid-reads.patch ## upstream patches +# fix errors found by valgrind +Patch100: kdebindings-4.5.2-generator-invalid-reads.patch -## 4.5 branch +## trunk +# kdebindings-csharp fails to build with mono 2.8, http://bugs.kde.org/254629 +# should backport this if not already done +Patch150: kdebindings-4.5.2-mono28.patch BuildRequires: akonadi-devel BuildRequires: kdebase-workspace-devel >= %{version} @@ -270,7 +271,8 @@ Falcon plugin for the Kross archtecture in KDE4. %if 0%{?_sip_api_major} >= 8 %patch51 -p1 -b .sip_api_8 %endif -%patch52 -p1 -b .generator_invalid_reads +%patch100 -p1 -b .generator_invalid_reads +%patch150 -p1 -b .mono28 %build @@ -560,7 +562,6 @@ fi %changelog * Sat Oct 23 2010 Rex Dieter - 4.5.2-4 - rebuild (sip/PyQt4) -- disable broken mono (f15+) * Wed Oct 20 2010 Rex Dieter - 4.5.2-3 - No ABI check in php-qt (#644914)