[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.0.1-1-11-ga04568f

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 287ec44c3107d7c16ac363fd4760cd8e7e9672d8
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat May 14 20:18:05 2011 +0800

    Workaround meego panel clideps failure

diff --git a/debian/patches/series b/debian/patches/series
index e87ea7b..c04e208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 workaround-clideps-winmm.patch
+workaround-clideps-meego.patch
 99_ltmain_as-needed.patch
diff --git a/debian/patches/workaround-clideps-meego.patch b/debian/patches/workaround-clideps-meego.patch
new file mode 100644
index 0000000..5aa1657
--- /dev/null
+++ b/debian/patches/workaround-clideps-meego.patch
@@ -0,0 +1,125 @@
+Description: Workaround dh_clideps failing on a broken libmeego-panel DllImport
+Author: Chow Loong Jin <hyperair at ubuntu.com>
+Forwarded: not-needed
+Applied-Upstream: no
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2011-05-14 21:51:44.254191395 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am	2011-05-14 21:51:44.347524133 +0800
+@@ -15,8 +15,6 @@
+ 	Banshee.MeeGo/PlaybackBox.cs \
+ 	Banshee.MeeGo/SearchEntry.cs \
+ 	MeeGo.Panel/PanelButtonState.cs \
+-	MeeGo.Panel/PanelClient.cs \
+-	MeeGo.Panel/PanelGtk.cs \
+ 	MeeGo.Panel/SetPositionHandler.cs \
+ 	MeeGo.Panel/SetSizeHandler.cs
+ 
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2011-05-14 21:51:44.254191395 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in	2011-05-14 21:51:44.347524133 +0800
+@@ -407,8 +407,6 @@
+ 	Banshee.MeeGo/PlaybackBox.cs \
+ 	Banshee.MeeGo/SearchEntry.cs \
+ 	MeeGo.Panel/PanelButtonState.cs \
+-	MeeGo.Panel/PanelClient.cs \
+-	MeeGo.Panel/PanelGtk.cs \
+ 	MeeGo.Panel/SetPositionHandler.cs \
+ 	MeeGo.Panel/SetSizeHandler.cs
+ 
+Index: banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	2011-05-14 21:51:44.194191779 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	2011-05-14 21:59:34.871221818 +0800
+@@ -40,7 +40,7 @@
+     {
+         public static MeeGoPanel Instance { get; private set; }
+ 
+-        private PanelGtk embedded_panel;
++        // private PanelGtk embedded_panel;
+         private Window window_panel;
+ 
+         public MediaPanelContents Contents { get; private set; }
+@@ -55,25 +55,25 @@
+ 
+             var timer = Log.DebugTimerStart ();
+ 
+-            try {
+-                Log.Debug ("Attempting to create Netbook toolbar panel");
+-                embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
+-                    null, "media-button", true);
+-                embedded_panel.ShowBeginEvent += (o, e) => {
+-                    ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
+-                    if (Contents != null) {
+-                        Contents.SyncSearchEntry ();
+-                    }
+-                };
+-                while (Gtk.Application.EventsPending ()) {
+-                    Gtk.Application.RunIteration ();
+-                }
+-            } catch (Exception e) {
+-                if (!(e is DllNotFoundException)) {
+-                    Log.Exception ("Could not bind to Netbook panel", e);
+-                }
++            // try {
++            //     Log.Debug ("Attempting to create Netbook toolbar panel");
++            //     embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
++            //         null, "media-button", true);
++            //     embedded_panel.ShowBeginEvent += (o, e) => {
++            //         ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
++            //         if (Contents != null) {
++            //             Contents.SyncSearchEntry ();
++            //         }
++            //     };
++            //     while (Gtk.Application.EventsPending ()) {
++            //         Gtk.Application.RunIteration ();
++            //     }
++            // } catch (Exception e) {
++                // if (!(e is DllNotFoundException)) {
++                //     Log.Exception ("Could not bind to Netbook panel", e);
++                // }
+                 window_panel = new Gtk.Window ("Netbook Media Panel");
+-            }
++            // }
+ 
+             Log.DebugTimerPrint (timer, "Netbook panel created: {0}");
+         }
+@@ -89,9 +89,10 @@
+             Contents.ShowAll ();
+             Log.DebugTimerPrint (timer, "Netbook panel contents created: {0}");
+ 
+-            if (embedded_panel != null) {
+-                embedded_panel.SetChild (Contents);
+-            } else if (window_panel != null) {
++            // if (embedded_panel != null) {
++            //     embedded_panel.SetChild (Contents);
++            // } else if (window_panel != null) 
++            {
+                 window_panel.Add (Contents);
+                 window_panel.SetDefaultSize (1000, 500);
+                 window_panel.WindowPosition = WindowPosition.Center;
+@@ -106,17 +107,17 @@
+         public void Hide ()
+         {
+             window_panel.Hide ();
+-            if (embedded_panel != null) {
+-                embedded_panel.Hide ();
+-            }
++            // if (embedded_panel != null) {
++            //     embedded_panel.Hide ();
++            // }
+         }
+ 
+         public void Show ()
+         {
+             window_panel.Show ();
+-            if (embedded_panel != null) {
+-                embedded_panel.Show ();
+-            }
++            // if (embedded_panel != null) {
++            //     embedded_panel.Show ();
++            // }
+         }
+     }
+ }

-- 
banshee