Apply patches and bump sugar release

* Microformat updater changes
* Bugfix for sl#870
* Extend sugar-launch with more options

4 files changed, 292 insertions, 1 deletions

diff --git a/rpms/sugar/Sugar-Extend-sugar-launch-with-more-options.patch b/rpms/sugar/Sugar-Extend-sugar-launch-with-more-options.patch
new file mode 100644
index 0000000..9b3ce1c
--- /dev/null
+++ b/rpms/sugar/Sugar-Extend-sugar-launch-with-more-options.patch
@@ -0,0 +1,50 @@
+From patchwork Wed Jan 19 15:20:35 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [Sugar] Extend sugar-launch with more options
+Date: Wed, 19 Jan 2011 20:20:35 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 593
+Message-Id: <1295450435-6137-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org, sugar-devel@lists.sugarlabs.org,
+	tch@sugarlabs.org
+
+Add activity_id, object_id and uri options.
+
+This patch is necessary in order to use Browse
+as the default http uri handler in sugar.
+Reviewed-by: Aleksey Lim <alsroot@member.fsf.org>
+
+---
+bin/sugar-launch |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/bin/sugar-launch b/bin/sugar-launch
+index 7297a8e..18c0bb7 100644
+--- a/bin/sugar-launch
++++ b/bin/sugar-launch
+@@ -28,6 +28,13 @@ usage = "usage: %prog [options] activity"
+ parser = OptionParser(usage)
+ parser.add_option("-d", "--debug", action="store_true", dest="debug",
+                   help="launch activity inside gdb")
++parser.add_option("-a", "--activity_id", action="store", dest="activity_id",
++                  help="unique id for the activity to be launched")
++parser.add_option("-o", "--object_id", action="store", dest="object_id",
++                  help="identity of the journal object associated with" \
++                  " the activity")
++parser.add_option("-u", "--uri", action="store", dest="uri",
++                  help="URI associated with the activity")
+ (options, args) = parser.parse_args()
+ 
+ if len(args) == 0:
+@@ -42,7 +49,8 @@ if not path:
+     sys.exit(1)
+ 
+ activity = ActivityBundle(path)
+-cmd_args = activityfactory.get_command(activity)
++cmd_args = activityfactory.get_command(activity, options.activity_id,
++                                options.object_id, options.uri)
+ 
+ def _which(exec_file):
+     if 'PATH' in os.environ:
diff --git a/rpms/sugar/sugar-Flickering-and-unknown-icons-in-the-window-bar-870.patch b/rpms/sugar/sugar-Flickering-and-unknown-icons-in-the-window-bar-870.patch
new file mode 100644
index 0000000..1a848f8
--- /dev/null
+++ b/rpms/sugar/sugar-Flickering-and-unknown-icons-in-the-window-bar-870.patch
@@ -0,0 +1,173 @@
+From patchwork Thu Jan 20 20:15:20 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] Flickering and unknown icons in the window bar #870
+Date: Fri, 21 Jan 2011 01:15:20 -0000
+From: Aleksey Lim <alsroot@member.fsf.org>
+X-Patchwork-Id: 599
+Message-Id: <1295554520-1977-1-git-send-email-alsroot@member.fsf.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ src/jarabe/desktop/activitieslist.py |    3 ++-
+ src/jarabe/desktop/favoritesview.py  |    1 +
+ src/jarabe/desktop/meshbox.py        |    1 +
+ src/jarabe/frame/activitiestray.py   |    1 +
+ src/jarabe/journal/misc.py           |    4 ++--
+ src/jarabe/model/shell.py            |    9 ++++-----
+ src/jarabe/view/launcher.py          |    9 ++++++---
+ src/jarabe/view/palettes.py          |    1 +
+ 8 files changed, 18 insertions(+), 11 deletions(-)
+
+
+diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
+index c3a0775..cf5c131 100644
+--- a/src/jarabe/desktop/activitieslist.py
++++ b/src/jarabe/desktop/activitieslist.py
+@@ -149,7 +149,8 @@ class ActivitiesTreeView(gtk.TreeView):
+         client = gconf.client_get_default()
+         xo_color = XoColor(client.get_string('/desktop/sugar/user/color'))
+ 
+-        launcher.add_launcher(activity_id, bundle.get_icon(), xo_color)
++        launcher.add_launcher(activity_id,
++                bundle.get_bundle_id(), bundle.get_icon(), xo_color)
+         activityfactory.create(bundle, ActivityHandle(activity_id))
+ 
+     def set_filter(self, query):
+diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
+index c59335a..2219be3 100644
+--- a/src/jarabe/desktop/favoritesview.py
++++ b/src/jarabe/desktop/favoritesview.py
+@@ -492,6 +492,7 @@ class ActivityIcon(CanvasIcon):
+ 
+             activity_id = activityfactory.create_activity_id()
+             launcher.add_launcher(activity_id,
++                                  self._activity_info.get_bundle_id(),
+                                   self._activity_info.get_icon(),
+                                   xo_color)
+ 
+diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
+index fb4be4e..621d4b2 100644
+--- a/src/jarabe/desktop/meshbox.py
++++ b/src/jarabe/desktop/meshbox.py
+@@ -829,6 +829,7 @@ class ActivityView(hippo.CanvasBox):
+         bundle = bundleregistry.get_registry().get_bundle(bundle_id)
+ 
+         launcher.add_launcher(self._model.get_id(),
++                              bundle.get_bundle_id(),
+                               bundle.get_icon(),
+                               self._model.get_color())
+ 
+diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
+index 370572c..b20ff8e 100644
+--- a/src/jarabe/frame/activitiestray.py
++++ b/src/jarabe/frame/activitiestray.py
+@@ -183,6 +183,7 @@ class ActivityInviteButton(BaseInviteButton):
+         bundle = registry.get_bundle(self._bundle_id)
+ 
+         launcher.add_launcher(self._activity_model.get_id(),
++                              bundle.get_bundle_id(),
+                               bundle.get_icon(),
+                               self._activity_model.get_color())
+ 
+diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
+index 4a2211f..0ad70e3 100644
+--- a/src/jarabe/journal/misc.py
++++ b/src/jarabe/journal/misc.py
+@@ -231,8 +231,8 @@ def resume(metadata, bundle_id=None):
+             object_id = model.copy(metadata, '/')
+ 
+         if activity_id:
+-            launcher.add_launcher(activity_id, bundle.get_icon(),
+-                    get_icon_color(metadata))
++            launcher.add_launcher(activity_id, bundle.get_bundle_id(),
++                    bundle.get_icon(), get_icon_color(metadata))
+             handle = ActivityHandle(object_id=object_id,
+                                     activity_id=activity_id)
+             activityfactory.create(bundle, handle)
+diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
+index b9cb0c2..f99af2d 100644
+--- a/src/jarabe/model/shell.py
++++ b/src/jarabe/model/shell.py
+@@ -601,11 +601,10 @@ class ShellModel(gobject.GObject):
+                              " was not found in the bundle registry."
+                              % service_name)
+         home_activity = Activity(activity_info, activity_id)
+-        self._add_activity(home_activity)
+-
+-        self._set_active_activity(home_activity)
+-
+-        self.emit('launch-started', home_activity)
++        if home_activity is None:
++            self._add_activity(home_activity)
++            self._set_active_activity(home_activity)
++            self.emit('launch-started', home_activity)
+ 
+         # FIXME: better learn about finishing processes by receiving a signal.
+         # Now just check whether an activity has a window after ~90sec
+diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
+index 89251e5..1e73549 100644
+--- a/src/jarabe/view/launcher.py
++++ b/src/jarabe/view/launcher.py
+@@ -32,7 +32,7 @@ from jarabe.view.pulsingicon import CanvasPulsingIcon
+ 
+ class LaunchWindow(gtk.Window):
+ 
+-    def __init__(self, activity_id, icon_path, icon_color):
++    def __init__(self, activity_id, bundle_id, icon_path, icon_color):
+         gobject.GObject.__init__(self)
+ 
+         self.props.type_hint = gtk.gdk.WINDOW_TYPE_HINT_NORMAL
+@@ -51,6 +51,7 @@ class LaunchWindow(gtk.Window):
+         canvas.pack_start(header, expand=False)
+ 
+         self._activity_id = activity_id
++        self._bundle_id = bundle_id
+         self._box = LaunchBox(activity_id, icon_path, icon_color)
+         box = hippo.Canvas()
+         box.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color())
+@@ -88,6 +89,7 @@ class LaunchWindow(gtk.Window):
+         self.resize(gtk.gdk.screen_width(), gtk.gdk.screen_height())
+ 
+     def __realize_cb(self, widget):
++        wm.set_bundle_id(widget.window, str(self._bundle_id))
+         wm.set_activity_id(widget.window, str(self._activity_id))
+         widget.window.property_change('_SUGAR_WINDOW_TYPE', 'STRING', 8,
+                                       gtk.gdk.PROP_MODE_REPLACE, 'launcher')
+@@ -163,13 +165,13 @@ def setup():
+     model.connect('launch-completed', __launch_completed_cb)
+ 
+ 
+-def add_launcher(activity_id, icon_path, icon_color):
++def add_launcher(activity_id, bundle_id, icon_path, icon_color):
+     model = shell.get_model()
+ 
+     if model.get_launcher(activity_id) is not None:
+         return
+ 
+-    launch_window = LaunchWindow(activity_id, icon_path, icon_color)
++    launch_window = LaunchWindow(activity_id, bundle_id, icon_path, icon_color)
+     launch_window.show()
+ 
+     model.register_launcher(activity_id, launch_window)
+@@ -177,6 +179,7 @@ def add_launcher(activity_id, icon_path, icon_color):
+ 
+ def __launch_started_cb(home_model, home_activity):
+     add_launcher(home_activity.get_activity_id(),
++            home_activity.get_bundle_id(),
+             home_activity.get_icon_path(), home_activity.get_icon_color())
+ 
+ 
+diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
+index 5994c3d..f93399e 100644
+--- a/src/jarabe/view/palettes.py
++++ b/src/jarabe/view/palettes.py
+@@ -154,6 +154,7 @@ class ActivityPalette(Palette):
+ 
+         activity_id = activityfactory.create_activity_id()
+         launcher.add_launcher(activity_id,
++                              self._activity_info.get_bundle_id(),
+                               self._activity_info.get_icon(),
+                               xo_color)
+ 
diff --git a/rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch b/rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch
new file mode 100644
index 0000000..db0deff
--- /dev/null
+++ b/rpms/sugar/sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch
@@ -0,0 +1,46 @@
+From patchwork Wed Jan 19 16:44:51 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] Pass sugar version to micro-format.php ASLO call
+Date: Wed, 19 Jan 2011 21:44:51 -0000
+From: Aleksey Lim <alsroot@member.fsf.org>
+X-Patchwork-Id: 595
+Message-Id: <1295455491-8296-1-git-send-email-alsroot@member.fsf.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ .../cpsection/updater/backends/microformat.py      |   12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+
+diff --git a/extensions/cpsection/updater/backends/microformat.py b/extensions/cpsection/updater/backends/microformat.py
+index 97499aa..6abc185 100644
+--- a/extensions/cpsection/updater/backends/microformat.py
++++ b/extensions/cpsection/updater/backends/microformat.py
+@@ -27,8 +27,6 @@ import gconf
+ 
+ from jarabe import config
+ 
+-client = gconf.client_get_default()
+-_UPDATE_PATH = client.get_string('/desktop/sugar/updater_url')
+ _ACTIVITIES_LIST = {}
+ ACTION_CHECKING = 0
+ ACTION_UPDATING = 1
+@@ -167,7 +165,15 @@ class _UpdateFetcher(gobject.GObject):
+     def download_bundle_updates(self):
+         self.emit('progress', ACTION_CHECKING, 'Fetching update '
+                 'information', 1, 3)
+-        self._url = _UPDATE_PATH
++
++        client = gconf.client_get_default()
++        self._url = client.get_string('/desktop/sugar/updater_url')
++        if '?' in self._url:
++            self._url += '&'
++        else:
++            self._url += '?'
++        self._url += 'sugar=' + '.'.join(config.version.split('.')[0:2])
++
+         self._file = gio.File(self._url)
+         logging.debug('Fetch %s', self._url)
+         self._file.read_async(self.__read_async_cb)
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index ad075b2..359ab20 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.88.1
-Release: 5.46dxo%{?dist}
+Release: 5.47dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -128,6 +128,15 @@ patch1601: sugar-Patch-to-add-feedback-icon-to-frame.patch
 patch1602: sugar-1-2-Two-kinds-of-feedback-submits.patch
 patch1603: sugar-2-2-Initial-client-implementation-for-feedback-feature.patch
 
+#Extend sugar-launch with more options
+patch1701: Sugar-Extend-sugar-launch-with-more-options.patch
+
+#sl#870 bugfix
+patch1801: sugar-Flickering-and-unknown-icons-in-the-window-bar-870.patch
+
+#Microformat updater changes
+patch1901: sugar-Pass-sugar-version-to-micro-format.php-ASLO-call.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -156,6 +165,7 @@ Requires: magnifier-Ceibal
 Requires: FlatbedCursors
 Requires: CapitalFont
 Requires: python-xlib
+Requires: ipython
 
 # for dbus-launch
 Requires: dbus-x11
@@ -300,6 +310,12 @@ multiple instances of sugar.
 %patch1602 -p1
 %patch1603 -p1
 
+%patch1701 -p1
+
+%patch1801 -p1
+
+%patch1901 -p1
+
 %build
 autoreconf
 %configure
@@ -376,6 +392,12 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Wed Jan 19 2011 Aleksey Lim <alsroot@member.fsf.org> 0.88.1-5.47
+- Add ipython runtime dependency to let feedback send more detailed tracebacks
+- Changes to microformat updater
+- sl#870 bugfix
+- Extend sugar-launch with more options
+
 * Wed Jan 19 2011 Anish Mangal <anish@sugarlabs.org> - 0.88.1-5.46
 - Incorporate auto-feedback feature