commit 3f1719fd9986187992b3d954bb4f840e88b0cd1f
Author: Jan Rękorajski <[email protected]>
Date: Sat Nov 15 10:34:39 2014 +0100
- fix mono build error, https://bugs.kde.org/show_bug.cgi?id=339977
- rel 2
kde4-qyoto.spec | 4 +++-
qyoto-qdbus-non-generic.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/kde4-qyoto.spec b/kde4-qyoto.spec
index ddff4e8..cadddda 100644
--- 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
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()) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-qyoto.git/commitdiff/3f1719fd9986187992b3d954bb4f840e88b0cd1f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
