[meego-commits] 7282: Changes to MeeGo:1.0:Netbook:Update:Testing/moblin-panel-web
ningxin hu
no_reply at build.meego.com
Fri Sep 3 03:11:22 UTC 2010
Hi,
I have made the following changes to moblin-panel-web in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.
Thank You,
ningxin hu
[This message was auto-generated]
---
Request #7282:
submit: home:nhu:branches:MeeGo:1.0:Netbook:Update:Testing/moblin-panel-web(r8)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/moblin-panel-web
Message:
Fix for chromium-lib update for BMC#4935
State: new 2010-09-02T20:11:22 nhu
Comment: None
changes files:
--------------
--- moblin-panel-web.changes
+++ moblin-panel-web.changes
@@ -0,0 +1,7 @@
+* Wed Sep 01 2010 Ningxin Hu <ningxin.hu at intel.com> - 0.1.6
+- Update according to chromium-lib updated to svn55059 for BMC#4935
+
+* Thu Jul 22 2010 Ningxin Hu <ningxin.hu at intel.com> - 0.1.6
+- Fix BMC#3741 & BMC#3280 internet panel will crash if chromium-based browser
+ enable sync
+
new:
----
chromium-lib-svn55059.patch
fix-sync-preferences.patch
spec files:
-----------
--- moblin-panel-web.spec
+++ moblin-panel-web.spec
@@ -8,6 +8,8 @@
Source0: %{name}-%{version}.tar.bz2
Source1: moblin-panel-web.ff
Source2: png-files.tar.gz
+Patch0: fix-sync-preferences.patch
+Patch1: chromium-lib-svn55059.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,10 +45,14 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
tar zxvf %{SOURCE2}
%build
+export LD_LIBRARY_PATH=/usr/lib/chromium-browser/
+
%autogen
make %{?_smp_mflags}
other changes:
--------------
++++++ chromium-lib-svn55059.patch (new)
--- chromium-lib-svn55059.patch
+++ chromium-lib-svn55059.patch
+diff --git a/common/chrome-profile-provider.cc b/common/chrome-profile-provider.cc
+index c6cc749..ca78b6e 100644
+--- a/common/chrome-profile-provider.cc
++++ b/common/chrome-profile-provider.cc
+@@ -31,7 +31,6 @@
+ #include <gio/gio.h>
+ #include <stdio.h>
+ #include "chrome/browser/browser_process.h"
+-#include "chrome/browser/thumbnail_store.h"
+ #include "chrome/browser/history/thumbnail_database.h"
+ #include "chrome-profile-provider.h"
+ #include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h"
+@@ -114,7 +113,7 @@ ChromeProfileProvider::Initialize(const char* config_dir_name)
+ if (!autocompletion_controller_) {
+ autocompletion_controller_ = new AutocompleteController(profile_);
+ registrar_.Add(this, NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_UPDATED,
+- NotificationService::AllSources());
++ Source<AutocompleteController>(autocompletion_controller_));
+ }
+ else
+ autocompletion_controller_->SetProfile(profile_);
+@@ -299,7 +298,7 @@ ChromeProfileProvider::Observe(NotificationType type,
+ {
+ AutocompleteResult result;
+ result.CopyFrom(*(Details<const AutocompleteResult>(details).ptr()));
+-
++
+ if (result.size() == 0)
+ if (autocompletion_context_ && autocompletion_expback_)
+ {
+@@ -386,7 +385,7 @@ ChromeProfileProvider::OnGotSession(SessionService::Handle handle,
+ #ifdef DEBUG_CHROMIUM_API
+ g_debug ("tab_id=%d, url=%s, title=%s",
+ (*t)->tab_id.id(),
+- tab_nav->url().spec().c_str(),
++ tab_nav->virtual_url().spec().c_str(),
+ UTF16ToUTF8(tab_nav->title()).c_str());
+ #endif
+
+diff --git a/netpanel/moblin-netbook-netpanel.cc b/netpanel/moblin-netbook-netpanel.cc
+index 3524b1e..1d3d715 100644
+--- a/netpanel/moblin-netbook-netpanel.cc
++++ b/netpanel/moblin-netbook-netpanel.cc
+@@ -527,7 +527,7 @@ moblin_netbook_netpanel_launch_url (MoblinNetbookNetpanel *netpanel,
+
+ if (priv->panel_client)
+ {
+- if (!mpl_panel_client_launch_application (priv->panel_client, exec))
++ if (!g_spawn_command_line_async (exec, NULL))
+ g_warning (G_STRLOC ": Error launching browser for url '%s'", esc_url);
+ else
+ mpl_panel_client_hide (priv->panel_client);
+diff --git a/netpanel/moblin-panel-web.cc b/netpanel/moblin-panel-web.cc
+index 1ddc31a..09c1604 100644
+--- a/netpanel/moblin-panel-web.cc
++++ b/netpanel/moblin-panel-web.cc
+@@ -50,7 +50,6 @@
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/browser_process_impl.h"
+ #include "chrome/browser/chrome_thread.h"
+-#include "chrome/browser/user_data_manager.h"
+ #include "app/system_monitor.h"
+
+ static void
+@@ -145,9 +144,7 @@ main (int argc,
+ ChromeThread main_thread(ChromeThread::UI, MessageLoop::current());
+
+ PrefService* local_state = browser_process->local_state();
+- local_state->RegisterStringPref(prefs::kApplicationLocale, L"");
+-
+- scoped_ptr<UserDataManager> user_data_manager(UserDataManager::Create());
++ local_state->RegisterStringPref(prefs::kApplicationLocale, "");
+
+ // Initialize the prefs of the local state.
+ browser::RegisterLocalState(local_state);
+@@ -158,10 +155,12 @@ main (int argc,
+ browser_process->db_thread();
+ browser_process->file_thread();
+ browser_process->process_launcher_thread();
++ browser_process->cache_thread();
+ browser_process->io_thread();
+
+ // Init google url tracker to avoid abort later
+ browser_process->google_url_tracker();
++ browser_process->intranet_redirect_detector();
+
+ // XXX: have to init chrome profile prover after thread creation
+ // Init chrome profile provider
++++++ fix-sync-preferences.patch (new)
--- fix-sync-preferences.patch
+++ fix-sync-preferences.patch
+diff --git a/common/chrome-profile-provider.cc b/common/chrome-profile-provider.cc
+index 72b9d10..c6cc749 100644
+--- a/common/chrome-profile-provider.cc
++++ b/common/chrome-profile-provider.cc
+@@ -95,12 +95,10 @@ ChromeProfileProvider::Initialize(const char* config_dir_name)
+
+ g_mkdir_with_parents (panel_profile_path, 0755);
+
+- std::string cmd_line = "rsync -av " + std::string(chrome_profile_path) + " " + std::string(panel_profile_path) + " -a";
++ std::string cmd_line = "rsync -av " + std::string(chrome_profile_path) + " " + std::string(panel_profile_path) + " -a --exclude=\"Preferences*\"";
+
+- //printf("command line: %s\n", cmd_line.c_str());
+-
+ g_spawn_command_line_sync (cmd_line.c_str(), NULL, NULL, NULL, NULL);
+-
++
+ user_data_dir_ = FilePath(panel_profile_path);
+
+ g_free(chrome_profile_path);
+diff --git a/netpanel/moblin-panel-web.cc b/netpanel/moblin-panel-web.cc
+index a912321..1ddc31a 100644
+--- a/netpanel/moblin-panel-web.cc
++++ b/netpanel/moblin-panel-web.cc
+@@ -51,6 +51,7 @@
+ #include "chrome/browser/browser_process_impl.h"
+ #include "chrome/browser/chrome_thread.h"
+ #include "chrome/browser/user_data_manager.h"
++#include "app/system_monitor.h"
+
+ static void
+ _client_set_size_cb (MplPanelClient *client,
+@@ -136,6 +137,7 @@ main (int argc,
+ gtk_init(&argc, &argv);
+
+ MessageLoop main_message_loop(MessageLoop::TYPE_UI);
++ SystemMonitor system_monitor;
+
+ scoped_ptr<BrowserProcessImpl> browser_process;
+ browser_process.reset(new BrowserProcessImpl(*cmd_line));
++++++ moblin-panel-web.ff
--- moblin-panel-web.ff
+++ moblin-panel-web.ff
@@ -8,4 +8,10 @@
LD_LIBRARY_PATH=/usr/lib/chromium-browser:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
+# Clean the cached profile when first run
+if [ ! -f ~/.config/web-panel/first-run ]; then
+ rm -rf ~/.config/web-panel/Default
+ touch ~/.config/web-panel/first-run
+fi
+
exec -a "$0" "/usr/libexec/moblin-panel-web.bin" "$@"
More information about the MeeGo-commits
mailing list