[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.2.1-2-3-g42b6664

[Iain Lane]

The following commit has been merged in the master branch:
commit 1ebf272873bb6bf304415d34352ffbcb85b031e1
Author: Iain Lane <iain at orangesquash.org.uk>
Date:   Sun Jan 22 11:40:08 2012 +0000

    Cherry-pick upstream patch to fix libc DLLMap & FTBFS on ia64
    
    Thanks: Jo Shields <directhex at apebox.org>

diff --git a/debian/patches/0001-Fix-MusicBrainz-dllmap-for-cross-architecture-suppor.patch b/debian/patches/0001-Fix-MusicBrainz-dllmap-for-cross-architecture-suppor.patch
new file mode 100644
index 0000000..39b9ae3
--- /dev/null
+++ b/debian/patches/0001-Fix-MusicBrainz-dllmap-for-cross-architecture-suppor.patch
@@ -0,0 +1,65 @@
+From: Jo Shields <directhex at apebox.org>
+Date: Sun, 22 Jan 2012 00:53:10 +0000
+Subject: Fix MusicBrainz dllmap for cross-architecture support
+
+Not every platform Banshee runs on uses libc.so.6 - for example, Itanium uses
+libc.so.1, and kFreeBSD (on Debian) uses libc.so.0.1.
+
+This is actually not a big deal, because /etc/mono/config contains an explicit
+Dllmap for this case, which is populated with the host platform's correct
+soname at build time. For example, on Itanium:
+
+	<dllmap dll="libc" target="libc.so.6.1" os="!windows"/>
+
+and on kFreeBSD-AMD64:
+
+	<dllmap dll="libc" target="libc.so.0.1" os="!windows"/>
+
+You'll notice, however, that this mapping only works when the target is
+"libc" - and the MusicBrainz library in Banshee targets "libc.so.6"
+
+Changing this to "libc" fixes execution on exotic architectures without
+hurting existing architectures, thanks to the mapping in /etc/mono/config
+
+Signed-off-by: Alexander Kojevnikov <alexk at gnome.org>
+---
+ src/Libraries/MusicBrainz/MusicBrainz/DiscLinux.cs |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: banshee/src/Libraries/MusicBrainz/MusicBrainz/DiscLinux.cs
+===================================================================
+--- banshee.orig/src/Libraries/MusicBrainz/MusicBrainz/DiscLinux.cs	2012-01-22 11:39:30.361081794 +0000
++++ banshee/src/Libraries/MusicBrainz/MusicBrainz/DiscLinux.cs	2012-01-22 11:39:49.164329451 +0000
+@@ -37,27 +37,27 @@
+         const int CD_FRAMES = 75;
+         const int XA_INTERVAL = ((60 + 90 + 2) * CD_FRAMES);
+ 
+-        [DllImport ("libc.so.6", CharSet = CharSet.Auto)]
++        [DllImport ("libc", CharSet = CharSet.Auto)]
+         static extern int open (string path, int flags);
+ 
+-        [DllImport ("libc.so.6")]
++        [DllImport ("libc")]
+         static extern int close (int fd);
+ 
+-        [DllImport ("libc.so.6", EntryPoint = "ioctl")]
++        [DllImport ("libc", EntryPoint = "ioctl")]
+         static extern int read_toc_header (int fd, int request, ref cdrom_tochdr header);
+         static int read_toc_header (int fd, ref cdrom_tochdr header)
+         {
+             return read_toc_header (fd, CDROMREADTOCHDR, ref header);
+         }
+ 
+-        [DllImport ("libc.so.6", EntryPoint = "ioctl")]
++        [DllImport ("libc", EntryPoint = "ioctl")]
+         static extern int read_multisession (int fd, int request, ref cdrom_multisession multisession);
+         static int read_multisession (int fd, ref cdrom_multisession multisession)
+         {
+             return read_multisession (fd, CDROMMULTISESSION, ref multisession);
+         }
+ 
+-        [DllImport ("libc.so.6", EntryPoint = "ioctl")]
++        [DllImport ("libc", EntryPoint = "ioctl")]
+         static extern int read_toc_entry (int fd, int request, ref cdrom_tocentry entry);
+         static int read_toc_entry (int fd, ref cdrom_tocentry entry)
+         {
diff --git a/debian/patches/series b/debian/patches/series
index 06400c1..65c63d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,5 @@ workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 fix-libgpod-wrong-cast-ftbfs.patch
 0001-libbanshee-Remove-unused-wanted_size-variable.patch
+0001-Fix-MusicBrainz-dllmap-for-cross-architecture-suppor.patch
 99_ltmain_as-needed.patch

-- 
banshee