lp:~valavanisalex/inkscape/fix-1156664

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~inkscape.dev/inkscape/trunk at revision 14480

Inkscape Developers: Pending requested 2015-11-12

Diff: 5061 lines (+276/-4099)

40 files modified

CMakeLists.txt (+0/-1)
CMakeScripts/DefineDependsandFlags.cmake (+11/-0)
CMakeScripts/Modules/FindPotrace.cmake (+62/-0)
configure.ac (+12/-0)
src/menus-skeleton.h (+9/-1)
src/shortcuts.cpp (+8/-1)
src/trace/CMakeLists.txt (+3/-17)
src/trace/Makefile_insert (+5/-16)
src/trace/potrace/auxiliary.h (+0/-80)
src/trace/potrace/bitmap.h (+9/-8)
src/trace/potrace/bitops.h (+0/-83)
src/trace/potrace/curve.cpp (+0/-108)
src/trace/potrace/curve.h (+0/-77)
src/trace/potrace/decompose.cpp (+0/-511)
src/trace/potrace/decompose.h (+0/-16)
src/trace/potrace/greymap.cpp (+0/-941)
src/trace/potrace/greymap.h (+0/-58)
src/trace/potrace/inkscape-potrace.cpp (+3/-4)
src/trace/potrace/inkscape-potrace.h (+1/-1)
src/trace/potrace/lists.h (+0/-285)
src/trace/potrace/potracelib.cpp (+0/-128)
src/trace/potrace/potracelib.h (+0/-139)
src/trace/potrace/progress.h (+0/-77)
src/trace/potrace/render.cpp (+0/-243)
src/trace/potrace/render.h (+0/-27)
src/trace/potrace/trace.cpp (+0/-1245)
src/trace/potrace/trace.h (+0/-15)
src/ui/CMakeLists.txt (+11/-4)
src/ui/dialog/Makefile_insert (+8/-2)
src/ui/dialog/dialog-manager.cpp (+13/-1)
src/ui/dialog/inkscape-preferences.cpp (+2/-0)
src/ui/dialog/inkscape-preferences.h (+8/-0)
src/ui/tool-factory.cpp (+7/-1)
src/ui/tools-switch.h (+8/-0)
src/ui/tools/Makefile_insert (+8/-2)
src/verbs.cpp (+41/-2)
src/verbs.h (+16/-0)
src/widgets/CMakeLists.txt (+9/-2)
src/widgets/Makefile_insert (+8/-2)
src/widgets/toolbox.cpp (+14/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1156664: Compile against external libpotrace

Low

Fix Released

Link a bug report

Related blueprints

14457. By Alex Valavanis on 2015-11-21

Add warning about missing Potrace to CMake build

14456. By Alex Valavanis on 2015-11-21

Hide unused verbs if Potrace is not available

14455. By Alex Valavanis on 2015-11-12

Fix CMake build

14454. By Alex Valavanis on 2015-11-12

Update cmake Potrace module to match style of others

14453. By Alex Valavanis on 2015-11-09

Enable builds without flood/trace on systems without Potrace

14452. By Alex Valavanis on 2015-11-09

Add CMake check for Potrace from OSP: http://goo.gl/AEzbkQ

14451. By Alex Valavanis on 2015-11-08

Update Potrace bitmap macros to upstream 1.13

14450. By Alex Valavanis on 2015-11-08

Use external Potrace

14449. By Alex Valavanis on 2015-11-07

Rebase on upstream libcroco 0.6.9 and backport minor fixes

14448. By Kris on 2015-11-06

static code analysis