[Pkg-mono-svn-commits] [SCM] mono-uia branch, master, updated. debian/2.1-2

Jo Shields directhex at apebox.org
Mon Jan 23 19:18:03 UTC 2012


The following commit has been merged in the master branch:
commit 015dac7e937e59eaf6661fafa3a5a355c38d4ef5
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jan 23 19:09:36 2012 +0000

    Use libX11.so.6 when calling into libX11, otherwise this will only work when development headers are installed

diff --git a/debian/patches/series b/debian/patches/series
index d868d09..5a4b185 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-uia-Fix-building-with-Mono-2.8.patch
 0001-UIAutomationClient-AutomationElement.FromLocalProvid.patch
+use_specific_libX11_soname
diff --git a/debian/patches/use_specific_libX11_soname b/debian/patches/use_specific_libX11_soname
new file mode 100644
index 0000000..f579013
--- /dev/null
+++ b/debian/patches/use_specific_libX11_soname
@@ -0,0 +1,15 @@
+Index: mono-uia.git/UIAutomationClient/System.Windows.Automation/NativeMethods.cs
+===================================================================
+--- mono-uia.git.orig/UIAutomationClient/System.Windows.Automation/NativeMethods.cs	2012-01-23 19:09:12.855314381 +0000
++++ mono-uia.git/UIAutomationClient/System.Windows.Automation/NativeMethods.cs	2012-01-23 19:09:19.595344463 +0000
+@@ -148,7 +148,7 @@
+ 		[DllImport ("libgdk-x11-2.0.so.0")]
+ 		internal static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr handle);
+ 
+-		[DllImport("libX11.so")]
++		[DllImport("libX11.so.6")]
+ 		private static extern int XQueryTree(IntPtr display, IntPtr w, out IntPtr rootReturn, out IntPtr parentReturn, out IntPtr childrenReturn, out int childrenReturnCount);
+ 	}
+-}
+\ No newline at end of file
++}

-- 
mono-uia



More information about the Pkg-mono-svn-commits mailing list