diff options
| -rw-r--r-- | do_it_all.sh | 23 | ||||
| -rw-r--r-- | patches/0001-sdxo-2321-version-86.1-Include-provision-for-spell-c.patch | 43 | ||||
| -rw-r--r-- | patches/0002-sdxo-2948-version-86.2-Making-collaboration-work-aga.patch | 99 |
3 files changed, 165 insertions, 0 deletions
diff --git a/do_it_all.sh b/do_it_all.sh new file mode 100644 index 0000000..c524077 --- /dev/null +++ b/do_it_all.sh @@ -0,0 +1,23 @@ +set -e + +git_url="git://git.sugarlabs.org/write/mainline.git" + + +# Remove the upstream cloned-directory, if any. +if [ -d "activity" ]; then + sudo rm -r activity +fi + +# Clone a fresh copy of the upstream. +git clone "$git_url" activity + +# Build the activity (to generate "generated" files such as locale files). +cd activity +python setup.py build + +# Now, apply the AC patches. +git am ../patches/*.patch + +# Finally, build the bundle (to be retrieved from "activity/dist"). +python setup.py dist_xo + diff --git a/patches/0001-sdxo-2321-version-86.1-Include-provision-for-spell-c.patch b/patches/0001-sdxo-2321-version-86.1-Include-provision-for-spell-c.patch new file mode 100644 index 0000000..783963a --- /dev/null +++ b/patches/0001-sdxo-2321-version-86.1-Include-provision-for-spell-c.patch @@ -0,0 +1,43 @@ +From 452aa7f3a735e5d5aa436df859b77d6e79ae4c1d Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@activitycentral.com> +Date: Thu, 21 Feb 2013 16:27:42 +0530 +Subject: [PATCH] sdxo#2321: [version 86.1] Include provision for + spell-checker. +Organization: Sugar Labs Foundation + + +Signed-off-by: Ajay Garg <ajay@activitycentral.com> +--- + activity/activity.info | 2 +- + keybindings.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/activity/activity.info b/activity/activity.info +index b09e501..9e945d2 100644 +--- a/activity/activity.info ++++ b/activity/activity.info +@@ -3,7 +3,7 @@ name = Write + bundle_id = org.laptop.AbiWordActivity + exec = sugar-activity AbiWordActivity.AbiWordActivity + icon = activity-write +-activity_version = 86 ++activity_version = 86.1 + show_launcher = 1 + mime_types = text/rtf;text/plain;application/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/xhtml+xml;text/html;application/vnd.oasis.opendocument.text + license = GPLv2+ +diff --git a/keybindings.xml b/keybindings.xml +index 275e975..c71d7a6 100644 +--- a/keybindings.xml ++++ b/keybindings.xml +@@ -8,7 +8,7 @@ + <unbind-mappings handler="contextRevision" /> + <unbind-mappings handler="contextHyperlink" /> + <unbind-mappings handler="contextImage" /> +- <unbind-mappings handler="contextMisspellText" /> ++ <!-- unbind-mappings handler="contextMisspellText" /--> + <unbind-mappings handler="contextMenu" /> + <unbind-mappings handler="dlgFmtPosImage" /> + <unbind-mappings handler="dlgFmtImage" /> +-- +1.7.11.7 + diff --git a/patches/0002-sdxo-2948-version-86.2-Making-collaboration-work-aga.patch b/patches/0002-sdxo-2948-version-86.2-Making-collaboration-work-aga.patch new file mode 100644 index 0000000..e70856a --- /dev/null +++ b/patches/0002-sdxo-2948-version-86.2-Making-collaboration-work-aga.patch @@ -0,0 +1,99 @@ +From 90dd9a44e417f423791798a717d869ca332f1830 Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@activitycentral.com> +Date: Thu, 21 Feb 2013 16:41:01 +0530 +Subject: [PATCH] sdxo#2948: [version 86.2] Making collaboration work again. +Organization: Sugar Labs Foundation + +This stopped working (for "Write"), since the time +http://git.sugarlabs.org/sugar-toolkit-gtk3/sugar-toolkit-gtk3/commit/70cee44717d46129419992cd6a7e15472dc1f568 +was pushed. + +Signed-off-by: Ajay Garg <ajay@activitycentral.com> +--- + AbiWordActivity.py | 21 ++++++++++----------- + activity/activity.info | 2 +- + 2 files changed, 11 insertions(+), 12 deletions(-) + +diff --git a/AbiWordActivity.py b/AbiWordActivity.py +index 35b248c..e95718e 100644 +--- a/AbiWordActivity.py ++++ b/AbiWordActivity.py +@@ -67,7 +67,6 @@ class AbiWordActivity(activity.Activity): + + # create our main abiword canvas + self.abiword_canvas = DocumentView() +- self._shared_activity = None + self._new_instance = True + toolbar_box = ToolbarBox() + +@@ -182,13 +181,13 @@ class AbiWordActivity(activity.Activity): + + self.connect('shared', self._shared_cb) + +- if self._shared_activity: ++ if self.shared_activity: + # we are joining the activity + logger.error('We are joining an activity') + self.connect('joined', self._joined_cb) +- self._shared_activity.connect('buddy-joined', ++ self.shared_activity.connect('buddy-joined', + self._buddy_joined_cb) +- self._shared_activity.connect('buddy-left', self._buddy_left_cb) ++ self.shared_activity.connect('buddy-left', self._buddy_left_cb) + if self.get_shared(): + # # oh, OK, we've already joined + self._joined_cb() +@@ -236,8 +235,8 @@ class AbiWordActivity(activity.Activity): + logger.error('My Write activity was shared') + self._sharing_setup() + +- self._shared_activity.connect('buddy-joined', self._buddy_joined_cb) +- self._shared_activity.connect('buddy-left', self._buddy_left_cb) ++ self.shared_activity.connect('buddy-joined', self._buddy_joined_cb) ++ self.shared_activity.connect('buddy-left', self._buddy_left_cb) + + channel = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES] + logger.error('This is my activity: offering a tube...') +@@ -247,13 +246,13 @@ class AbiWordActivity(activity.Activity): + def _sharing_setup(self): + logger.debug("_sharing_setup()") + +- if self._shared_activity is None: ++ if self.shared_activity is None: + logger.error('Failed to share or join activity') + return + +- self.conn = self._shared_activity.telepathy_conn +- self.tubes_chan = self._shared_activity.telepathy_tubes_chan +- self.text_chan = self._shared_activity.telepathy_text_chan ++ self.conn = self.shared_activity.telepathy_conn ++ self.tubes_chan = self.shared_activity.telepathy_tubes_chan ++ self.text_chan = self.shared_activity.telepathy_text_chan + self.tube_id = None + self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal( + 'NewTube', self._new_tube_cb) +@@ -267,7 +266,7 @@ class AbiWordActivity(activity.Activity): + + def _joined_cb(self, activity): + logger.error("_joined_cb()") +- if not self._shared_activity: ++ if not self.shared_activity: + return + + self.joined = True +diff --git a/activity/activity.info b/activity/activity.info +index 9e945d2..499a708 100644 +--- a/activity/activity.info ++++ b/activity/activity.info +@@ -3,7 +3,7 @@ name = Write + bundle_id = org.laptop.AbiWordActivity + exec = sugar-activity AbiWordActivity.AbiWordActivity + icon = activity-write +-activity_version = 86.1 ++activity_version = 86.2 + show_launcher = 1 + mime_types = text/rtf;text/plain;application/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/xhtml+xml;text/html;application/vnd.oasis.opendocument.text + license = GPLv2+ +-- +1.7.11.7 + |