From 992fd39cce93235e96ef4c22090faf63eecfe2b4 Mon Sep 17 00:00:00 2001 From: Paul F. Johnson Date: Sep 19 2008 08:59:14 +0000 Subject: Added mimeinfo backport fix --- diff --git a/import.log b/import.log index 7755ce0..579057a 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ mono-2_0-4_fc10:HEAD:mono-2.0-4.fc10.src.rpm:1219746940 mono-2_0-5_fc10:HEAD:mono-2.0-5.fc10.src.rpm:1220047677 mono-2_0-6_fc10:HEAD:mono-2.0-6.fc10.src.rpm:1221073246 mono-2_0-7_fc10:HEAD:mono-2.0-7.fc10.src.rpm:1221685120 +mono-2_0-8_fc10:HEAD:mono-2.0-8.fc10.src.rpm:1221814700 diff --git a/mono-2.0-mimeicon.patch b/mono-2.0-mimeicon.patch new file mode 100644 index 0000000..26ade3a --- /dev/null +++ b/mono-2.0-mimeicon.patch @@ -0,0 +1,54 @@ +--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs 2008-09-02 16:46:50.000000000 +0100 ++++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon-new.cs 2008-09-18 23:29:05.000000000 +0100 +@@ -358,11 +358,12 @@ + if (internal_mime_type == "harddisk/harddisk" || internal_mime_type == "cdrom/cdrom" || internal_mime_type == "removable/removable") + image = ResourceImageLoader.Get ("text-x-generic.png"); + } +- +- index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent); +- MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent); +- +- MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index); ++ ++ if (image != null) { ++ index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent); ++ MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent); ++ MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index); ++ } + } + + public override object AddAndGetIconIndex (string filename, string mime_type) +@@ -370,11 +371,11 @@ + int index = -1; + + Image image = GnomeUtil.GetIcon (filename, mime_type, 48); +- +- index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent); +- MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent); +- +- MimeIconEngine.MimeIconIndex.Add (mime_type, index); ++ if (image != null) { ++ index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent); ++ MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent); ++ MimeIconEngine.MimeIconIndex.Add (mime_type, index); ++ } + + return index; + } +@@ -384,11 +385,11 @@ + int index = -1; + + Image image = GnomeUtil.GetIcon (mime_type, 48); +- +- index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent); +- MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent); +- +- MimeIconEngine.MimeIconIndex.Add (mime_type, index); ++ if (image != null) { ++ index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent); ++ MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent); ++ MimeIconEngine.MimeIconIndex.Add (mime_type, index); ++ } + + return index; + } diff --git a/mono.spec b/mono.spec index b90242b..551d032 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ Name: mono Version: 2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -45,6 +45,7 @@ Patch6:mono-2.0-uselibdir.patch Patch9:mono-2.0-monoservice.patch Patch10: mono-2.0-metadata-makefile.patch Patch11: mono-2.0-tablelayout.patch +Patch12: mono-2.0-mimeicon.patch %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -261,6 +262,7 @@ sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8} %patch9 -p1 -b .monoservice %patch10 -p1 -b .metadata %patch11 -p1 -b .tablelayout +%patch12 -p1 -b .mimeicon autoreconf -f -i -s # Add undeclared Arg @@ -615,6 +617,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %gac_dll IBM.Data.DB2 %changelog +* Thu Sep 18 2008 Paul F. Johnson 2.0-8 +- MimeIcon patch added + * Wed Sep 17 2008 Paul F. Johnson 2.0-7 - TableLayoutSettings fix (bz 462005)