Update the built-in Scour Extension to 0.30
Bug #1411149 reported by
jazzynico
This bug affects 3 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Inkscape |
Fix Released
|
Low
|
Patrick Storz |
Bug Description
Follow-up to Bug #927290 Update the built-in Scour Extension to 0.26 .
The new Scour versions are available at:
https:/
https:/
Related branches
lp:~ede123/inkscape/scour
Rejected
for merging
into
lp:~inkscape.dev/inkscape/trunk
- jazzynico (community): Needs Fixing
-
Diff: 7928 lines (+4205/-3219)9 files modifiedshare/extensions/scour.inx (+89/-47)
share/extensions/scour.py (+26/-60)
share/extensions/scour/Makefile.am (+1/-1)
share/extensions/scour/__init__.py (+19/-0)
share/extensions/scour/scour.py (+3091/-3003)
share/extensions/scour/svg_regex.py (+43/-41)
share/extensions/scour/svg_transform.py (+40/-37)
share/extensions/scour/yocto_css.py (+28/-30)
share/extensions/six.py (+868/-0)
lp:~ede123/inkscape/scour2
- Mc: Approve (build)
- su_v (community): Approve (build)
-
Diff: 4198 lines (+140/-3962)10 files modifiedconfigure.ac (+0/-1)
share/extensions/CMakeLists.txt (+0/-3)
share/extensions/Makefile.am (+0/-1)
share/extensions/scour.inkscape.py (+53/-65)
share/extensions/scour.inx (+87/-50)
share/extensions/scour/Makefile.am (+0/-13)
share/extensions/scour/scour.py (+0/-3235)
share/extensions/scour/svg_regex.py (+0/-285)
share/extensions/scour/svg_transform.py (+0/-235)
share/extensions/scour/yocto_css.py (+0/-74)
description: | updated |
Changed in inkscape: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
Just a quick update:
I'm currently looking into this issue.
There are two and a half problems to solve:
* First and most important: Is Scour's Apache license (Version 2) compatible with Inkscape's GPL license (Version 2)? See also https:/ /github. com/codedread/ scour/issues/ 7 . In my opinion we should be fine though (see https:/ /github. com/codedread/ scour/issues/ 7#issuecomment- 158662122). Does anybody feel differently (or is there some substantial historical information on this potential license incompatibility)?
* Secondly: The latest version of Scour (https:/ /github. com/codedread/ scour) was updated to also support Python 3, partially by using the compatibility module "six" (https:/ /pypi.python. org/pypi/ six). We have to find a way to either a) include this module which might be difficult at this time or b) make Scour independent of "six" (sadly Scour's current maintainer Tobias Oberstein has declined my pull request for this, see https:/ /github. com/codedread/ scour/pull/ 12). Maybe we can include a local copy of the module in Inkscape?
* And the half problem: We have to check if the latest Scour still works with Python 2.6.5 (which we use on Windows). This is not much of a problem at all, though, since I'm determined to make the necessary adjustments myself, so basically we only have to resolve the other two problems.