Let's cross-post this merge plan on sugar-devel, where it can be
discussed with the the upstream Sugar developers.
For those not subscribed to both lists, there was a short thread here:
http://lists.sugarlabs.org/archive/dextrose/2011-December/001476.html
There's nothing inherently wrong if some Dextrose patches can never be
upstreamed for one reason or another. For downstream distributors it's
normal practice to carry around a *reasonable* delta. This can happen
for various reasons, including product differentiation and customer
support.
Forwarded Message
From: Sascha Silbe sascha-ml-reply-to-201...@silbe.org
To: dextrose dextr...@lists.sugarlabs.org
Subject: [Dextrose] Dextrose 2 patches report
Date: Mon, 05 Dec 2011 19:23:06 +0100
Hello everyone,
this is the list of Dextrose 2 patches that we still apply to the Sugar
packages in Dextrose 3 (i.e. that have been neither successfully
upstreamed nor dropped):
== sugar-artwork ==
1. Add icons for memory and cpu resource indicator (Anish Mangal)
Part of the Memory / CPU resource indicator feature, see the
corresponding sugar patch below.
2. accessibility_0001_contrast.patch (unknown author)
Part of the accessibility features developed by Plan Ceibal; see
the corresponding sugar-toolkit and sugar patches below.
3. accessibility_0002_virtualkeyboard_icon.patch (unknown author)
Ditto.
4. Add device feedback icon (Martin Abente)
Part of the Feedback feature; see corresponding sugar patches
below.
== sugar-toolkit ==
1. RFC: Kill the delayed menus for good (Bernie Innocenti, Michael Stone)
This has been discussed upstream for endless hours (see e.g. [1,2],
but no consensus was reached.
2. Add support for using high-contrast GTK Sugar theme (Plan Ceibal)
Part of the accessibility features developed by Plan Ceibal. I
still don't know what the actual goals were. Testing of this
particular change showed a negative impact on contrast, the exact
opposite of what I'd expect it to do.
3. STK non-intrusive NamingAlert (Martin Abente)
The Naming Alert has been discussed for endless hours as well.
Upstream doesn't want to remove it before there's a reasonable
substitute. Progress on the latter is being made [3,4], but hasn't
landed yet.
4. Parse activity dependencies (Aleksey Lim)
Submitted upstream [5], stalled.
5. Report to the shell on errors (Aleksey Lim)
Part of the Feedback feature; see corresponding sugar patches.
6. Clipboard menu off screen #2201 (Aleksey Lim)
Submitted upstream [6,7], stalled.
7. More robust handling of unhandled exceptions (Aleksey Lim)
Not sure what the reason for this change is. Aleksey?
== sugar ==
1. Add cpu and memory resource indicator to frame (Anish Mangal)
Another patch that has been discussed for several cycles upstream
(especially in Design Team meetings), but with no consensus reached.
2. set-default-scaling-to-100.patch (unknown author)
Hack to set the scaling to 100; not suitable for upstreaming. See
SL#39 [8]. The real fix for this would need to take angular size into
account [9,10]. Maybe we could come up with a good enough heuristic
by analysing the physical screen size. Since it's just a heuristic
the user needs to be able to override it in the Control Panel. GTK3
is supposed to provide better scaling support (the 72/100
distinction currently in Sugar is a hack), so probably not going to
move forward for this release cycle.
3. Add font dpi schema (Jorge Saldivar)
Supposed to be used by sugar-settings-manager [11,12]; can probably
be dropped as even the latest DX2 releases didn't ship
sugar-settings-manager. See also the previous patch.
4. Change the method to add new actitivities in the activities list in
home view (Jorge Saldivar)
Workaround for #1660 [13]; I got stuck on a GTK issue [14] when
trying to fix it the right way.
5. Journal Volumes Backup and Restore (Martin Abente)
6. Journal XS backup and restore (Martin Abente)
7. Processdialog prerequisite check support (Martin Abente)
8. Journal Backup save lease (Martin Abente)
9. backup-translations.patch (unknown author)
Rejected upstream [30,31]. Design discussion still stuck in the Design
Team pipeline [15]. The code needs a lot of cleaning up.
Deployments seem to like the approach because it's integrated into
Sugar, rather than separate activities like Backup / Restore [25,26].
Long-term we should probably move to more transparent School Server
access, similar to the DataManager activity [27]. Unlike Tony [28,29]
I don't want to completely tie Sugar to a School Server, however.
Most individual users and even many schools don't have access to a
School Server.
10. accessibility_0001_cp_accessibility_keyboard.patch (unknown author)
11. accessibility_0002_magnifier_extension.patch (unknown author)
12. accessibility_0003_cp_accessibility_contrast.patch (unknown
