Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Heather Cynede <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/monodevelop/files/
Date: Sat, 02 Jul 2016 08:23:20
Message-Id: 1467447416.fd28c0ed354df69b7c7bdecd7ff87006a9eb2dc4.cynede@gentoo
1 commit: fd28c0ed354df69b7c7bdecd7ff87006a9eb2dc4
2 Author: Heather Cynede <cynede <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 2 08:16:56 2016 +0000
4 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 2 08:16:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd28c0ed
7
8 dev-util/monodevelop: add missing patches/files
9
10 Package-Manager: portage-2.3.0
11
12 .../files/6.0-aspnet-template-references-fix.patch | 20 +++
13 dev-util/monodevelop/files/6.0-kill-gnome.patch | 184 +++++++++++++++++++++
14 2 files changed, 204 insertions(+)
15
16 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
17 new file mode 100644
18 index 0000000..9cc1f26
19 --- /dev/null
20 +++ b/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch
21 @@ -0,0 +1,20 @@
22 +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
23 +--- work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml
24 ++++ work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml
25 +@@ -27,5 +27,6 @@
26 + <References>
27 + <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
28 + <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
29 ++ <Reference type="Package" refto="System.Web.Mvc" />
30 + <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
31 + <Reference type="Package" refto="System.Core" />
32 +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
33 +--- work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml
34 ++++ work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml
35 +@@ -29,5 +29,6 @@
36 + <References>
37 + <Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
38 + <Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
39 ++ <Reference type="Package" refto="System.Web.Mvc" />
40 + <Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
41 + <Reference type="Package" refto="System.Core" />
42
43 diff --git a/dev-util/monodevelop/files/6.0-kill-gnome.patch b/dev-util/monodevelop/files/6.0-kill-gnome.patch
44 new file mode 100644
45 index 0000000..c70ba24
46 --- /dev/null
47 +++ b/dev-util/monodevelop/files/6.0-kill-gnome.patch
48 @@ -0,0 +1,184 @@
49 +diff -rupN configure.in configure.in
50 +--- configure.in 2016-05-08 19:44:27.107588191 -0400
51 ++++ configure.in 2016-05-08 19:47:32.570263105 -0400
52 +@@ -137,13 +137,6 @@ PKG_CHECK_MODULES(MONODOC, monodoc >= $M
53 + AC_SUBST(MONODOC_LIBS)
54 +
55 + dnl soft dependencies
56 +-PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no])
57 +-AC_SUBST(GNOME_SHARP_LIBS)
58 +-PKG_CHECK_MODULES(GNOME_VFS_SHARP, gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_vfs_sharp=yes], [gnome_vfs_sharp=no])
59 +-AC_SUBST(GNOME_VFS_SHARP_LIBS)
60 +-PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no])
61 +-AC_SUBST(GCONF_SHARP_LIBS)
62 +-
63 + gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`"
64 + AC_SUBST(gtksharp_prefix)
65 +
66 +@@ -202,13 +195,4 @@ AC_ARG_ENABLE(gnomeplatform,
67 + if test x$enable_gnomeplatform = xyes; then
68 +- if test x$gnome_sharp = xno; then
69 +- AC_MSG_ERROR([Cannot enable GNOME platform without gnome-sharp-2.0])
70 +- fi
71 +- if test x$gnome_vfs_sharp = xno; then
72 +- AC_MSG_ERROR([Cannot enable GNOME platform without gnome-vfs-sharp-2.0])
73 +- fi
74 +- if test x$gconf_sharp = xno; then
75 +- AC_MSG_ERROR([Cannot enable GNOME platform without gconf-sharp-2.0])
76 +- fi
77 + platform_bindings="${platform_bindings}GNOME "
78 + fi
79 +
80 +diff -rupN configure configure
81 +--- configure 2016-05-08 19:53:21.359551637 -0400
82 ++++ configure 2016-05-08 19:53:29.043391220 -0400
83 +@@ -4116,13 +4116,4 @@
84 + if test x$enable_gnomeplatform = xyes; then
85 +- if test x$gnome_sharp = xno; then
86 +- as_fn_error $? "Cannot enable GNOME platform without gnome-sharp-2.0" "$LINENO" 5
87 +- fi
88 +- if test x$gnome_vfs_sharp = xno; then
89 +- as_fn_error $? "Cannot enable GNOME platform without gnome-vfs-sharp-2.0" "$LINENO" 5
90 +- fi
91 +- if test x$gconf_sharp = xno; then
92 +- as_fn_error $? "Cannot enable GNOME platform without gconf-sharp-2.0" "$LINENO" 5
93 +- fi
94 + platform_bindings="${platform_bindings}GNOME "
95 + fi
96 +
97 +diff -rupN src/addins/GnomePlatform/GnomePlatform.cs src/addins/GnomePlatform/GnomePlatform.cs
98 +--- src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 18:40:15.946222126 +0200
99 ++++ src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 19:56:35.272686234 +0200
100 +@@ -26,7 +26,6 @@
101 + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
102 + //
103 +
104 +-using Gnome;
105 + using MonoDevelop.Ide.Desktop;
106 + using System;
107 + using System.Collections.Generic;
108 +@@ -40,44 +39,13 @@ namespace MonoDevelop.Platform
109 + {
110 + public class GnomePlatform : PlatformService
111 + {
112 +- static bool useGio;
113 +-
114 +- Gnome.ThumbnailFactory thumbnailFactory = new Gnome.ThumbnailFactory (Gnome.ThumbnailSize.Normal);
115 +-
116 + static GnomePlatform ()
117 + {
118 + try {
119 + Gio.GetDefaultForType ("text/plain");
120 +- useGio = true;
121 + } catch (Exception ex) {
122 + Console.WriteLine (ex);
123 + }
124 +- //apparently Gnome.Icon needs GnomeVFS initialized even when we're using GIO.
125 +- Gnome.Vfs.Vfs.Initialize ();
126 +- }
127 +-
128 +- DesktopApplication GetGnomeVfsDefaultApplication (string mimeType)
129 +- {
130 +- var app = Gnome.Vfs.Mime.GetDefaultApplication (mimeType);
131 +- if (app != null)
132 +- return (DesktopApplication) Marshal.PtrToStructure (app.Handle, typeof(DesktopApplication));
133 +- else
134 +- return null;
135 +- }
136 +-
137 +- IEnumerable<DesktopApplication> GetGnomeVfsApplications (string mimeType)
138 +- {
139 +- var def = GetGnomeVfsDefaultApplication (mimeType);
140 +- var list = new List<DesktopApplication> ();
141 +- var apps = Gnome.Vfs.Mime.GetAllApplications (mimeType);
142 +- foreach (var app in apps) {
143 +- var dap = (GnomeVfsApp) Marshal.PtrToStructure (app.Handle, typeof(GnomeVfsApp));
144 +- if (!string.IsNullOrEmpty (dap.Command) && !string.IsNullOrEmpty (dap.DisplayName) && !dap.Command.Contains ("monodevelop ")) {
145 +- var isDefault = def != null && def.Id == dap.Command;
146 +- list.Add (new GnomeDesktopApplication (dap.Command, dap.DisplayName, isDefault));
147 +- }
148 +- }
149 +- return list;
150 + }
151 +
152 + public override IEnumerable<DesktopApplication> GetApplications (string filename)
153 +@@ -88,10 +56,7 @@ namespace MonoDevelop.Platform
154 +
155 + IEnumerable<DesktopApplication> GetApplicationsForMimeType (string mimeType)
156 + {
157 +- if (useGio)
158 +- return Gio.GetAllForType (mimeType);
159 +- else
160 +- return GetGnomeVfsApplications (mimeType);
161 ++ return Gio.GetAllForType (mimeType);
162 + }
163 +
164 + struct GnomeVfsApp {
165 +@@ -100,23 +65,15 @@ namespace MonoDevelop.Platform
166 +
167 + protected override string OnGetMimeTypeDescription (string mt)
168 + {
169 +- if (useGio)
170 +- return Gio.GetMimeTypeDescription (mt);
171 +- else
172 +- return Gnome.Vfs.Mime.GetDescription (mt);
173 ++ return Gio.GetMimeTypeDescription (mt);
174 + }
175 +
176 + protected override string OnGetMimeTypeForUri (string uri)
177 + {
178 + if (uri == null)
179 + return null;
180 +-
181 +- if (useGio) {
182 +- string mt = Gio.GetMimeTypeForUri (uri);
183 +- if (mt != null)
184 +- return mt;
185 +- }
186 +- return Gnome.Vfs.MimeType.GetMimeTypeForUri (ConvertFileNameToVFS (uri));
187 ++
188 ++ return Gio.GetMimeTypeForUri (uri);
189 + }
190 +
191 + protected override bool OnGetMimeTypeIsText (string mimeType)
192 +@@ -128,19 +85,9 @@ namespace MonoDevelop.Platform
193 + return base.OnGetMimeTypeIsText (mimeType);
194 + }
195 +
196 +-
197 +- public override void ShowUrl (string url)
198 +- {
199 +- Gnome.Url.Show (url);
200 +- }
201 +-
202 + public override string DefaultMonospaceFont {
203 + get {
204 +- try {
205 +- return (string) (new GConf.Client ().Get ("/desktop/gnome/interface/monospace_font_name"));
206 +- } catch (Exception) {
207 +- return "Monospace 11";
208 +- }
209 ++ return "Monospace 11";
210 + }
211 + }
212 +
213 +@@ -159,18 +106,8 @@ namespace MonoDevelop.Platform
214 + filename = EscapeFileName (filename);
215 + if (filename == null)
216 + return "gnome-fs-regular";
217 +-
218 +- string icon = null;
219 +- Gnome.IconLookupResultFlags result;
220 +- try {
221 +- icon = Gnome.Icon.LookupSync (IconTheme.Default, thumbnailFactory, filename, null,
222 +- Gnome.IconLookupFlags.None, out result);
223 +- } catch {}
224 +- if (icon != null && icon.Length > 0)
225 +- return icon;
226 +- }
227 ++ }
228 + return "gnome-fs-regular";
229 +-
230 + }
231 +
232 + protected override Xwt.Drawing.Image OnGetIconForFile (string filename)
Report Message
Find on MARC Find on Google Groups