diff options
| author |   Sam James <sam@gentoo.org> | 2022-07-20 01:05:55 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-07-20 01:07:25 +0000 |
| commit | a3bcd78e0c3a2ebe08993b1a5687d4d7a70ece86 (patch) | |
| tree | 7045f04a11b0bc23e85d74e120344398801c0b48 /dev-util/monodevelop/files | |
| parent | dev-lang/ironscheme: treeclean (broken) (diff) | |
| download | dotnet-a3bcd78e0c3a2ebe08993b1a5687d4d7a70ece86.tar.gz dotnet-a3bcd78e0c3a2ebe08993b1a5687d4d7a70ece86.tar.bz2 dotnet-a3bcd78e0c3a2ebe08993b1a5687d4d7a70ece86.zip | |
dev-util/monodevelop: treeclean (broken)
Bug: https://bugs.gentoo.org/858938
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/monodevelop/files')
11 files changed, 0 insertions, 953 deletions
diff --git a/dev-util/monodevelop/files/5.7-downgrade_to_mvc3.patch b/dev-util/monodevelop/files/5.7-downgrade_to_mvc3.patch deleted file mode 100644 index ba76794..0000000 --- a/dev-util/monodevelop/files/5.7-downgrade_to_mvc3.patch +++ /dev/null @@ -1,47 +0,0 @@ -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>
-
- <Runtime>
-- <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" />
-+ <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 file = "Html/Schemas/xhtml1-strict.xsd" />
- <Import file = "Html/Schemas/xhtml1-transitional.xsd" />
- <Import file = "Html/Schemas/xhtml1-frameset.xsd" />
-@@ -202,10 +202,10 @@ - guid="{E53F8FEA-EAE0-44A6-8774-FFD645390401}"
- type="MonoDevelop.AspNet.Projects.AspMvc3Project"
- useXBuild="true" />
-- <DotNetProjectSubtype
-+<!-- <DotNetProjectSubtype
- guid="{E3E379DF-F4C6-4180-9B81-6769533ABE47}"
- type="MonoDevelop.AspNet.Projects.AspMvc4Project"
-- useXBuild="true" />
-+ useXBuild="true" /> -->
- <DotNetProjectSubtype
- id="MonoDevelop.AspNet.Projects.AspNetAppProject"
- guid="{349C5851-65DF-11DA-9384-00065B846F21}"
-@@ -216,7 +216,7 @@ - <Extension path = "/MonoDevelop/TypeSystem/Parser">
- <Parser class = "MonoDevelop.AspNet.WebForms.WebFormsParser" mimeType="application/x-aspx, application/x-ascx, application/x-master-page" />
- <Parser class = "MonoDevelop.AspNet.Html.HtmlParser" mimeType="text/html, application/x-spark" />
-- <Parser class = "MonoDevelop.AspNet.Razor.RazorCSharpParser" mimeType="text/x-cshtml" /> -+ <Parser class = "MonoDevelop.AspNet.Razor.RazorCSharpParser" mimeType="text/x-cshtml" />
- </Extension>
-
- <Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
diff --git a/dev-util/monodevelop/files/5.9.5-kill-gnome.patch b/dev-util/monodevelop/files/5.9.5-kill-gnome.patch deleted file mode 100644 index b9b07d1..0000000 --- a/dev-util/monodevelop/files/5.9.5-kill-gnome.patch +++ /dev/null @@ -1,153 +0,0 @@ -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) diff --git a/dev-util/monodevelop/files/5.9.5-skip_merged_tar.patch b/dev-util/monodevelop/files/5.9.5-skip_merged_tar.patch deleted file mode 100644 index 4f00947..0000000 --- a/dev-util/monodevelop/files/5.9.5-skip_merged_tar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- monodevelop-5.9.5.5.orig/Makefile 2015-07-18 18:40:15.414229154 +0200 -+++ monodevelop-5.9.5.5/Makefile 2015-07-18 19:39:03.782576863 +0200 -@@ -87,8 +87,6 @@ dist: update_submodules remove-stale-tar - -name \*.dll -o \ - -name \*.mdb \) \ - -delete -- @cd tarballs && tar -cjf monodevelop-$(PACKAGE_VERSION).tar.bz2 monodevelop-$(PACKAGE_VERSION) -- @cd tarballs && rm -rf monodevelop-$(PACKAGE_VERSION) - - aot: - @for i in main/build/bin/*.dll; do ($(MONO_AOT) $$i &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done diff --git a/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch b/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch deleted file mode 100644 index 9cc1f26..0000000 --- a/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -u -r work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml ---- work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml -+++ work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml -@@ -27,5 +27,6 @@ - <References> - <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -+ <Reference type="Package" refto="System.Web.Mvc" /> - <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Core" /> -diff -u -r work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml ---- work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml -+++ work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml -@@ -29,5 +29,6 @@ - <References> - <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -+ <Reference type="Package" refto="System.Web.Mvc" /> - <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Core" /> diff --git a/dev-util/monodevelop/files/6.0-kill-gnome.patch b/dev-util/monodevelop/files/6.0-kill-gnome.patch deleted file mode 100644 index c70ba24..0000000 --- a/dev-util/monodevelop/files/6.0-kill-gnome.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff -rupN configure.in configure.in ---- configure.in 2016-05-08 19:44:27.107588191 -0400 -+++ configure.in 2016-05-08 19:47:32.570263105 -0400 -@@ -137,13 +137,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) - -@@ -202,13 +195,4 @@ AC_ARG_ENABLE(gnomeplatform, - if test x$enable_gnomeplatform = xyes; then -- if test x$gnome_sharp = xno; then -- AC_MSG_ERROR([Cannot enable GNOME platform without gnome-sharp-2.0]) -- fi -- if test x$gnome_vfs_sharp = xno; then -- AC_MSG_ERROR([Cannot enable GNOME platform without gnome-vfs-sharp-2.0]) -- fi -- if test x$gconf_sharp = xno; then -- AC_MSG_ERROR([Cannot enable GNOME platform without gconf-sharp-2.0]) -- fi - platform_bindings="${platform_bindings}GNOME " - fi - -diff -rupN configure configure ---- configure 2016-05-08 19:53:21.359551637 -0400 -+++ configure 2016-05-08 19:53:29.043391220 -0400 -@@ -4116,13 +4116,4 @@ - if test x$enable_gnomeplatform = xyes; then -- if test x$gnome_sharp = xno; then -- as_fn_error $? "Cannot enable GNOME platform without gnome-sharp-2.0" "$LINENO" 5 -- fi -- if test x$gnome_vfs_sharp = xno; then -- as_fn_error $? "Cannot enable GNOME platform without gnome-vfs-sharp-2.0" "$LINENO" 5 -- fi -- if test x$gconf_sharp = xno; then -- as_fn_error $? "Cannot enable GNOME platform without gconf-sharp-2.0" "$LINENO" 5 -- fi - platform_bindings="${platform_bindings}GNOME " - fi - -diff -rupN src/addins/GnomePlatform/GnomePlatform.cs src/addins/GnomePlatform/GnomePlatform.cs ---- src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 18:40:15.946222126 +0200 -+++ 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) diff --git a/dev-util/monodevelop/files/aspnet-template-references-fix.patch b/dev-util/monodevelop/files/aspnet-template-references-fix.patch deleted file mode 100644 index 99f7b4b..0000000 --- a/dev-util/monodevelop/files/aspnet-template-references-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -u -r work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml ---- work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml 2015-03-07 11:16:24.869736145 +0300 -+++ work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml 2015-03-07 11:17:12.990734446 +0300 -@@ -27,6 +27,7 @@ - <References> - <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -+ <Reference type="Package" refto="System.Web.Mvc" /> - <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Core" /> - <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -diff -u -r work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml ---- work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml 2015-03-07 11:16:24.869736145 +0300 -+++ work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml 2015-03-07 11:18:08.101732500 +0300 -@@ -29,6 +29,7 @@ - <References>
- <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-+ <Reference type="Package" refto="System.Web.Mvc" />
- <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Package" refto="System.Core" />
- <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-diff -u -r work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml ---- work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml 2015-03-07 11:16:24.869736145 +0300 -+++ work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml 2015-03-07 11:18:31.693731667 +0300 -@@ -29,6 +29,7 @@ - <References>
- <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-+ <Reference type="Package" refto="System.Web.Mvc" />
- <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Package" refto="System.Core" />
- <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-@@ -93,6 +93,8 @@ - <References>
- <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-+ <Reference type="Package" refto="System.Web.Mvc" />
-+ <Reference type="Package" refto="NUnit.Framework" />
- <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Package" refto="System.Core" />
- <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-diff -u -r work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml ---- work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml 2015-03-07 11:16:24.869736145 +0300 -+++ work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml 2015-03-07 11:18:48.517731073 +0300 -@@ -29,6 +29,7 @@ - <References> - <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -+ <Reference type="Package" refto="System.Web.Mvc" /> - <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Core" /> - <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -diff -u -r work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml ---- work.unpacked/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml 2015-03-07 11:16:24.869736145 +0300 -+++ work/monodevelop-5.7/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml 2015-03-07 11:19:12.373730231 +0300 -@@ -29,6 +29,7 @@ - <References> - <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -+ <Reference type="Package" refto="System.Web.Mvc" /> - <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Core" /> - <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -@@ -71,6 +71,8 @@ - <References> - <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -+ <Reference type="Package" refto="System.Web.Mvc" /> -+ <Reference type="Package" refto="NUnit.Framework" /> - <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Package" refto="System.Core" /> - <Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> diff --git a/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch b/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch deleted file mode 100644 index 63ae0ea..0000000 --- a/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- work.orig/monodevelop-5.7/external/ikvm/reflect/IKVM.Reflection.csproj 2015-03-05 15:53:11.019394980 +0300 -+++ work/monodevelop-5.7/external/ikvm/reflect/IKVM.Reflection.csproj 2015-03-05 16:09:18.814671809 +0300 -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> -@@ -10,7 +10,7 @@ - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>IKVM.Reflection</RootNamespace> - <AssemblyName>IKVM.Reflection</AssemblyName> -- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> -+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <TargetFrameworkSubset> - </TargetFrameworkSubset> diff --git a/dev-util/monodevelop/files/kill-gnome.patch b/dev-util/monodevelop/files/kill-gnome.patch deleted file mode 100644 index c7afbeb..0000000 --- a/dev-util/monodevelop/files/kill-gnome.patch +++ /dev/null @@ -1,369 +0,0 @@ -diff -rupN monodevelop/configure monodevelop.nognome/configure ---- monodevelop/configure 2015-04-28 11:55:36.000000000 +0300 -+++ monodevelop.nognome/configure 2015-05-27 12:40:15.073411758 +0300 -@@ -3711,224 +3711,6 @@ $as_echo "yes" >&6; } - - fi - -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_SHARP" >&5 --$as_echo_n "checking for GNOME_SHARP... " >&6; } -- --if test -n "$GNOME_SHARP_CFLAGS"; then -- pkg_cv_GNOME_SHARP_CFLAGS="$GNOME_SHARP_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GNOME_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$GNOME_SHARP_LIBS"; then -- pkg_cv_GNOME_SHARP_LIBS="$GNOME_SHARP_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GNOME_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GNOME_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>&1` -- else -- GNOME_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GNOME_SHARP_PKG_ERRORS" >&5 -- -- gnome_sharp=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- gnome_sharp=no --else -- GNOME_SHARP_CFLAGS=$pkg_cv_GNOME_SHARP_CFLAGS -- GNOME_SHARP_LIBS=$pkg_cv_GNOME_SHARP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- gnome_sharp=yes --fi -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_VFS_SHARP" >&5 --$as_echo_n "checking for GNOME_VFS_SHARP... " >&6; } -- --if test -n "$GNOME_VFS_SHARP_CFLAGS"; then -- pkg_cv_GNOME_VFS_SHARP_CFLAGS="$GNOME_VFS_SHARP_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GNOME_VFS_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$GNOME_VFS_SHARP_LIBS"; then -- pkg_cv_GNOME_VFS_SHARP_LIBS="$GNOME_VFS_SHARP_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GNOME_VFS_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GNOME_VFS_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>&1` -- else -- GNOME_VFS_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GNOME_VFS_SHARP_PKG_ERRORS" >&5 -- -- gnome_vfs_sharp=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- gnome_vfs_sharp=no --else -- GNOME_VFS_SHARP_CFLAGS=$pkg_cv_GNOME_VFS_SHARP_CFLAGS -- GNOME_VFS_SHARP_LIBS=$pkg_cv_GNOME_VFS_SHARP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- gnome_vfs_sharp=yes --fi -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF_SHARP" >&5 --$as_echo_n "checking for GCONF_SHARP... " >&6; } -- --if test -n "$GCONF_SHARP_CFLAGS"; then -- pkg_cv_GCONF_SHARP_CFLAGS="$GCONF_SHARP_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GCONF_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$GCONF_SHARP_LIBS"; then -- pkg_cv_GCONF_SHARP_LIBS="$GCONF_SHARP_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GCONF_SHARP_LIBS=`$PKG_CONFIG --libs "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GCONF_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>&1` -- else -- GCONF_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GCONF_SHARP_PKG_ERRORS" >&5 -- -- gconf_sharp=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- gconf_sharp=no --else -- GCONF_SHARP_CFLAGS=$pkg_cv_GCONF_SHARP_CFLAGS -- GCONF_SHARP_LIBS=$pkg_cv_GCONF_SHARP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- gconf_sharp=yes --fi -- -- - gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`" - - -diff -rupN monodevelop/src/addins/GnomePlatform/GnomePlatform.cs monodevelop.nognome/src/addins/GnomePlatform/GnomePlatform.cs ---- monodevelop/src/addins/GnomePlatform/GnomePlatform.cs 2014-09-22 16:28:49.000000000 +0300 -+++ monodevelop.nognome/src/addins/GnomePlatform/GnomePlatform.cs 2015-05-27 12:40:15.073411758 +0300 -@@ -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,46 +39,15 @@ 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) - { - var mimeType = GetMimeTypeForUri (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,10 +65,7 @@ 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) -@@ -111,12 +73,7 @@ namespace MonoDevelop.Platform - 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) -@@ -127,20 +84,10 @@ namespace MonoDevelop.Platform - return true; - 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"; - } - } - -@@ -158,19 +105,9 @@ namespace MonoDevelop.Platform - } else if (System.IO.File.Exists (filename)) { - 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"; - } -- return "gnome-fs-regular"; -- -+ return "gnome-fs-regular"; - } - - protected override Xwt.Drawing.Image OnGetIconForFile (string filename) diff --git a/dev-util/monodevelop/files/kill-qtcurve-warning.patch b/dev-util/monodevelop/files/kill-qtcurve-warning.patch deleted file mode 100644 index 36eb66e..0000000 --- a/dev-util/monodevelop/files/kill-qtcurve-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur monodevelop-5.0.1.org/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs monodevelop-5.0.1/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs ---- monodevelop-5.0.1.org/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs 2014-06-04 19:10:44.000000000 +0300 -+++ monodevelop-5.0.1/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs 2014-12-29 15:28:43.590834768 +0200 -@@ -127,8 +127,6 @@ - - internal static bool IsBadGtkTheme (string theme) - { -- if (string.Equals ("QtCurve", theme, StringComparison.OrdinalIgnoreCase)) -- return true; - if (string.Equals ("oxygen-gtk", theme, StringComparison.OrdinalIgnoreCase)) - return Environment.GetEnvironmentVariable ("OXYGEN_DISABLE_INNER_SHADOWS_HACK") != "1"; - return false; diff --git a/dev-util/monodevelop/files/local-nuget-icons.patch b/dev-util/monodevelop/files/local-nuget-icons.patch deleted file mode 100644 index 561e50f..0000000 --- a/dev-util/monodevelop/files/local-nuget-icons.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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)
- {
- try {
-- var httpClient = new HttpClient (uri);
-- Stream stream = httpClient.GetResponse ().GetResponseStream ();
-+ Stream stream = GetResponseStream (uri);
- Image image = Image.FromStream (stream);
-
- return new ImageLoadedEventArgs (image, uri, state);
-@@ -101,6 +100,17 @@ namespace MonoDevelop.PackageManagement - }
- }
-
-+ static Stream GetResponseStream (Uri uri)
-+ {
-+ if (uri.IsFile) {
-+ var request = WebRequest.Create (uri);
-+ return request.GetResponse ().GetResponseStream ();
-+ }
-+
-+ var httpClient = new HttpClient (uri);
-+ return httpClient.GetResponse ().GetResponseStream ();
-+ }
-+
- void OnLoaded (ITask<ImageLoadedEventArgs> task, Uri uri, object state)
- {
- if (task.IsFaulted) {
- diff --git a/dev-util/monodevelop/files/mrward-xdt-issue-4.patch b/dev-util/monodevelop/files/mrward-xdt-issue-4.patch deleted file mode 100644 index 5271e1f..0000000 --- a/dev-util/monodevelop/files/mrward-xdt-issue-4.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- work/monodevelop-5.7/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml 2015-01-12 22:19:13.000000000 +0300 -+++ work.new/monodevelop-5.7/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml 2015-03-06 07:45:39.278552461 +0300 -@@ -2,8 +2,6 @@ -
- <Runtime>
- <Import assembly="MonoDevelop.PackageManagement.dll" />
-- <Import assembly="Microsoft.Web.XmlTransform.dll" />
-- <Import assembly="NuGet.Core.dll" />
- </Runtime>
-
- <Extension path = "/MonoDevelop/Ide/Commands">
---- work/monodevelop-5.7/Main.sln 2015-01-12 22:19:13.000000000 +0300 -+++ work.new/monodevelop-5.7/Main.sln 2015-03-06 08:00:52.860939203 +0300 -@@ -555,21 +555,13 @@ - {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.Build.0 = Release|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
|