+++ /dev/null
-Index: xamarin-pkg-monodevelop/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
-===================================================================
---- xamarin-pkg-monodevelop.orig/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml 2015-01-15 19:43:29.994850405 +0000
-+++ xamarin-pkg-monodevelop/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml 2015-01-15 19:51:12.746841738 +0000
-@@ -1,13 +1,13 @@
- <ExtensionModel>\r
- \r
- <Runtime>\r
-- <Import assembly = "System.Web.Helpers.dll" />
-- <Import assembly = "System.Web.Mvc.dll" />
-- <Import assembly = "System.Web.Razor.dll" />
-- <Import assembly = "System.Web.WebPages.Deployment.dll" />
-- <Import assembly = "System.Web.WebPages.dll" />
-- <Import assembly = "System.Web.WebPages.Razor.dll" />
--
-+<!-- <Import assembly = "System.Web.Helpers.dll" />\r
-+ <Import assembly = "System.Web.Mvc.dll" />\r
-+ <Import assembly = "System.Web.Razor.dll" />\r
-+ <Import assembly = "System.Web.WebPages.Deployment.dll" />\r
-+ <Import assembly = "System.Web.WebPages.dll" />\r
-+ <Import assembly = "System.Web.WebPages.Razor.dll" /> -->\r
-+\r
- <Import file = "Html/Schemas/xhtml1-strict.xsd" />\r
- <Import file = "Html/Schemas/xhtml1-transitional.xsd" />\r
- <Import file = "Html/Schemas/xhtml1-frameset.xsd" />\r
-@@ -202,10 +202,10 @@
- guid="{E53F8FEA-EAE0-44A6-8774-FFD645390401}"\r
- type="MonoDevelop.AspNet.Projects.AspMvc3Project"\r
- useXBuild="true" />\r
-- <DotNetProjectSubtype\r
-+<!-- <DotNetProjectSubtype\r
- guid="{E3E379DF-F4C6-4180-9B81-6769533ABE47}"\r
- type="MonoDevelop.AspNet.Projects.AspMvc4Project"\r
-- useXBuild="true" />\r
-+ useXBuild="true" /> -->\r
- <DotNetProjectSubtype\r
- id="MonoDevelop.AspNet.Projects.AspNetAppProject"\r
- guid="{349C5851-65DF-11DA-9384-00065B846F21}"\r
-@@ -216,7 +216,7 @@
- <Extension path = "/MonoDevelop/TypeSystem/Parser">\r
- <Parser class = "MonoDevelop.AspNet.WebForms.WebFormsParser" mimeType="application/x-aspx, application/x-ascx, application/x-master-page" />\r
- <Parser class = "MonoDevelop.AspNet.Html.HtmlParser" mimeType="text/html, application/x-spark" />\r
-- <Parser class = "MonoDevelop.AspNet.Razor.RazorCSharpParser" mimeType="text/x-cshtml" />
-+ <Parser class = "MonoDevelop.AspNet.Razor.RazorCSharpParser" mimeType="text/x-cshtml" />\r
- </Extension>\r
- \r
- <Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">\r
+++ /dev/null
-diff -rupN main.original/configure.in main/configure.in
---- main.original/configure.in 2015-07-18 14:09:27.934561734 +0200
-+++ main/configure.in 2015-07-18 14:11:02.182316682 +0200
-@@ -133,13 +133,6 @@ PKG_CHECK_MODULES(MONODOC, monodoc >= $M
- AC_SUBST(MONODOC_LIBS)
-
- dnl soft dependencies
--PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no])
--AC_SUBST(GNOME_SHARP_LIBS)
--PKG_CHECK_MODULES(GNOME_VFS_SHARP, gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_vfs_sharp=yes], [gnome_vfs_sharp=no])
--AC_SUBST(GNOME_VFS_SHARP_LIBS)
--PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no])
--AC_SUBST(GCONF_SHARP_LIBS)
--
- gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`"
- AC_SUBST(gtksharp_prefix)
-
-diff -rupN main.original/src/addins/GnomePlatform/GnomePlatform.cs main/src/addins/GnomePlatform/GnomePlatform.cs
---- main.original/src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 18:40:15.946222126 +0200
-+++ main/src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 19:56:35.272686234 +0200
-@@ -26,7 +26,6 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
-
--using Gnome;
- using MonoDevelop.Ide.Desktop;
- using System;
- using System.Collections.Generic;
-@@ -40,44 +39,13 @@ namespace MonoDevelop.Platform
- {
- public class GnomePlatform : PlatformService
- {
-- static bool useGio;
--
-- Gnome.ThumbnailFactory thumbnailFactory = new Gnome.ThumbnailFactory (Gnome.ThumbnailSize.Normal);
--
- static GnomePlatform ()
- {
- try {
- Gio.GetDefaultForType ("text/plain");
-- useGio = true;
- } catch (Exception ex) {
- Console.WriteLine (ex);
- }
-- //apparently Gnome.Icon needs GnomeVFS initialized even when we're using GIO.
-- Gnome.Vfs.Vfs.Initialize ();
-- }
--
-- DesktopApplication GetGnomeVfsDefaultApplication (string mimeType)
-- {
-- var app = Gnome.Vfs.Mime.GetDefaultApplication (mimeType);
-- if (app != null)
-- return (DesktopApplication) Marshal.PtrToStructure (app.Handle, typeof(DesktopApplication));
-- else
-- return null;
-- }
--
-- IEnumerable<DesktopApplication> GetGnomeVfsApplications (string mimeType)
-- {
-- var def = GetGnomeVfsDefaultApplication (mimeType);
-- var list = new List<DesktopApplication> ();
-- var apps = Gnome.Vfs.Mime.GetAllApplications (mimeType);
-- foreach (var app in apps) {
-- var dap = (GnomeVfsApp) Marshal.PtrToStructure (app.Handle, typeof(GnomeVfsApp));
-- if (!string.IsNullOrEmpty (dap.Command) && !string.IsNullOrEmpty (dap.DisplayName) && !dap.Command.Contains ("monodevelop ")) {
-- var isDefault = def != null && def.Id == dap.Command;
-- list.Add (new GnomeDesktopApplication (dap.Command, dap.DisplayName, isDefault));
-- }
-- }
-- return list;
- }
-
- public override IEnumerable<DesktopApplication> GetApplications (string filename)
-@@ -88,10 +56,7 @@ namespace MonoDevelop.Platform
-
- IEnumerable<DesktopApplication> GetApplicationsForMimeType (string mimeType)
- {
-- if (useGio)
-- return Gio.GetAllForType (mimeType);
-- else
-- return GetGnomeVfsApplications (mimeType);
-+ return Gio.GetAllForType (mimeType);
- }
-
- struct GnomeVfsApp {
-@@ -100,23 +65,15 @@ namespace MonoDevelop.Platform
-
- protected override string OnGetMimeTypeDescription (string mt)
- {
-- if (useGio)
-- return Gio.GetMimeTypeDescription (mt);
-- else
-- return Gnome.Vfs.Mime.GetDescription (mt);
-+ return Gio.GetMimeTypeDescription (mt);
- }
-
- protected override string OnGetMimeTypeForUri (string uri)
- {
- if (uri == null)
- return null;
--
-- if (useGio) {
-- string mt = Gio.GetMimeTypeForUri (uri);
-- if (mt != null)
-- return mt;
-- }
-- return Gnome.Vfs.MimeType.GetMimeTypeForUri (ConvertFileNameToVFS (uri));
-+
-+ return Gio.GetMimeTypeForUri (uri);
- }
-
- protected override bool OnGetMimeTypeIsText (string mimeType)
-@@ -128,19 +85,9 @@ namespace MonoDevelop.Platform
- return base.OnGetMimeTypeIsText (mimeType);
- }
-
--
-- public override void ShowUrl (string url)
-- {
-- Gnome.Url.Show (url);
-- }
--
- public override string DefaultMonospaceFont {
- get {
-- try {
-- return (string) (new GConf.Client ().Get ("/desktop/gnome/interface/monospace_font_name"));
-- } catch (Exception) {
-- return "Monospace 11";
-- }
-+ return "Monospace 11";
- }
- }
-
-@@ -159,18 +106,8 @@ namespace MonoDevelop.Platform
- filename = EscapeFileName (filename);
- if (filename == null)
- return "gnome-fs-regular";
--
-- string icon = null;
-- Gnome.IconLookupResultFlags result;
-- try {
-- icon = Gnome.Icon.LookupSync (IconTheme.Default, thumbnailFactory, filename, null,
-- Gnome.IconLookupFlags.None, out result);
-- } catch {}
-- if (icon != null && icon.Length > 0)
-- return icon;
-- }
-+ }
- return "gnome-fs-regular";
--
- }
-
- protected override Xwt.Drawing.Image OnGetIconForFile (string filename)
+++ /dev/null
---- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
-+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
-@@ -91,8 +91,7 @@ namespace MonoDevelop.PackageManagement
- ImageLoadedEventArgs LoadImage (Uri uri, object state)\r
- {\r
- try {\r
-- var httpClient = new HttpClient (uri);\r
-- Stream stream = httpClient.GetResponse ().GetResponseStream ();\r
-+ Stream stream = GetResponseStream (uri);\r
- Image image = Image.FromStream (stream);\r
- \r
- return new ImageLoadedEventArgs (image, uri, state);\r
-@@ -101,6 +100,17 @@ namespace MonoDevelop.PackageManagement
- }\r
- }\r
- \r
-+ static Stream GetResponseStream (Uri uri)\r
-+ {\r
-+ if (uri.IsFile) {\r
-+ var request = WebRequest.Create (uri);\r
-+ return request.GetResponse ().GetResponseStream ();\r
-+ }\r
-+\r
-+ var httpClient = new HttpClient (uri);\r
-+ return httpClient.GetResponse ().GetResponseStream ();\r
-+ }\r
-+\r
- void OnLoaded (ITask<ImageLoadedEventArgs> task, Uri uri, object state)\r
- {\r
- if (task.IsFaulted) {\r
-
projects / gentoo.git / commitdiff