commit libgpod for openSUSE:11.4

Hello community, here is the log from the commit of package libgpod for openSUSE:11.4 checked in at Fri Apr 8 23:25:52 CEST 2011. -------- --- old-versions/11.4/all/libgpod/libgpod.changes 2010-12-08 21:46:05.000000000 +0100 +++ 11.4/libgpod/libgpod.changes 2011-04-04 23:50:26.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 4 16:49:09 CDT 2011 - gburt@suse.de + +- Fix Mono alignment issue causing broken C# bindings + + Add fix-mono-alignment.patch + +------------------------------------------------------------------- +Mon Mar 28 14:09:52 CDT 2011 - gburt@suse.de + +- fix libgpod-sharp to depend on libgpod4 (bnc#683171) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/libgpod Destination is old-versions/11.4/UPDATES/all/libgpod calling whatdependson for 11.4-i586 New: ---- fix-mono-alignment.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgpod.spec ++++++ --- /var/tmp/diff_new_pack.HxHrZm/_old 2011-04-08 23:25:32.000000000 +0200 +++ /var/tmp/diff_new_pack.HxHrZm/_new 2011-04-08 23:25:32.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libgpod (Version 0.8.0) +# spec file for package libgpod # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,14 @@ Name: libgpod Version: 0.8.0 -Release: 2 +Release: 5.<RELEASE6> Url: http://www.gtkpod.org/libgpod.html Group: System/Libraries License: LGPLv2.1+ Summary: Library to Manipulate Songs and Playlists Stored on an iPod Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM fix-mono-alignment.patch -- in libgpod master, commit 9a64ee60dd3e68c78292b97241616ac1d7a01c15 +Patch0: fix-mono-alignment.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel @@ -118,6 +120,7 @@ %package sharp License: LGPLv2.1+ Summary: Library to Manipulate Songs and Playlists Stored on an iPod -- .NET Bindings +Requires: libgpod4 = %{version} Group: Development/Languages/Mono %description sharp @@ -143,6 +146,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure --disable-silent-rules --with-pic \ ++++++ fix-mono-alignment.patch ++++++

From 9a64ee60dd3e68c78292b97241616ac1d7a01c15 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Thu, 6 Jan 2011 23:12:43 +0100 Subject: [PATCH] [mono] fix alignment issues on x86

--- bindings/mono/Makefile.include | 2 +- bindings/mono/libgpod-sharp/Artwork.cs | 4 ++++ bindings/mono/libgpod-sharp/Chapter.cs | 4 ++++ bindings/mono/libgpod-sharp/IpodInfo.cs | 5 +++++ bindings/mono/libgpod-sharp/PhotoAlbum.cs | 5 +++++ bindings/mono/libgpod-sharp/Playlist.cs | 5 +++++ bindings/mono/libgpod-sharp/Track.cs | 4 ++++ configure.ac | 7 +++++++ 8 files changed, 35 insertions(+), 1 deletions(-) diff --git a/bindings/mono/Makefile.include b/bindings/mono/Makefile.include index 504b059..a587456 100644 --- a/bindings/mono/Makefile.include +++ b/bindings/mono/Makefile.include @@ -18,7 +18,7 @@ all: $(ASSEMBLY_FILE) $(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE) $(ASSEMBLY_FILE): $(SOURCES_BUILD) - $(MCS) -debug -unsafe -target:$(TARGET) -out:$@ $(LINK) $(SOURCES_BUILD) + $(MCS) $(GMCS_FLAGS) -debug -unsafe -target:$(TARGET) -out:$@ $(LINK) $(SOURCES_BUILD) EXTRA_DIST = $(SOURCES_BUILD) diff --git a/bindings/mono/libgpod-sharp/Artwork.cs b/bindings/mono/libgpod-sharp/Artwork.cs index 5be7369..5773e35 100644 --- a/bindings/mono/libgpod-sharp/Artwork.cs +++ b/bindings/mono/libgpod-sharp/Artwork.cs @@ -24,7 +24,11 @@ namespace GPod { using native; namespace native { +#if ALIGNMENT_X86_LINUX + [StructLayout (LayoutKind.Sequential, Pack=4)] +#else [StructLayout (LayoutKind.Sequential)] +#endif internal struct Itdb_Artwork { public IntPtr thumbnail; public uint id; diff --git a/bindings/mono/libgpod-sharp/Chapter.cs b/bindings/mono/libgpod-sharp/Chapter.cs index 66ca556..ea632cd 100644 --- a/bindings/mono/libgpod-sharp/Chapter.cs +++ b/bindings/mono/libgpod-sharp/Chapter.cs @@ -22,7 +22,11 @@ namespace GPod { using native; namespace native { +#if ALIGNMENT_X86_LINUX + [StructLayout (LayoutKind.Sequential, Pack=4)] +#else [StructLayout (LayoutKind.Sequential)] +#endif internal struct Itdb_Chapter { public uint startpos; public IntPtr chaptertitle; diff --git a/bindings/mono/libgpod-sharp/IpodInfo.cs b/bindings/mono/libgpod-sharp/IpodInfo.cs index 697041b..14024eb 100644 --- a/bindings/mono/libgpod-sharp/IpodInfo.cs +++ b/bindings/mono/libgpod-sharp/IpodInfo.cs @@ -23,6 +23,11 @@ namespace GPod { using System.Collections.Generic; namespace native { +#if ALIGNMENT_X86_LINUX + [StructLayout (LayoutKind.Sequential, Pack=4)] +#else + [StructLayout (LayoutKind.Sequential)] +#endif internal struct Itdb_IpodInfo { public IntPtr model_number; public double capacity; diff --git a/bindings/mono/libgpod-sharp/PhotoAlbum.cs b/bindings/mono/libgpod-sharp/PhotoAlbum.cs index 42b2365..4a248ec 100644 --- a/bindings/mono/libgpod-sharp/PhotoAlbum.cs +++ b/bindings/mono/libgpod-sharp/PhotoAlbum.cs @@ -24,6 +24,11 @@ namespace GPod { using native; namespace native { +#if ALIGNMENT_X86_LINUX + [StructLayout (LayoutKind.Sequential, Pack=4)] +#else + [StructLayout (LayoutKind.Sequential)] +#endif internal struct Itdb_PhotoAlbum { public IntPtr photodb; public IntPtr name; diff --git a/bindings/mono/libgpod-sharp/Playlist.cs b/bindings/mono/libgpod-sharp/Playlist.cs index 7ff5a68..48e4e32 100644 --- a/bindings/mono/libgpod-sharp/Playlist.cs +++ b/bindings/mono/libgpod-sharp/Playlist.cs @@ -24,6 +24,11 @@ namespace GPod { using native; namespace native { +#if ALIGNMENT_X86_LINUX + [StructLayout (LayoutKind.Sequential, Pack=4)] +#else + [StructLayout (LayoutKind.Sequential)] +#endif internal struct Itdb_Playlist { public IntPtr itdb; public IntPtr name; diff --git a/bindings/mono/libgpod-sharp/Track.cs b/bindings/mono/libgpod-sharp/Track.cs index 434df7e..ce716fa 100644 --- a/bindings/mono/libgpod-sharp/Track.cs +++ b/bindings/mono/libgpod-sharp/Track.cs @@ -24,7 +24,11 @@ namespace GPod { namespace native { +#if ALIGNMENT_X86_LINUX + [StructLayout (LayoutKind.Sequential, Pack=4)] +#else [StructLayout (LayoutKind.Sequential)] +#endif internal struct Itdb_Track { public IntPtr itdb; public IntPtr title; diff --git a/configure.ac b/configure.ac index a52ac3a..c3ea6c2 100644 --- a/configure.ac +++ b/configure.ac @@ -315,6 +315,13 @@ dnl ************************************************** MONO_MIN_VERSION=1.9.1 GTK_SHARP_MIN_VERSION=2.12 LIBGPOD_CHECK_MONO +AC_CHECK_ALIGNOF([double]) +if test "$ac_cv_alignof_double" -eq 4 ; then + GMCS_FLAGS=-define:ALIGNMENT_X86_LINUX +else + GMCS_FLAGS= +fi +AC_SUBST(GMCS_FLAGS) dnl warnings bits, copied from gnome-keyring configure.in dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. -- 1.7.0.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org