- fix mono build error, https://bugs.kde.org/show_bug.cgi?id=339977

- rel 2

diff --git a/kde4-qyoto.spec b/kde4-qyoto.spec
index ddff4e85aca7d84dedc2ca051d9a5d4b0f78cdc0..cadddda8b9c923cb3af0e5c9d98ec2b3e3b46a89 100644 (file)
--- a/kde4-qyoto.spec
+++ b/kde4-qyoto.spec
@@ -6,11 +6,12 @@ Summary:      C# Mono Qt4 bindings
 Summary(pl.UTF-8):     Dowiązania C# Mono dla Qt4
 Name:          kde4-qyoto
 Version:       4.14.3
-Release:       1
+Release:       2
 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
 URL:           http://www.kde.org/
 BuildRequires: kde4-kdelibs-devel
 BuildRequires: mono-csharp
@@ -44,6 +45,7 @@ Pliki nagłówkowe biblioteki %{name}.
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p1
 
 %build
 install -d build

diff --git a/qyoto-qdbus-non-generic.patch b/qyoto-qdbus-non-generic.patch
new file mode 100644 (file)
index 0000000..dc35bdf
--- /dev/null
+++ b/qyoto-qdbus-non-generic.patch
@@ -0,0 +1,28 @@
+Index: qyoto-4.14.2/qdbus/QDBusReply.cs
+===================================================================
+--- qyoto-4.14.2.orig/qdbus/QDBusReply.cs
++++ qyoto-4.14.2/qdbus/QDBusReply.cs
+@@ -4,9 +4,12 @@ namespace Qyoto {
+       using System.Runtime.InteropServices;
+       using System.Collections.Generic; 
+ 
+-      public class QDBusReply<T> {
++      class QDBusReplyFill {
+               [DllImport("qyoto", CharSet=CharSet.Ansi)]
+-              private static extern void qyoto_qdbus_reply_fill(IntPtr msg, IntPtr error, IntPtr variant);
++              public static extern void qyoto_qdbus_reply_fill(IntPtr msg, IntPtr error, IntPtr variant);
++      }
++
++      public class QDBusReply<T> {
+               
+               public QDBusReply(QDBusMessage reply) {
+                       m_error = new QDBusError(reply);
+@@ -18,7 +21,7 @@ namespace Qyoto {
+                               variant = QVariant.FromValue<T>(default(T));
+                       }
+ 
+-                      qyoto_qdbus_reply_fill((IntPtr) GCHandle.Alloc(reply), (IntPtr) GCHandle.Alloc(m_error),
++                      QDBusReplyFill.qyoto_qdbus_reply_fill((IntPtr) GCHandle.Alloc(reply), (IntPtr) GCHandle.Alloc(m_error),
+                               (IntPtr) GCHandle.Alloc(variant));
+ 
+                       if (!m_error.IsValid()) {