[Pkg-cli-apps-commits] [monodevelop] 01/02: Build without libmetacity support (closes: #751597).

[Iain Lane]

This is an automated email from the git hooks/post-receive script.

laney pushed a commit to branch master
in repository monodevelop.

commit a4262286fd0987d5c3fffe2166bb9a6edd4579f6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jun 15 13:51:49 2014 +0400

    Build without libmetacity support (closes: #751597).
    
    The current libmetacity code does not work anyway (as it relies on
    removed gconf schema), and it is not compatible with Metacity 3.x.
---
 debian/control                      |  2 +-
 debian/patches/no_libmetacity.patch | 59 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b5b3e2f..79b1314 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends-Indep: autoconf,
                      libgnome2.0-cil-dev,
                      libgtk2.0-cil-dev,
                      libgtkspell-dev,
-                     libmetacity-dev,
+#                    libmetacity-dev,
                      libmono-addins-cil-dev (>= 0.6),
                      libmono-addins-gui-cil-dev (>= 0.6),
                      libmono-cecil-cil-dev,
diff --git a/debian/patches/no_libmetacity.patch b/debian/patches/no_libmetacity.patch
new file mode 100644
index 0000000..95c8f71
--- /dev/null
+++ b/debian/patches/no_libmetacity.patch
@@ -0,0 +1,59 @@
+Description: build without Metacity themes support
+Author: Alberts Muktupāvels <alberts.muktupavels at gmail.com>
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: not-needed
+Last-Update: 2014-06-15
+
+--- a/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetDesignerBackend.cs
++++ b/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetDesignerBackend.cs
+@@ -77,21 +77,9 @@
+ 			wrapper = ObjectWrapper.Lookup (container);
+ 			TopLevelWindow window = container as TopLevelWindow;
+ 			
+-			if (window != null) {
+-				preview = Stetic.Metacity.Preview.Create (window);
+-				if (preview == null)
+-					preview = Stetic.Windows.Preview.Create (window);
+-				if (preview == null) {
+-					// Use a regular box.
+-					EventBox eventBox = new EventBox ();
+-					eventBox.Add (container);
+-					preview = eventBox;
+-				}
+-			} else {
+-				EventBox eventBox = new EventBox ();
+-				eventBox.Add (container);
+-				preview = eventBox;
+-			}
++			EventBox eventBox = new EventBox ();
++			eventBox.Add (container);
++			preview = eventBox;
+ 			
+ 			resizableFixed.Put (preview, container);
+ 
+@@ -660,8 +648,7 @@
+ 				PropagateExpose (cw, ev);*/
+ 
+ 			Gdk.Rectangle rect = child.Allocation;
+-			if (Stetic.Metacity.Preview.ThemeError) 
+-				GdkWindow.DrawRectangle (this.Style.BackgroundGC (StateType.Normal), true, rect.X, rect.Y, rect.Width, rect.Height);
++			GdkWindow.DrawRectangle (this.Style.BackgroundGC (StateType.Normal), true, rect.X, rect.Y, rect.Width, rect.Height);
+ 			
+ 			Pixbuf sh = Shadow.AddShadow (rect.Width, rect.Height);
+ 			GdkWindow.DrawPixbuf (this.Style.BackgroundGC (StateType.Normal), sh, 0, 0, rect.X - 5, rect.Y - 5, sh.Width, sh.Height, RgbDither.None, 0, 0); 
+--- a/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj
++++ b/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj
+@@ -104,13 +104,6 @@
+     <Compile Include="GuiDispatchServerSink.cs" />
+     <Compile Include="GuiDispatchServerSinkProvider.cs" />
+     <Compile Include="LibraryCache.cs" />
+-    <Compile Include="Metacity\ButtonFunction.cs" />
+-    <Compile Include="Metacity\ButtonLayout.cs" />
+-    <Compile Include="Metacity\FrameFlags.cs" />
+-    <Compile Include="Metacity\FrameType.cs" />
+-    <Compile Include="Metacity\ObjectManager.cs" />
+-    <Compile Include="Metacity\Preview.cs" />
+-    <Compile Include="Metacity\Theme.cs" />
+     <Compile Include="Palette.cs" />
+     <Compile Include="PaletteBackend.cs" />
+     <Compile Include="PluggableWidget.cs" />
diff --git a/debian/patches/series b/debian/patches/series
index 2cf17b7..a6b0040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ update_templates_for_gtk-sharp_2.12.patch
 boo_mimetype.patch
 no_appmenu
 use_system_mono-addins.patch
+no_libmetacity.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/monodevelop.git