Add pending patches

3 files changed, 119 insertions, 1 deletions

diff --git a/rpms/sugar/journal-xobundle-removal-wont-remove-installed-one.patch b/rpms/sugar/journal-xobundle-removal-wont-remove-installed-one.patch
new file mode 100644
index 0000000..1a3dbf3
--- /dev/null
+++ b/rpms/sugar/journal-xobundle-removal-wont-remove-installed-one.patch
@@ -0,0 +1,32 @@
+From dcafb30f3e96eaf0beaa41277d49f1bf8f0c3587 Mon Sep 17 00:00:00 2001
+From: Martin Abente <mabente@paraguayeduca.org>
+Date: Wed, 28 Jul 2010 17:53:30 -0400
+Subject: [PATCH] Journal xobundle removal wont remove installed one
+Organization: Paraguay Educa
+
+Journal Xo bundles removal also removes the installed activity. There
+are many scenarios where this behavior is it not desired. Therefore it
+needs to be changed.
+---
+ src/jarabe/journal/palettes.py |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
+index 0e7702d..7c3e5ff 100644
+--- a/src/jarabe/journal/palettes.py
++++ b/src/jarabe/journal/palettes.py
+@@ -128,11 +128,6 @@ class ObjectPalette(Palette):
+         self._temp_file_path = None
+ 
+     def __erase_activate_cb(self, menu_item):
+-        registry = bundleregistry.get_registry()
+-
+-        bundle = misc.get_bundle(self._metadata)
+-        if bundle is not None and registry.is_installed(bundle):
+-            registry.uninstall(bundle)
+         model.delete(self._metadata['uid'])
+ 
+     def __detail_activate_cb(self, menu_item):
+-- 
+1.6.0.4
+
diff --git a/rpms/sugar/restore-sugar-launch-by-bundle-id-substring-fixes-89.patch b/rpms/sugar/restore-sugar-launch-by-bundle-id-substring-fixes-89.patch
new file mode 100644
index 0000000..84442ce
--- /dev/null
+++ b/rpms/sugar/restore-sugar-launch-by-bundle-id-substring-fixes-89.patch
@@ -0,0 +1,82 @@
+From 3258ae93ce73b840db1331e5374130b823742559 Mon Sep 17 00:00:00 2001
+From: James Cameron <quozl@laptop.org>
+Date: Tue, 27 Jul 2010 11:26:56 +1000
+Subject: [PATCH] restore sugar-launch by bundle id substring, fixes #897
+
+sugar-launch uses GetBundlePath which calls bundleregistry.get_bundle().
+
+In this patch, the get_bundle() method is changed to retain as much of
+the original API as possible, yet in the situation where it might return
+None it will now return a bundle if there is only one bundle that
+matches the search string.
+
+http://bugs.sugarlabs.org/ticket/897
+http://dev.laptop.org/ticket/9189
+
+Patch tested on Sugar 0.84.10 on OLPC XO-1.5 build os108.
+
+Test case:
+
+import jarabe.model.bundleregistry
+registry = jarabe.model.bundleregistry.BundleRegistry()
+tests = ['org.laptop.Terminal', 'Terminal', 'terminal', 'e', 'asdqweas']
+for x in tests:
+    y = registry.get_bundle(x)
+    if y is None:
+        z = 'None'
+    else:
+        z = y.get_bundle_id()
+    print x, z
+
+Output before patch:
+
+org.laptop.Terminal org.laptop.Terminal
+Terminal None
+terminal None
+e None
+asdqweas None
+
+Output after patch:
+
+org.laptop.Terminal org.laptop.Terminal
+Terminal org.laptop.Terminal
+terminal org.laptop.Terminal
+e None
+asdqweas None
+---
+ src/jarabe/model/bundleregistry.py |   16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
+index 86a2738..858655f 100644
+--- a/src/jarabe/model/bundleregistry.py
++++ b/src/jarabe/model/bundleregistry.py
+@@ -159,12 +159,22 @@ class BundleRegistry(gobject.GObject):
+         self._write_favorites_file()
+ 
+     def get_bundle(self, bundle_id):
+-        """Returns an bundle given his service name"""
++        """Returns a bundle given service name or substring,
++        returns None if there is either no match, or more than one
++        match by substring."""
++        result = []
++        key = bundle_id.lower()
++
+         for bundle in self._bundles:
+-            if bundle.get_bundle_id() == bundle_id:
++            name = bundle.get_bundle_id()
++            if name == bundle_id:
+                 return bundle
++            if key in name.lower():
++                result.append(bundle)
++        if len(result) == 1:
++            return result[0]
+         return None
+-    
++
+     def __iter__(self):
+         return self._bundles.__iter__()
+ 
+-- 
+1.7.1
+
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 4c45281..f94f50d 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.20dxr%{?dist}
+Release: 5.21dxr%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -25,6 +25,8 @@ Patch11: add-font-dpi-schema.patch
 Patch12: reverse-sort-order-of-activities-list.patch
 Patch13: sl2062.patch
 Patch14: gsm-errors-palette.patch
+Patch15: restore-sugar-launch-by-bundle-id-substring-fixes-89.patch
+Patch16: journal-xobundle-removal-wont-remove-installed-one.patch
 
 # Andres' journal filesize enhancement
 Patch101: sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch
@@ -134,6 +136,8 @@ multiple instances of sugar.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %patch101 -p1
 %patch102 -p1