Re: [Sugar-devel] Dextrose patch queue
On 09/28/2010 12:31 AM, Bernie Innocenti wrote: On 09/28/10 00:31, Bernie Innocenti wrote: If you know more, please update the editable version here: http://wiki.sugarlabs.org/go/Dextrose/TODO/Merge_Plan We currently carry a total of 102 patches. Of these, 46 have already been upstreamed, 47 are still unreviewed, unsubmitted or rejected and the remaining 9 have become obsolete or bitrotten for various reasons. What is the plan for landing the other patches? In general: I think we should be careful to only land things in non master versions that are in master already. Of course this is more work but will pay back later. Btw, are the 0.88 patches not landed in the upstream branch yet [1]? [1] http://git.sugarlabs.org/projects/sugar/repos/mainline/logs/sucrose-0.88 A few months ago I offered to maintain the sucrose-0.88 branch with the intent was to backport the merged patches, release new tarballs and rebase Dextrose on them to reduce the delta from upstream. Then I realized that all this extra effort wouldn't buy us anything. As soon as 0.90 stabilizes, we could simply jump to it and drop all the upstreamed patches. Since sucrose-0.88 has no active users other than Dextrose, there's no point in maintaining it up to date. Maybe you should ask if others are interested in the 0.88 branch. I do know of dextrose so far. Of course we have the regular Fedora users and Ubuntu ones? Regards, Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Dextrose patch queue
If you know more, please update the editable version here: http://wiki.sugarlabs.org/go/Dextrose/TODO/Merge_Plan We currently carry a total of 102 patches. Of these, 46 have already been upstreamed, 47 are still unreviewed, unsubmitted or rejected and the remaining 9 have become obsolete or bitrotten for various reasons. -cut- This is a summary of all Sugar patches in Dextrose as of today. Most of these patches have been submitted to sugar-devel@ or attached to tickets. Some have already found their way upstream, others still have quality issues. All of them have been integrated and tested in Dextrose to produce a better overall Sugar environment. Refer to the rpms directory in git for the actual patches: http://git.sugarlabs.org/projects/dextrose/repos/mainline/trees/master/rpms == Upstreamed bug fixes == sugar-datastore/sl2132-reduce-_FLUSH_TIMEOUT-to-5sec.patch sugar-datastore/sl2132-set-index_updated-flag-on-ds-shutting-down.patch sugar-datastore/sl2095-invert-datastore-clean-logic.patch These plug a serious journal data loss condition that was observed repeatedly in the field. sugar/sl2064-always-listen-for-NameOwnerChanged-DBus-message.patch It turns out that this patch does not really fix #2064, but it doesn't hurt either. sugar/fix-duplication-of-OLPC-mesh-icons.patch Three or more mesh icons were being added after every suspend/resume. sugar/journal-xobundle-removal-wont-remove-installed-one.patch Quite surprising behavior: removing a bundle from the journal would uninstall activity too. sugar/sl2062-catch-network-errors-when-trying-to-register-to-the-xs.patch sugar/sl1940-register-session-failed-fix.patch These two help make registration to schoolserver less painful. sugar/add-button-frame.patch Add frame and journal keybindings to F5/F6 (for XO1.5-HS) sugar/indicate-inactive-state-in-mesh-device-icon.patch Not sure how this interacts with the switch from mesh to ad-hoc, but we applied it long ago. sugar/restore-sugar-launch-by-bundle-id-substring-fixes-89.patch sugar/improve-activity-updater-icon.patch sugar/disconnect-icon-in-wifi-palette-1736.patch sugar-toolkit/use-set_toolbar_box-in-example-code.patch sugar-toolkit/set-default-accelerators-for-Copy-and-Paste-buttons.patch sugar-toolkit/sl1861-remove-unneeded-debug-logs.patch These are not really important, but safe and nice to have. sugar/sl1842-journal-show-error-on-write-failure.patch sugar-toolkit/sl1842-notify-red-alert.patch sugar-toolkit/add-ErrorAlert.patch The version that went upstream lacks the fancy red alert part. For the sake of staying closer to upstream, we could rebase Dextrose on this version. I don't particularly care. sugar-artwork/sugar-artwork-gtkdep.patch sugar-artwork/revert-to-GTK_WIDGET_IS_SENSITIVE.patch Small build fixes. == Upstreamed new features == sugar/sizelist--cover-letter.patch sugar/sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch sugar/sizelist-0002-Add-a-filesize-column-to-the-journal-list-model.patch sugar/sizelist-0003-Journaltoolbox-Add-add_separator-method-for-convenie.patch sugar/sizelist-0004-Add-a-ListViewButton-to-the-journal-search-toolbar.patch sugar/sizelist-0006-Display-the-sorting-property-in-the-last-column.patch sugar/sizelist-0005-Rename-the-date-column-to-sort_column.patch sugar/sizelist-0007-Expandedentry-Try-to-use-the-filesize-property.patch sugar/sizelist-0008-Implement-sorting-for-removable-devices.patch sugar/sizelist-0009-Add-sort-by-creation-time-option-to-the-ListViewButt.patch sugar/sizelist-0010-Add-ctime-property-to-the-journal-model.patch sugar-artwork/sizelist-0001-add-icons-for-the-sorting-options-in-the-Journal.patch sugar-datastore/sizelist-0002-Add-migration-code-from-DS-v0-for-the-filesize-prope.patch sugar-datastore/sizelist-0006-Implement-migration-from-DS-v0-for-ctime-property.patch sugar-datastore/sizelist--cover-letter.patch sugar-datastore/sizelist-0005-Check-ctime-on-index-rebuild.patch sugar-datastore/sizelist-0004-Add-ctime-property-to-the-index-and-datastore.patch sugar-datastore/sizelist-0003-Check-filesize-property-on-index-rebuild.patch sugar-datastore/sizelist-0001-Add-filesize-property-to-the-index.patch sugar-datastore/sizelist-0007-Increment-CURRENT_LAYOUT_VERSION-to-trigger-an-index.patch Andres' series for sorting the journal by file size: http://wiki.sugarlabs.org/go/Features/Journal_Sort THIS IS NOT A GEEK TOY! If the filesize is not exposed, users are unable to figure out how to free up space when the journal becomes full. sugar/sl1610-default-ad-hoc-networks.patch sugar-artwork/ad_hoc_artwork.patch http://wiki.sugarlabs.org/go/Features/Sugar_Adhoc_Networks sugar/bundle-Delete-profile-data-only-when-erased.patch sugar-toolkit/bundle-Delete-activities-profile-data-when-uninstall.patch This is sl#2074. Merged after a very long struggle.
Re: [Sugar-devel] Dextrose patch queue
On 09/28/10 00:31, Bernie Innocenti wrote: If you know more, please update the editable version here: http://wiki.sugarlabs.org/go/Dextrose/TODO/Merge_Plan We currently carry a total of 102 patches. Of these, 46 have already been upstreamed, 47 are still unreviewed, unsubmitted or rejected and the remaining 9 have become obsolete or bitrotten for various reasons. A few months ago I offered to maintain the sucrose-0.88 branch with the intent was to backport the merged patches, release new tarballs and rebase Dextrose on them to reduce the delta from upstream. Then I realized that all this extra effort wouldn't buy us anything. As soon as 0.90 stabilizes, we could simply jump to it and drop all the upstreamed patches. Since sucrose-0.88 has no active users other than Dextrose, there's no point in maintaining it up to date. -- // Bernie Innocenti - http://codewiz.org/ \X/ Sugar Labs - http://sugarlabs.org/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
