- update cmake files for mono 4.x

- rel 3

diff --git a/kde4-qyoto.spec b/kde4-qyoto.spec
index cadddda8b9c923cb3af0e5c9d98ec2b3e3b46a89..80eab7d513f3ff48fd78f7b3fbabbef9701f0755 100644 (file)
--- a/kde4-qyoto.spec
+++ b/kde4-qyoto.spec
@@ -6,18 +6,19 @@ Summary:      C# Mono Qt4 bindings
 Summary(pl.UTF-8):     Dowiązania C# Mono dla Qt4
 Name:          kde4-qyoto
 Version:       4.14.3
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5: 7807fa4e9f5c30a9bfa0319ecb923b21
 Patch0:                qyoto-qdbus-non-generic.patch
+Patch1:                mono4.patch
 URL:           http://www.kde.org/
 BuildRequires: kde4-kdelibs-devel
 BuildRequires: mono-csharp
 BuildRequires: phonon-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: qscintilla2-devel
+BuildRequires: qscintilla2-qt4-devel
 BuildRequires: kde4-smokeqt-devel >= %{version}
 Obsoletes:     kde4-kdebindings-qyoto < 4.6.100
 Obsoletes:     qyoto <= 4.8.0
@@ -46,6 +47,7 @@ Pliki nagłówkowe biblioteki %{name}.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build

diff --git a/mono4.patch b/mono4.patch
new file mode 100644 (file)
index 0000000..0ba4771
--- /dev/null
+++ b/mono4.patch
@@ -0,0 +1,53 @@
+--- qyoto-4.14.3/cmake/FindMono.cmake~ 2013-06-01 23:29:59.000000000 +0200
++++ qyoto-4.14.3/cmake/FindMono.cmake  2016-02-27 16:47:23.276357053 +0100
+@@ -1,10 +1,11 @@
+-# - Try to find the mono, mcs, gmcs and gacutil
++# - Try to find the mono, mcs, gmcs or dmcs and gacutil
+ #
+ # defines
+ #
+ # MONO_FOUND - system has mono, mcs, gmcs and gacutil
+ # MONO_PATH - where to find 'mono'
+ # GMCS_PATH - where to find 'gmcs'
++# DMCS_PATH - where to find 'gmcs'
+ # GACUTIL_PATH - where to find 'gacutil'
+ #
+ # copyright (c) 2007 Arno Rehn arno@arnorehn.de
+@@ -13,17 +14,21 @@
+ 
+ FIND_PROGRAM (MONO_EXECUTABLE mono)
+ FIND_PROGRAM (GMCS_EXECUTABLE gmcs)
++FIND_PROGRAM (DMCS_EXECUTABLE dmcs)
+ FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil)
+ 
+ SET (MONO_FOUND FALSE CACHE INTERNAL "")
+ 
+-IF (MONO_EXECUTABLE AND GMCS_EXECUTABLE AND GACUTIL_EXECUTABLE)
+-      SET (MONO_FOUND TRUE CACHE INTERNAL "")
+-ENDIF (MONO_EXECUTABLE AND GMCS_EXECUTABLE AND GACUTIL_EXECUTABLE)
++IF (MONO_EXECUTABLE AND GACUTIL_EXECUTABLE)
++      IF (GMCS_EXECUTABLE OR DMCS_EXECUTABLE)
++              SET (MONO_FOUND TRUE CACHE INTERNAL "")
++      ENDIF (GMCS_EXECUTABLE OR DMCS_EXECUTABLE)
++ENDIF (MONO_EXECUTABLE AND GACUTIL_EXECUTABLE)
+ 
+ IF (NOT Mono_FIND_QUIETLY)
+     MESSAGE(STATUS "Path of mono: ${MONO_EXECUTABLE}")
+     MESSAGE(STATUS "Path of gmcs: ${GMCS_EXECUTABLE}")
++    MESSAGE(STATUS "Path of dmcs: ${DMCS_EXECUTABLE}")
+     MESSAGE(STATUS "Path of gacutil: ${GACUTIL_EXECUTABLE}")
+ ENDIF (NOT Mono_FIND_QUIETLY)
+ 
+--- qyoto-4.14.3/cmake/CMakeDetermineCSharpCompiler.cmake~     2013-06-01 23:29:59.000000000 +0200
++++ qyoto-4.14.3/cmake/CMakeDetermineCSharpCompiler.cmake      2016-02-27 16:48:48.900692308 +0100
+@@ -24,6 +24,10 @@
+         find_package(Mono)
+         set (CMAKE_CSharp_COMPILER "${GMCS_EXECUTABLE}")
+ 
++        if (NOT CMAKE_CSharp_COMPILER)
++            set (CMAKE_CSharp_COMPILER "${DMCS_EXECUTABLE}")
++        endif (NOT CMAKE_CSharp_COMPILER)
++
+         # still not found, try csc.exe
+         if (NOT CMAKE_CSharp_COMPILER)
+             get_filename_component(dotnet_path "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework;InstallRoot]" PATH)