diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-10-05 19:27:40 +0200 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-10-09 05:21:39 +1100 |
commit | 6cac52aee40a8e81eba42254d8140445048cfb8d (patch) | |
tree | 030869c31b094f1821e6a9a7a9f98e3ae9e8200b /dev-util | |
parent | dev-util/wiggle: remove unused patch (diff) | |
download | gentoo-6cac52aee40a8e81eba42254d8140445048cfb8d.tar.gz gentoo-6cac52aee40a8e81eba42254d8140445048cfb8d.tar.bz2 gentoo-6cac52aee40a8e81eba42254d8140445048cfb8d.zip |
dev-util/monodevelop: remove unused patches
Diffstat (limited to 'dev-util')
5 files changed, 0 insertions, 260 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 ba76794dfd2e..000000000000 --- 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 b9b07d139f4f..000000000000 --- 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 4f0094769128..000000000000 --- 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/gentoo-dotnet-issue-30.patch b/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch deleted file mode 100644 index 63ae0ead52ce..000000000000 --- 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/local-nuget-icons.patch b/dev-util/monodevelop/files/local-nuget-icons.patch deleted file mode 100644 index 561e50f0e2b5..000000000000 --- 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) {
- |