Merge lp:~valavanisalex/ubuntu/precise/inkscape/fix-933188 into lp:ubuntu/precise/inkscape

Proposed by Alex Valavanis on 2012-02-16
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: not available
Proposed branch: lp:~valavanisalex/ubuntu/precise/inkscape/fix-933188
Merge into: lp:ubuntu/precise/inkscape
Diff against target: 34408 lines (+12230/-6844)
384 files modified
Info.plist (+3/-3)
Makefile.am (+34/-8)
Makefile.in (+214/-60)
aclocal.m4 (+123/-48)
build.xml (+3/-2)
compile (+183/-16)
config.h.in (+12/-6)
configure (+404/-361)
configure.ac (+53/-78)
debian/changelog (+21/-0)
debian/control (+2/-2)
debian/patches/00list (+0/-1)
debian/patches/02-add-shebangs-and-fix-permissions.dpatch (+0/-478)
depcomp (+66/-8)
doc/Makefile.in (+28/-15)
doc/keys.en.html (+199/-178)
doc/keys.fr.html (+199/-178)
doc/keys.ja.html (+202/-181)
inkscape.1 (+16/-78)
inkscape.el.1 (+829/-0)
inkscape.el.pod (+677/-0)
inkscape.fr.1 (+398/-411)
inkscape.fr.pod (+394/-322)
inkscape.ja.1 (+695/-0)
inkscape.sk.1 (+736/-0)
inkscape.sk.pod (+567/-0)
inkscape.spec (+1/-1)
inkscape.zh_TW.1 (+663/-0)
inkscape.zh_TW.pod (+492/-0)
install-sh (+18/-11)
missing (+4/-49)
mkinstalldirs (+72/-21)
packaging/macosx/Resources/bin/inkscape (+1/-0)
packaging/macosx/osx-app.sh (+30/-21)
po/Makefile.in.in (+9/-4)
po/POTFILES.in (+1/-0)
po/de.po (+3/-3)
po/fr.po (+32/-5)
share/Makefile.in (+28/-15)
share/clipart/Makefile.in (+35/-18)
share/examples/Makefile.in (+35/-18)
share/extensions/Barcode/Makefile.am (+2/-2)
share/extensions/Barcode/Makefile.in (+58/-56)
share/extensions/Makefile.am (+5/-4)
share/extensions/Makefile.in (+42/-28)
share/extensions/Poly3DObjects/Makefile.in (+35/-18)
share/extensions/alphabet_soup/Makefile.in (+35/-18)
share/extensions/color_blackandwhite.py (+2/-0)
share/extensions/color_brighter.py (+2/-0)
share/extensions/color_custom.py (+51/-20)
share/extensions/color_darker.py (+2/-0)
share/extensions/color_desaturate.py (+3/-1)
share/extensions/color_grayscale.py (+3/-1)
share/extensions/color_lesshue.py (+2/-0)
share/extensions/color_lesslight.py (+2/-0)
share/extensions/color_lesssaturation.py (+2/-0)
share/extensions/color_morehue.py (+2/-0)
share/extensions/color_morelight.py (+2/-0)
share/extensions/color_moresaturation.py (+2/-0)
share/extensions/color_negative.py (+3/-1)
share/extensions/color_randomize.py (+2/-0)
share/extensions/color_removeblue.py (+3/-1)
share/extensions/color_removegreen.py (+3/-1)
share/extensions/color_removered.py (+3/-1)
share/extensions/color_replace.py (+2/-0)
share/extensions/color_rgbbarrel.py (+3/-1)
share/extensions/convert2dashes.py (+3/-1)
share/extensions/cspsubdiv.py (+18/-22)
share/extensions/dxf_outlines.inx (+23/-5)
share/extensions/dxf_outlines.py (+44/-7)
share/extensions/gimp_xcf.py (+2/-2)
share/extensions/perspective.py (+8/-6)
share/extensions/render_barcode.py (+1/-0)
share/extensions/run_command.py (+2/-0)
share/extensions/simplestyle.py (+16/-6)
share/extensions/simpletransform.py (+50/-3)
share/extensions/summersnight.py (+8/-2)
share/extensions/test/Makefile.in (+28/-15)
share/extensions/text_braille.py (+2/-0)
share/extensions/text_flipcase.py (+2/-0)
share/extensions/text_lowercase.py (+2/-0)
share/extensions/text_randomcase.py (+2/-0)
share/extensions/text_replace.py (+2/-0)
share/extensions/text_sentencecase.py (+2/-0)
share/extensions/text_titlecase.py (+2/-0)
share/extensions/text_uppercase.py (+2/-0)
share/extensions/voronoi.py (+2/-1)
share/extensions/voronoi2svg.py (+362/-0)
share/extensions/xaml2svg/Makefile.in (+35/-18)
share/filters/Makefile.in (+35/-18)
share/fonts/Makefile.in (+35/-18)
share/gradients/Makefile.in (+35/-18)
share/icons/Makefile.in (+35/-18)
share/icons/application/16x16/Makefile.in (+35/-18)
share/icons/application/22x22/Makefile.in (+35/-18)
share/icons/application/24x24/Makefile.in (+35/-18)
share/icons/application/256x256/Makefile.in (+35/-18)
share/icons/application/32x32/Makefile.in (+35/-18)
share/icons/application/48x48/Makefile.in (+35/-18)
share/icons/application/Makefile.in (+28/-15)
share/keys/Makefile.in (+35/-18)
share/markers/Makefile.in (+35/-18)
share/markers/markers.svg (+117/-121)
share/palettes/Makefile.in (+35/-18)
share/patterns/Makefile.in (+35/-18)
share/screens/Makefile.in (+35/-18)
share/templates/Makefile.in (+35/-18)
share/tutorials/Makefile.in (+35/-18)
share/tutorials/tutorial-advanced.nl.svg (+235/-257)
share/tutorials/tutorial-basic.nl.svg (+227/-242)
share/tutorials/tutorial-elements.nl.svg (+164/-180)
share/tutorials/tutorial-interpolate.nl.svg (+81/-97)
share/tutorials/tutorial-shapes.nl.svg (+259/-274)
share/tutorials/tutorial-tips.nl.svg (+100/-116)
share/tutorials/tutorial-tracing.nl.svg (+55/-71)
share/ui/Makefile.in (+35/-18)
src/2geom/matrix.h (+1/-1)
src/2geom/path-intersection.cpp (+2/-2)
src/2geom/solve-bezier-parametric.cpp (+6/-6)
src/Makefile.in (+131/-122)
src/Makefile_insert (+1/-2)
src/application/application.h (+1/-1)
src/application/editor.h (+1/-1)
src/attributes.cpp (+0/-1)
src/attributes.h (+1/-2)
src/bind/javabind.cpp (+1/-1)
src/box3d.cpp (+5/-2)
src/cms-color-types.h (+100/-0)
src/cms-system.h (+60/-0)
src/color-profile-cms-fns.h (+53/-0)
src/color-profile-fns.h (+0/-64)
src/color-profile-test.h (+0/-1)
src/color-profile.cpp (+436/-200)
src/color-profile.h (+37/-36)
src/color-rgba.h (+1/-2)
src/conn-avoid-ref.h (+1/-1)
src/cxxtests.cpp (+4/-4)
src/debug/logger.cpp (+1/-1)
src/debug/simple-event.h (+0/-2)
src/debug/timestamp.cpp (+1/-2)
src/desktop-style.h (+1/-1)
src/dialogs/clonetiler.cpp (+1/-1)
src/dialogs/xml-tree.cpp (+1/-0)
src/dir-util.cpp (+1/-5)
src/dir-util.h (+1/-1)
src/display/canvas-arena.cpp (+8/-4)
src/display/canvas-axonomgrid.cpp (+6/-2)
src/display/canvas-bpath.h (+1/-1)
src/display/canvas-grid.cpp (+21/-1)
src/display/canvas-grid.h (+1/-0)
src/display/canvas-temporary-item.h (+1/-0)
src/display/curve.cpp (+1/-1)
src/display/curve.h (+1/-2)
src/display/gnome-canvas-acetate.h (+1/-1)
src/display/nr-3dutils.cpp (+1/-1)
src/display/nr-arena-glyphs.cpp (+5/-5)
src/display/nr-arena-group.cpp (+3/-3)
src/display/nr-arena-image.cpp (+2/-2)
src/display/nr-arena-item.cpp (+17/-4)
src/display/nr-arena-item.h (+4/-1)
src/display/nr-arena-shape.cpp (+10/-6)
src/display/nr-arena.h (+1/-1)
src/display/nr-filter-diffuselighting.cpp (+1/-1)
src/display/nr-filter-gaussian.cpp (+10/-10)
src/display/nr-filter-specularlighting.cpp (+1/-1)
src/display/nr-plain-stuff.cpp (+1/-1)
src/display/nr-plain-stuff.h (+1/-1)
src/display/sodipodi-ctrlrect.h (+1/-1)
src/display/sp-canvas.cpp (+15/-18)
src/display/sp-canvas.h (+8/-5)
src/document-subset.cpp (+1/-1)
src/document.cpp (+4/-3)
src/draw-anchor.h (+1/-1)
src/dyna-draw-context.cpp (+1/-1)
src/eraser-context.cpp (+1/-1)
src/event-context.cpp (+1/-1)
src/extension/implementation/script.cpp (+31/-13)
src/extension/internal/cairo-render-context.cpp (+1/-1)
src/extension/internal/cairo-renderer.cpp (+1/-1)
src/extension/internal/emf-win32-inout.cpp (+1/-1)
src/extension/internal/emf-win32-print.cpp (+55/-95)
src/extension/internal/filter/drop-shadow.h (+98/-94)
src/extension/internal/pdfinput/pdf-input.cpp (+2/-2)
src/extension/internal/pdfinput/svg-builder.h (+1/-1)
src/extension/internal/win32.cpp (+1/-1)
src/extract-uri.h (+1/-1)
src/file.cpp (+23/-2)
src/file.h (+1/-1)
src/filters/blend-fns.h (+1/-1)
src/filters/colormatrix-fns.h (+1/-1)
src/filters/componenttransfer-fns.h (+1/-1)
src/filters/composite-fns.h (+1/-1)
src/filters/convolvematrix-fns.h (+1/-1)
src/filters/diffuselighting-fns.h (+1/-1)
src/filters/displacementmap-fns.h (+1/-1)
src/filters/flood-fns.h (+1/-1)
src/filters/image-fns.h (+1/-1)
src/filters/merge-fns.h (+1/-1)
src/filters/morphology-fns.h (+1/-1)
src/filters/offset-fns.h (+1/-1)
src/filters/specularlighting-fns.h (+1/-1)
src/filters/tile-fns.h (+1/-1)
src/filters/turbulence-fns.h (+1/-1)
src/gc-anchored.h (+1/-1)
src/gc-core.h (+1/-1)
src/gc.cpp (+1/-1)
src/gradient-drag.h (+1/-1)
src/graphlayout.cpp (+4/-3)
src/help.h (+1/-1)
src/helper/gnome-utils.h (+1/-2)
src/helper/pixbuf-ops.cpp (+0/-1)
src/helper/pixbuf-ops.h (+1/-1)
src/helper/png-write.cpp (+1/-1)
src/helper/png-write.h (+1/-1)
src/helper/stlport.h (+1/-2)
src/helper/stock-items.h (+1/-1)
src/helper/unit-menu.h (+1/-1)
src/helper/units.h (+1/-3)
src/ige-mac-menu.c (+0/-915)
src/ige-mac-menu.h (+0/-43)
src/inkscape-version.cpp (+1/-1)
src/inkscape.h (+1/-1)
src/inkview.cpp (+1/-1)
src/interface.cpp (+0/-15)
src/io/ftos.cpp (+3/-1)
src/io/inkjar.cpp (+10/-8)
src/io/inkjar.h (+1/-2)
src/io/resource.cpp (+1/-4)
src/io/sys.cpp (+1/-4)
src/io/sys.h (+1/-3)
src/knot-holder-entity.h (+1/-1)
src/knotholder.h (+1/-1)
src/libcola/shortest_paths.cpp (+10/-8)
src/libcroco/cr-libxml-node-iface.h (+1/-1)
src/libcroco/cr-node-iface.h (+1/-2)
src/libgdl/gdl-dock-item.c (+5/-1)
src/libgdl/gdl-stock.h (+1/-1)
src/libgdl/gdl-switcher.c (+2/-0)
src/libnr/in-svg-plane-test.h (+1/-1)
src/libnr/nr-gradient.cpp (+1/-1)
src/libnr/nr-i-coord.h (+1/-1)
src/libnr/nr-matrix.h (+1/-2)
src/libnr/nr-object.cpp (+1/-1)
src/libnr/nr-object.h (+1/-1)
src/libnr/nr-pixblock-pattern.cpp (+1/-1)
src/libnr/nr-pixblock.cpp (+1/-1)
src/libnr/nr-point-fns-test.h (+1/-1)
src/libnr/nr-rotate-fns-test.h (+1/-1)
src/libnrtype/FontFactory.cpp (+1/-1)
src/libnrtype/FontInstance.cpp (+1/-1)
src/libnrtype/Layout-TNG-Output.cpp (+1/-1)
src/libnrtype/nr-type-primitives.cpp (+1/-1)
src/libnrtype/nr-type-primitives.h (+1/-1)
src/livarot/AlphaLigne.cpp (+1/-1)
src/livarot/BitLigne.cpp (+1/-1)
src/livarot/PathSimplify.cpp (+1/-1)
src/livarot/Shape.cpp (+1/-1)
src/livarot/ShapeSweep.cpp (+3/-1)
src/livarot/int-line.cpp (+1/-1)
src/livarot/sweep-event.cpp (+1/-1)
src/livarot/sweep-tree-list.cpp (+1/-1)
src/live_effects/parameter/array.h (+1/-1)
src/live_effects/parameter/bool.h (+1/-1)
src/live_effects/parameter/enum.h (+1/-1)
src/live_effects/parameter/path.h (+1/-1)
src/live_effects/parameter/point.h (+1/-1)
src/live_effects/parameter/text.h (+1/-1)
src/live_effects/parameter/vector.h (+1/-1)
src/main-cmdlineact.h (+1/-1)
src/main.cpp (+0/-1)
src/message-context.cpp (+1/-1)
src/message-stack.cpp (+1/-1)
src/modifier-fns.h (+1/-1)
src/object-hierarchy.h (+1/-1)
src/path-chemistry.cpp (+1/-1)
src/removeoverlap.h (+1/-1)
src/selection-chemistry.cpp (+16/-3)
src/sp-conn-end-pair.h (+1/-1)
src/sp-conn-end.h (+1/-1)
src/sp-filter-fns.h (+1/-1)
src/sp-gaussian-blur-fns.h (+1/-1)
src/sp-gradient-fns.h (+1/-1)
src/sp-gradient-vector.h (+1/-1)
src/sp-guide.cpp (+19/-15)
src/sp-image.cpp (+26/-18)
src/sp-image.h (+2/-2)
src/sp-linear-gradient-fns.h (+1/-1)
src/sp-metrics.h (+1/-2)
src/sp-namedview.cpp (+14/-5)
src/sp-namedview.h (+1/-0)
src/sp-object-repr.cpp (+1/-3)
src/sp-object.cpp (+2/-2)
src/sp-offset.cpp (+32/-15)
src/sp-radial-gradient.h (+1/-1)
src/sp-stop.h (+1/-1)
src/sp-text.h (+1/-1)
src/sp-textpath.h (+1/-1)
src/sp-tspan.h (+1/-1)
src/splivarot.cpp (+4/-6)
src/spray-context.cpp (+1/-1)
src/svg/css-ostringstream.cpp (+1/-2)
src/svg/css-ostringstream.h (+1/-1)
src/svg/stringstream.h (+1/-1)
src/svg/strip-trailing-zeros.cpp (+1/-1)
src/svg/svg-affine.cpp (+1/-1)
src/svg/svg-color.cpp (+14/-18)
src/svg/svg-color.h (+1/-1)
src/svg/svg-length.cpp (+1/-1)
src/svg/svg-length.h (+1/-1)
src/svg/svg-path-geom-test.h (+1/-1)
src/svg/svg-path.cpp (+0/-3)
src/svg/svg.h (+1/-1)
src/text-editing.h (+1/-1)
src/text-tag-attributes.h (+1/-1)
src/trace/imagemap.cpp (+7/-1)
src/trace/potrace/potracelib.cpp (+1/-1)
src/tweak-context.cpp (+1/-1)
src/ui/cache/svg_preview_cache.cpp (+1/-1)
src/ui/clipboard.cpp (+1/-3)
src/ui/dialog/desktop-tracker.h (+1/-1)
src/ui/dialog/dialog-manager.h (+1/-1)
src/ui/dialog/document-properties.cpp (+59/-78)
src/ui/dialog/document-properties.h (+7/-6)
src/ui/dialog/filedialogimpl-win32.cpp (+12/-1)
src/ui/dialog/glyphs.cpp (+1/-1)
src/ui/dialog/icon-preview.cpp (+1/-1)
src/ui/dialog/inkscape-preferences.cpp (+33/-18)
src/ui/dialog/input.cpp (+4/-2)
src/ui/dialog/layers.cpp (+7/-0)
src/ui/dialog/livepatheffect-editor.cpp (+1/-0)
src/ui/dialog/messages.cpp (+34/-8)
src/ui/dialog/messages.h (+7/-2)
src/ui/tool/control-point-selection.cpp (+1/-1)
src/ui/tool/control-point-selection.h (+1/-1)
src/ui/tool/control-point.cpp (+53/-8)
src/ui/tool/control-point.h (+3/-2)
src/ui/tool/curve-drag-point.cpp (+16/-3)
src/ui/tool/curve-drag-point.h (+2/-1)
src/ui/tool/manipulator.h (+4/-3)
src/ui/tool/multi-path-manipulator.cpp (+2/-2)
src/ui/tool/multi-path-manipulator.h (+1/-1)
src/ui/tool/node-tool.cpp (+3/-3)
src/ui/tool/node.cpp (+13/-10)
src/ui/tool/node.h (+2/-2)
src/ui/tool/path-manipulator.cpp (+1/-1)
src/ui/tool/path-manipulator.h (+1/-1)
src/ui/tool/selector.cpp (+7/-7)
src/ui/tool/selector.h (+1/-1)
src/ui/tool/transform-handle-set.cpp (+1/-1)
src/ui/tool/transform-handle-set.h (+1/-1)
src/ui/widget/dock-item.cpp (+2/-2)
src/ui/widget/icon-widget.cpp (+1/-1)
src/ui/widget/spin-slider.cpp (+1/-1)
src/unclump.h (+1/-1)
src/uri.h (+1/-1)
src/util/glib-list-iterators.h (+1/-2)
src/util/share.cpp (+1/-1)
src/version.cpp (+1/-1)
src/version.h (+1/-1)
src/widgets/desktop-widget.cpp (+39/-34)
src/widgets/icon.cpp (+1/-1)
src/widgets/sp-color-icc-selector.cpp (+107/-64)
src/widgets/sp-color-icc-selector.h (+8/-10)
src/widgets/sp-color-notebook.cpp (+18/-22)
src/widgets/sp-color-notebook.h (+2/-2)
src/widgets/sp-color-scales.h (+1/-1)
src/widgets/sp-color-wheel-selector.h (+1/-1)
src/widgets/spinbutton-events.h (+1/-1)
src/widgets/spw-utilities.h (+2/-3)
src/widgets/stroke-style.cpp (+1/-1)
src/xml/attribute-record.h (+1/-2)
src/xml/comment-node.h (+1/-1)
src/xml/croco-node-iface.cpp (+1/-1)
src/xml/event.h (+1/-2)
src/xml/node-event-vector.h (+1/-1)
src/xml/node-observer.h (+1/-1)
src/xml/node.h (+1/-1)
src/xml/pi-node.h (+1/-1)
src/xml/quote.cpp (+1/-1)
src/xml/rebase-hrefs.cpp (+1/-3)
src/xml/rebase-hrefs.h (+1/-1)
src/xml/repr.h (+1/-1)
src/xml/simple-node.cpp (+1/-1)
src/xml/text-node.h (+1/-1)
To merge this branch: bzr merge lp:~valavanisalex/ubuntu/precise/inkscape/fix-933188
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-02-16 Pending
Review via email: mp+93424@code.launchpad.net

Description of the change

Merged latest upstream release that fixes a huge number of bugs. The ones that have been reported against the Ubuntu package have all been listed in debian/changelog.

I have dropped the versioned build-dependency on libwpd/libwpg because upstream Inkscape now happily builds against all versions supported by Ubuntu. Eventually, we will want to backport this to earlier versions of Ubuntu, so it makes sense to get rid of the build-dependency now so as to avoid needing a source-change backport later.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Info.plist'
2--- Info.plist 2011-07-10 11:35:30 +0000
3+++ Info.plist 2012-02-16 15:09:34 +0000
4@@ -7,7 +7,7 @@
5 <key>CFBundleExecutable</key>
6 <string>Inkscape</string>
7 <key>CFBundleGetInfoString</key>
8- <string>0.48.2, Copyright 2003-2009 Inkscape Developers</string>
9+ <string>0.48.3, Copyright 2003-2009 Inkscape Developers</string>
10 <key>CFBundleIconFile</key>
11 <string>Inkscape.icns</string>
12 <key>CFBundleIdentifier</key>
13@@ -323,11 +323,11 @@
14 <key>CFBundlePackageType</key>
15 <string>APPL</string>
16 <key>CFBundleShortVersionString</key>
17- <string>0.48.2</string>
18+ <string>0.48.3</string>
19 <key>CFBundleSignature</key>
20 <string>Inks</string>
21 <key>CFBundleVersion</key>
22- <string>0.48.2</string>
23+ <string>0.48.3</string>
24 <key>NSHumanReadableCopyright</key>
25 <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>
26 <key>LSMinimumSystemVersion</key>
27
28=== modified file 'Makefile.am'
29--- Makefile.am 2011-02-20 12:07:30 +0000
30+++ Makefile.am 2012-02-16 15:09:34 +0000
31@@ -16,9 +16,16 @@
32 ## cp $(srcdir)/AUTHORS $(distdir)
33 ## cp $(srcdir)/NEWS $(distdir)
34
35+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
36
37-man_MANS = inkscape.1 \
38- inkview.1
39+man_MANS = \
40+ inkscape.1 \
41+ inkscape.el.1 \
42+ inkscape.fr.1 \
43+ inkscape.ja.1 \
44+ inkscape.sk.1 \
45+ inkscape.zh_TW.1 \
46+ inkview.1
47
48 EXTRA_DIST = \
49 acinclude.m4 \
50@@ -31,9 +38,16 @@
51 po/check-markup \
52 utf8-to-roff \
53 inkscape.1 \
54+ inkscape.el.1 \
55 inkscape.fr.1 \
56+ inkscape.ja.1 \
57+ inkscape.sk.1 \
58+ inkscape.zh_TW.1 \
59 inkscape.pod \
60+ inkscape.el.pod \
61 inkscape.fr.pod \
62+ inkscape.sk.pod \
63+ inkscape.zh_TW.pod \
64 inkscape.spec.in \
65 inkscape.spec \
66 Info.plist.in \
67@@ -224,25 +238,37 @@
68 #ACLOCAL_AMFLAGS = -I m4
69
70 SUFFIXES = .pod .1
71-inkscape.1 inkscape.fr.1: fix-roff-punct Makefile.am AUTHORS utf8-to-roff
72+inkscape.1 inkscape.el.1 inkscape.fr.1 inkscape.ja.1 inkscape.sk.1 inkscape.zh_TW.1 : fix-roff-punct Makefile.am AUTHORS
73 .pod.1:
74 set -e; \
75 d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
76- pod2man $< \
77+ pod2man --utf8 $< \
78 | sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
79 | perl -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
80 | perl $(srcdir)/fix-roff-punct \
81- | perl -CI $(srcdir)/utf8-to-roff \
82 > tmp.$$$$ \
83 && mv -f tmp.$$$$ $@
84+# ut8-to-roff removed (groff now supports utf8).
85+# | perl -CI $(srcdir)/utf8-to-roff \
86 # man 7 groff_char for further remarks on charset encoding for man pages.
87
88 po/inkscape.pot:
89 (cd $(srcdir)/po ; intltool-update --pot --output-file=$(distdir)/po/inkscape.pot)
90
91-install-data-local: inkscape.fr.1
92- $(mkinstalldirs) $(DESTDIR)$(mandir)/fr/man1
93- $(INSTALL_DATA) `if [ -f inkscape.fr.1 ]; then :; else echo $(srcdir)/;fi`inkscape.fr.1 $(DESTDIR)$(mandir)/fr/man1/inkscape.1
94+manel_DATA = inkscape.el.1
95+maneldir = $(mandir)/el/man1
96+
97+manfr_DATA = inkscape.fr.1
98+manfrdir = $(mandir)/fr/man1
99+
100+manja_DATA = inkscape.ja.1
101+manjadir = $(mandir)/ja/man1
102+
103+mansk_DATA = inkscape.ja.1
104+manskdir = $(mandir)/sk/man1
105+
106+manzhtw_DATA = inkscape.zh_TW.1
107+manzhtwdir = $(mandir)/zh_TW/man1
108
109 #.PHONY: warn_markup
110 noinst_DATA = warn_markup
111
112=== modified file 'Makefile.in'
113--- Makefile.in 2011-07-10 11:35:30 +0000
114+++ Makefile.in 2012-02-16 15:09:34 +0000
115@@ -1,9 +1,9 @@
116-# Makefile.in generated by automake 1.11.1 from Makefile.am.
117+# Makefile.in generated by automake 1.11.3 from Makefile.am.
118 # @configure_input@
119
120 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
121-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
122-# Inc.
123+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
124+# Foundation, Inc.
125 # This Makefile.in is free software; the Free Software Foundation
126 # gives unlimited permission to copy and/or distribute it,
127 # with or without modifications, as long as this notice is preserved.
128@@ -105,11 +105,11 @@
129 packaging/autopackage/default.apspec inkscape.spec Info.plist \
130 inkview.1
131 CONFIG_CLEAN_VPATH_FILES =
132-AM_V_GEN = $(am__v_GEN_$(V))
133-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
134+AM_V_GEN = $(am__v_GEN_@AM_V@)
135+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
136 am__v_GEN_0 = @echo " GEN " $@;
137-AM_V_at = $(am__v_at_$(V))
138-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
139+AM_V_at = $(am__v_at_@AM_V@)
140+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
141 am__v_at_0 = @
142 SOURCES =
143 DIST_SOURCES =
144@@ -141,11 +141,21 @@
145 am__base_list = \
146 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
147 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
148+am__uninstall_files_from_dir = { \
149+ test -z "$$files" \
150+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
151+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
152+ $(am__cd) "$$dir" && rm -f $$files; }; \
153+ }
154 man1dir = $(mandir)/man1
155-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Graphicsdir)"
156+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Graphicsdir)" \
157+ "$(DESTDIR)$(maneldir)" "$(DESTDIR)$(manfrdir)" \
158+ "$(DESTDIR)$(manjadir)" "$(DESTDIR)$(manskdir)" \
159+ "$(DESTDIR)$(manzhtwdir)"
160 NROFF = nroff
161 MANS = $(man_MANS)
162-DATA = $(Graphics_DATA) $(noinst_DATA)
163+DATA = $(Graphics_DATA) $(manel_DATA) $(manfr_DATA) $(manja_DATA) \
164+ $(mansk_DATA) $(manzhtw_DATA) $(noinst_DATA)
165 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
166 distclean-recursive maintainer-clean-recursive
167 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
168@@ -158,9 +168,11 @@
169 distdir = $(PACKAGE)-$(VERSION)
170 top_distdir = $(distdir)
171 am__remove_distdir = \
172- { test ! -d "$(distdir)" \
173- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
174- && rm -fr "$(distdir)"; }; }
175+ if test -d "$(distdir)"; then \
176+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
177+ && rm -rf "$(distdir)" \
178+ || { sleep 5 && rm -rf "$(distdir)"; }; \
179+ else :; fi
180 am__relativize = \
181 dir0=`pwd`; \
182 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
183@@ -189,6 +201,8 @@
184 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
185 GZIP_ENV = --best
186 distuninstallcheck_listfiles = find . -type f -print
187+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
188+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
189 distcleancheck_listfiles = find . -type f -print
190 ACLOCAL = @ACLOCAL@
191 ALL_LINGUAS = @ALL_LINGUAS@
192@@ -236,6 +250,10 @@
193 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
194 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
195 GREP = @GREP@
196+GTKMM_2_22_CFLAGS = @GTKMM_2_22_CFLAGS@
197+GTKMM_2_22_LIBS = @GTKMM_2_22_LIBS@
198+GTKMM_2_24_CFLAGS = @GTKMM_2_24_CFLAGS@
199+GTKMM_2_24_LIBS = @GTKMM_2_24_LIBS@
200 IMAGEMAGICK_CFLAGS = @IMAGEMAGICK_CFLAGS@
201 IMAGEMAGICK_LIBS = @IMAGEMAGICK_LIBS@
202 INKBOARD_CFLAGS = @INKBOARD_CFLAGS@
203@@ -254,6 +272,12 @@
204 INTLTOOL_MERGE = @INTLTOOL_MERGE@
205 INTLTOOL_PERL = @INTLTOOL_PERL@
206 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
207+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
208+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
209+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
210+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
211+LCMS2_CFLAGS = @LCMS2_CFLAGS@
212+LCMS2_LIBS = @LCMS2_LIBS@
213 LCMS_CFLAGS = @LCMS_CFLAGS@
214 LCMS_LIBS = @LCMS_LIBS@
215 LDFLAGS = @LDFLAGS@
216@@ -281,8 +305,6 @@
217 PACKAGE_TARNAME = @PACKAGE_TARNAME@
218 PACKAGE_URL = @PACKAGE_URL@
219 PACKAGE_VERSION = @PACKAGE_VERSION@
220-PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
221-PANGOFT2_LIBS = @PANGOFT2_LIBS@
222 PATH_SEPARATOR = @PATH_SEPARATOR@
223 PERL_CFLAGS = @PERL_CFLAGS@
224 PERL_LIBS = @PERL_LIBS@
225@@ -311,8 +333,6 @@
226 USE_NLS = @USE_NLS@
227 VERSION = @VERSION@
228 WIN32_CFLAGS = @WIN32_CFLAGS@
229-XFT_CFLAGS = @XFT_CFLAGS@
230-XFT_LIBS = @XFT_LIBS@
231 XGETTEXT = @XGETTEXT@
232 abs_builddir = @abs_builddir@
233 abs_srcdir = @abs_srcdir@
234@@ -346,6 +366,8 @@
235 includedir = @includedir@
236 infodir = @infodir@
237 install_sh = @install_sh@
238+intltool__v_merge_options_ = @intltool__v_merge_options_@
239+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
240 libdir = @libdir@
241 libexecdir = @libexecdir@
242 localedir = @localedir@
243@@ -370,8 +392,15 @@
244 Graphicsdir = $(datadir)/applications
245 Graphics_in_files = inkscape.desktop.in
246 Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop)
247-man_MANS = inkscape.1 \
248- inkview.1
249+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
250+man_MANS = \
251+ inkscape.1 \
252+ inkscape.el.1 \
253+ inkscape.fr.1 \
254+ inkscape.ja.1 \
255+ inkscape.sk.1 \
256+ inkscape.zh_TW.1 \
257+ inkview.1
258
259 EXTRA_DIST = \
260 acinclude.m4 \
261@@ -384,9 +413,16 @@
262 po/check-markup \
263 utf8-to-roff \
264 inkscape.1 \
265+ inkscape.el.1 \
266 inkscape.fr.1 \
267+ inkscape.ja.1 \
268+ inkscape.sk.1 \
269+ inkscape.zh_TW.1 \
270 inkscape.pod \
271+ inkscape.el.pod \
272 inkscape.fr.pod \
273+ inkscape.sk.pod \
274+ inkscape.zh_TW.pod \
275 inkscape.spec.in \
276 inkscape.spec \
277 Info.plist.in \
278@@ -577,6 +613,16 @@
279
280 #ACLOCAL_AMFLAGS = -I m4
281 SUFFIXES = .pod .1
282+manel_DATA = inkscape.el.1
283+maneldir = $(mandir)/el/man1
284+manfr_DATA = inkscape.fr.1
285+manfrdir = $(mandir)/fr/man1
286+manja_DATA = inkscape.ja.1
287+manjadir = $(mandir)/ja/man1
288+mansk_DATA = inkscape.ja.1
289+manskdir = $(mandir)/sk/man1
290+manzhtw_DATA = inkscape.zh_TW.1
291+manzhtwdir = $(mandir)/zh_TW/man1
292
293 #.PHONY: warn_markup
294 noinst_DATA = warn_markup
295@@ -586,7 +632,7 @@
296
297 .SUFFIXES:
298 .SUFFIXES: .pod .1
299-am--refresh:
300+am--refresh: Makefile
301 @:
302 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
303 @for dep in $?; do \
304@@ -622,10 +668,8 @@
305 $(am__aclocal_m4_deps):
306
307 config.h: stamp-h1
308- @if test ! -f $@; then \
309- rm -f stamp-h1; \
310- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
311- else :; fi
312+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
313+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
314
315 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
316 @rm -f stamp-h1
317@@ -748,9 +792,7 @@
318 sed -n '/\.1[a-z]*$$/p'; \
319 } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
320 -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
321- test -z "$$files" || { \
322- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
323- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
324+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
325 install-GraphicsDATA: $(Graphics_DATA)
326 @$(NORMAL_INSTALL)
327 test -z "$(Graphicsdir)" || $(MKDIR_P) "$(DESTDIR)$(Graphicsdir)"
328@@ -768,9 +810,97 @@
329 @$(NORMAL_UNINSTALL)
330 @list='$(Graphics_DATA)'; test -n "$(Graphicsdir)" || list=; \
331 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
332- test -n "$$files" || exit 0; \
333- echo " ( cd '$(DESTDIR)$(Graphicsdir)' && rm -f" $$files ")"; \
334- cd "$(DESTDIR)$(Graphicsdir)" && rm -f $$files
335+ dir='$(DESTDIR)$(Graphicsdir)'; $(am__uninstall_files_from_dir)
336+install-manelDATA: $(manel_DATA)
337+ @$(NORMAL_INSTALL)
338+ test -z "$(maneldir)" || $(MKDIR_P) "$(DESTDIR)$(maneldir)"
339+ @list='$(manel_DATA)'; test -n "$(maneldir)" || list=; \
340+ for p in $$list; do \
341+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
342+ echo "$$d$$p"; \
343+ done | $(am__base_list) | \
344+ while read files; do \
345+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(maneldir)'"; \
346+ $(INSTALL_DATA) $$files "$(DESTDIR)$(maneldir)" || exit $$?; \
347+ done
348+
349+uninstall-manelDATA:
350+ @$(NORMAL_UNINSTALL)
351+ @list='$(manel_DATA)'; test -n "$(maneldir)" || list=; \
352+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
353+ dir='$(DESTDIR)$(maneldir)'; $(am__uninstall_files_from_dir)
354+install-manfrDATA: $(manfr_DATA)
355+ @$(NORMAL_INSTALL)
356+ test -z "$(manfrdir)" || $(MKDIR_P) "$(DESTDIR)$(manfrdir)"
357+ @list='$(manfr_DATA)'; test -n "$(manfrdir)" || list=; \
358+ for p in $$list; do \
359+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
360+ echo "$$d$$p"; \
361+ done | $(am__base_list) | \
362+ while read files; do \
363+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(manfrdir)'"; \
364+ $(INSTALL_DATA) $$files "$(DESTDIR)$(manfrdir)" || exit $$?; \
365+ done
366+
367+uninstall-manfrDATA:
368+ @$(NORMAL_UNINSTALL)
369+ @list='$(manfr_DATA)'; test -n "$(manfrdir)" || list=; \
370+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
371+ dir='$(DESTDIR)$(manfrdir)'; $(am__uninstall_files_from_dir)
372+install-manjaDATA: $(manja_DATA)
373+ @$(NORMAL_INSTALL)
374+ test -z "$(manjadir)" || $(MKDIR_P) "$(DESTDIR)$(manjadir)"
375+ @list='$(manja_DATA)'; test -n "$(manjadir)" || list=; \
376+ for p in $$list; do \
377+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
378+ echo "$$d$$p"; \
379+ done | $(am__base_list) | \
380+ while read files; do \
381+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(manjadir)'"; \
382+ $(INSTALL_DATA) $$files "$(DESTDIR)$(manjadir)" || exit $$?; \
383+ done
384+
385+uninstall-manjaDATA:
386+ @$(NORMAL_UNINSTALL)
387+ @list='$(manja_DATA)'; test -n "$(manjadir)" || list=; \
388+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
389+ dir='$(DESTDIR)$(manjadir)'; $(am__uninstall_files_from_dir)
390+install-manskDATA: $(mansk_DATA)
391+ @$(NORMAL_INSTALL)
392+ test -z "$(manskdir)" || $(MKDIR_P) "$(DESTDIR)$(manskdir)"
393+ @list='$(mansk_DATA)'; test -n "$(manskdir)" || list=; \
394+ for p in $$list; do \
395+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
396+ echo "$$d$$p"; \
397+ done | $(am__base_list) | \
398+ while read files; do \
399+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(manskdir)'"; \
400+ $(INSTALL_DATA) $$files "$(DESTDIR)$(manskdir)" || exit $$?; \
401+ done
402+
403+uninstall-manskDATA:
404+ @$(NORMAL_UNINSTALL)
405+ @list='$(mansk_DATA)'; test -n "$(manskdir)" || list=; \
406+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
407+ dir='$(DESTDIR)$(manskdir)'; $(am__uninstall_files_from_dir)
408+install-manzhtwDATA: $(manzhtw_DATA)
409+ @$(NORMAL_INSTALL)
410+ test -z "$(manzhtwdir)" || $(MKDIR_P) "$(DESTDIR)$(manzhtwdir)"
411+ @list='$(manzhtw_DATA)'; test -n "$(manzhtwdir)" || list=; \
412+ for p in $$list; do \
413+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
414+ echo "$$d$$p"; \
415+ done | $(am__base_list) | \
416+ while read files; do \
417+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(manzhtwdir)'"; \
418+ $(INSTALL_DATA) $$files "$(DESTDIR)$(manzhtwdir)" || exit $$?; \
419+ done
420+
421+uninstall-manzhtwDATA:
422+ @$(NORMAL_UNINSTALL)
423+ @list='$(manzhtw_DATA)'; test -n "$(manzhtwdir)" || list=; \
424+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
425+ dir='$(DESTDIR)$(manzhtwdir)'; $(am__uninstall_files_from_dir)
426
427 # This directory's subdirectories are mostly independent; you can cd
428 # into them and run `make' without going through this Makefile.
429@@ -991,7 +1121,11 @@
430 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
431 $(am__remove_distdir)
432 dist-bzip2: distdir
433- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
434+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
435+ $(am__remove_distdir)
436+
437+dist-lzip: distdir
438+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
439 $(am__remove_distdir)
440
441 dist-lzma: distdir
442@@ -999,7 +1133,7 @@
443 $(am__remove_distdir)
444
445 dist-xz: distdir
446- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
447+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
448 $(am__remove_distdir)
449
450 dist-tarZ: distdir
451@@ -1016,7 +1150,7 @@
452
453 dist dist-all: distdir
454 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
455- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
456+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
457 -rm -f $(distdir).zip
458 zip -rq $(distdir).zip $(distdir)
459 $(am__remove_distdir)
460@@ -1032,6 +1166,8 @@
461 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
462 *.tar.lzma*) \
463 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
464+ *.tar.lz*) \
465+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
466 *.tar.xz*) \
467 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
468 *.tar.Z*) \
469@@ -1052,6 +1188,7 @@
470 && am__cwd=`pwd` \
471 && $(am__cd) $(distdir)/_build \
472 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
473+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
474 $(DISTCHECK_CONFIGURE_FLAGS) \
475 && $(MAKE) $(AM_MAKEFLAGS) \
476 && $(MAKE) $(AM_MAKEFLAGS) dvi \
477@@ -1080,8 +1217,16 @@
478 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
479 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
480 distuninstallcheck:
481- @$(am__cd) '$(distuninstallcheck_dir)' \
482- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
483+ @test -n '$(distuninstallcheck_dir)' || { \
484+ echo 'ERROR: trying to run $@ with an empty' \
485+ '$$(distuninstallcheck_dir)' >&2; \
486+ exit 1; \
487+ }; \
488+ $(am__cd) '$(distuninstallcheck_dir)' || { \
489+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
490+ exit 1; \
491+ }; \
492+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
493 || { echo "ERROR: files left after uninstall:" ; \
494 if test -n "$(DESTDIR)"; then \
495 echo " (check DESTDIR support)"; \
496@@ -1103,7 +1248,7 @@
497 all-am: Makefile $(MANS) $(DATA) config.h
498 installdirs: installdirs-recursive
499 installdirs-am:
500- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Graphicsdir)"; do \
501+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(Graphicsdir)" "$(DESTDIR)$(maneldir)" "$(DESTDIR)$(manfrdir)" "$(DESTDIR)$(manjadir)" "$(DESTDIR)$(manskdir)" "$(DESTDIR)$(manzhtwdir)"; do \
502 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
503 done
504 install: install-recursive
505@@ -1116,10 +1261,15 @@
506
507 installcheck: installcheck-recursive
508 install-strip:
509- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
510- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
511- `test -z '$(STRIP)' || \
512- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
513+ if test -z '$(STRIP)'; then \
514+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
515+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
516+ install; \
517+ else \
518+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
519+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
520+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
521+ fi
522 mostlyclean-generic:
523
524 clean-generic:
525@@ -1153,7 +1303,9 @@
526
527 info-am:
528
529-install-data-am: install-GraphicsDATA install-data-local install-man
530+install-data-am: install-GraphicsDATA install-man install-manelDATA \
531+ install-manfrDATA install-manjaDATA install-manskDATA \
532+ install-manzhtwDATA
533
534 install-dvi: install-dvi-recursive
535
536@@ -1199,7 +1351,9 @@
537
538 ps-am:
539
540-uninstall-am: uninstall-GraphicsDATA uninstall-man
541+uninstall-am: uninstall-GraphicsDATA uninstall-man uninstall-manelDATA \
542+ uninstall-manfrDATA uninstall-manjaDATA uninstall-manskDATA \
543+ uninstall-manzhtwDATA
544
545 uninstall-man: uninstall-man1
546
547@@ -1209,41 +1363,41 @@
548 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
549 all all-am am--refresh check check-am clean clean-generic \
550 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
551- dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
552- distclean distclean-generic distclean-hdr distclean-tags \
553- distcleancheck distdir distuninstallcheck dvi dvi-am html \
554- html-am info info-am install install-GraphicsDATA install-am \
555- install-data install-data-am install-data-local install-dvi \
556+ dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
557+ distcheck distclean distclean-generic distclean-hdr \
558+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
559+ dvi-am html html-am info info-am install install-GraphicsDATA \
560+ install-am install-data install-data-am install-dvi \
561 install-dvi-am install-exec install-exec-am install-html \
562 install-html-am install-info install-info-am install-man \
563- install-man1 install-pdf install-pdf-am install-ps \
564- install-ps-am install-strip installcheck installcheck-am \
565- installdirs installdirs-am maintainer-clean \
566- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
567- pdf-am ps ps-am tags tags-recursive uninstall \
568- uninstall-GraphicsDATA uninstall-am uninstall-man \
569- uninstall-man1
570+ install-man1 install-manelDATA install-manfrDATA \
571+ install-manjaDATA install-manskDATA install-manzhtwDATA \
572+ install-pdf install-pdf-am install-ps install-ps-am \
573+ install-strip installcheck installcheck-am installdirs \
574+ installdirs-am maintainer-clean maintainer-clean-generic \
575+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
576+ tags-recursive uninstall uninstall-GraphicsDATA uninstall-am \
577+ uninstall-man uninstall-man1 uninstall-manelDATA \
578+ uninstall-manfrDATA uninstall-manjaDATA uninstall-manskDATA \
579+ uninstall-manzhtwDATA
580
581 @INTLTOOL_DESKTOP_RULE@
582-inkscape.1 inkscape.fr.1: fix-roff-punct Makefile.am AUTHORS utf8-to-roff
583+inkscape.1 inkscape.el.1 inkscape.fr.1 inkscape.ja.1 inkscape.sk.1 inkscape.zh_TW.1 : fix-roff-punct Makefile.am AUTHORS
584 .pod.1:
585 set -e; \
586 d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
587- pod2man $< \
588+ pod2man --utf8 $< \
589 | sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
590 | perl -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
591 | perl $(srcdir)/fix-roff-punct \
592- | perl -CI $(srcdir)/utf8-to-roff \
593 > tmp.$$$$ \
594 && mv -f tmp.$$$$ $@
595+# ut8-to-roff removed (groff now supports utf8).
596+# | perl -CI $(srcdir)/utf8-to-roff \
597 # man 7 groff_char for further remarks on charset encoding for man pages.
598
599 po/inkscape.pot:
600 (cd $(srcdir)/po ; intltool-update --pot --output-file=$(distdir)/po/inkscape.pot)
601-
602-install-data-local: inkscape.fr.1
603- $(mkinstalldirs) $(DESTDIR)$(mandir)/fr/man1
604- $(INSTALL_DATA) `if [ -f inkscape.fr.1 ]; then :; else echo $(srcdir)/;fi`inkscape.fr.1 $(DESTDIR)$(mandir)/fr/man1/inkscape.1
605 warn_markup:
606 @if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
607 echo "WARNING: Bad markup found in translations. Please consider fixing the above problems." >&2; \
608
609=== modified file 'aclocal.m4'
610--- aclocal.m4 2011-07-10 11:35:30 +0000
611+++ aclocal.m4 2012-02-16 15:09:34 +0000
612@@ -1,7 +1,8 @@
613-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
614+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
615
616 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
617-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
618+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
619+# Inc.
620 # This file is free software; the Free Software Foundation
621 # gives unlimited permission to copy and/or distribute it,
622 # with or without modifications, as long as this notice is preserved.
623@@ -260,6 +261,10 @@
624 [CATOBJEXT=.mo
625 DATADIRNAME=lib])
626 ;;
627+ *-*-openbsd*)
628+ CATOBJEXT=.mo
629+ DATADIRNAME=share
630+ ;;
631 *)
632 CATOBJEXT=.mo
633 DATADIRNAME=lib
634@@ -454,7 +459,7 @@
635
636
637 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
638-# serial 40 IT_PROG_INTLTOOL
639+# serial 41 IT_PROG_INTLTOOL
640 AC_DEFUN([IT_PROG_INTLTOOL], [
641 AC_PREREQ([2.50])dnl
642 AC_REQUIRE([AM_NLS])dnl
643@@ -486,25 +491,44 @@
644 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
645 fi
646
647- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
648-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
649- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
650- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
651- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
652- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
653- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
654- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
655-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
656- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
657- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
658- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
659- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
660- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
661- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
662- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
663- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
664- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
665- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
666+if test -z "$AM_DEFAULT_VERBOSITY"; then
667+ AM_DEFAULT_VERBOSITY=1
668+fi
669+AC_SUBST([AM_DEFAULT_VERBOSITY])
670+
671+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
672+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
673+INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
674+AC_SUBST(INTLTOOL_V_MERGE)
675+AC_SUBST(INTLTOOL__v_MERGE_)
676+AC_SUBST(INTLTOOL__v_MERGE_0)
677+
678+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
679+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
680+intltool__v_merge_options_0='-q'
681+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
682+AC_SUBST(intltool__v_merge_options_)
683+AC_SUBST(intltool__v_merge_options_0)
684+
685+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
686+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
687+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
688+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
689+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
690+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
691+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
692+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
693+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
694+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
695+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
696+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
697+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
698+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
699+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
700+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
701+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
702+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
703+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
704
705 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
706 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
707@@ -550,7 +574,7 @@
708 if test $? -ne 0; then
709 AC_MSG_ERROR([perl 5.8.1 is required for intltool])
710 else
711- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
712+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
713 AC_MSG_RESULT([$IT_PERL_VERSION])
714 fi
715 if test "x$2" != "xno-xml"; then
716@@ -839,12 +863,15 @@
717 fi[]dnl
718 ])# PKG_CHECK_MODULES
719
720-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
721+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
722+# Foundation, Inc.
723 #
724 # This file is free software; the Free Software Foundation
725 # gives unlimited permission to copy and/or distribute it,
726 # with or without modifications, as long as this notice is preserved.
727
728+# serial 1
729+
730 # AM_AUTOMAKE_VERSION(VERSION)
731 # ----------------------------
732 # Automake X.Y traces this macro to ensure aclocal.m4 has been
733@@ -854,7 +881,7 @@
734 [am__api_version='1.11'
735 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
736 dnl require some minimum version. Point them to the right macro.
737-m4_if([$1], [1.11.1], [],
738+m4_if([$1], [1.11.3], [],
739 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
740 ])
741
742@@ -870,7 +897,7 @@
743 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
744 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
745 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
746-[AM_AUTOMAKE_VERSION([1.11.1])dnl
747+[AM_AUTOMAKE_VERSION([1.11.3])dnl
748 m4_ifndef([AC_AUTOCONF_VERSION],
749 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
750 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
751@@ -899,12 +926,14 @@
752
753 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
754
755-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
756+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
757 #
758 # This file is free software; the Free Software Foundation
759 # gives unlimited permission to copy and/or distribute it,
760 # with or without modifications, as long as this notice is preserved.
761
762+# serial 1
763+
764 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
765 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
766 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
767@@ -1009,14 +1038,14 @@
768 Usually this means the macro was only invoked conditionally.]])
769 fi])])
770
771-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
772-# Free Software Foundation, Inc.
773+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
774+# 2010, 2011 Free Software Foundation, Inc.
775 #
776 # This file is free software; the Free Software Foundation
777 # gives unlimited permission to copy and/or distribute it,
778 # with or without modifications, as long as this notice is preserved.
779
780-# serial 10
781+# serial 12
782
783 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
784 # written in clear, in which case automake, when reading aclocal.m4,
785@@ -1056,6 +1085,7 @@
786 # instance it was reported that on HP-UX the gcc test will end up
787 # making a dummy file named `D' -- because `-MD' means `put the output
788 # in D'.
789+ rm -rf conftest.dir
790 mkdir conftest.dir
791 # Copy depcomp to subdir because otherwise we won't find it if we're
792 # using a relative directory.
793@@ -1120,7 +1150,7 @@
794 break
795 fi
796 ;;
797- msvisualcpp | msvcmsys)
798+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
799 # This compiler won't grok `-c -o', but also, the minuso test has
800 # not run yet. These depmodes are late enough in the game, and
801 # so weak that their functioning should not be impacted.
802@@ -1185,10 +1215,13 @@
803 if test "x$enable_dependency_tracking" != xno; then
804 am_depcomp="$ac_aux_dir/depcomp"
805 AMDEPBACKSLASH='\'
806+ am__nodep='_no'
807 fi
808 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
809 AC_SUBST([AMDEPBACKSLASH])dnl
810 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
811+AC_SUBST([am__nodep])dnl
812+_AM_SUBST_NOTMAKE([am__nodep])dnl
813 ])
814
815 # Generate code to set up dependency tracking. -*- Autoconf -*-
816@@ -1422,12 +1455,15 @@
817 done
818 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
819
820-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
821+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
822+# Inc.
823 #
824 # This file is free software; the Free Software Foundation
825 # gives unlimited permission to copy and/or distribute it,
826 # with or without modifications, as long as this notice is preserved.
827
828+# serial 1
829+
830 # AM_PROG_INSTALL_SH
831 # ------------------
832 # Define $install_sh.
833@@ -1594,12 +1630,15 @@
834 fi
835 ])
836
837-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
838+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
839+# Inc.
840 #
841 # This file is free software; the Free Software Foundation
842 # gives unlimited permission to copy and/or distribute it,
843 # with or without modifications, as long as this notice is preserved.
844
845+# serial 1
846+
847 # AM_PROG_MKDIR_P
848 # ---------------
849 # Check for `mkdir -p'.
850@@ -1622,13 +1661,14 @@
851
852 # Helper functions for option handling. -*- Autoconf -*-
853
854-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
855+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
856+# Foundation, Inc.
857 #
858 # This file is free software; the Free Software Foundation
859 # gives unlimited permission to copy and/or distribute it,
860 # with or without modifications, as long as this notice is preserved.
861
862-# serial 4
863+# serial 5
864
865 # _AM_MANGLE_OPTION(NAME)
866 # -----------------------
867@@ -1636,13 +1676,13 @@
868 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
869
870 # _AM_SET_OPTION(NAME)
871-# ------------------------------
872+# --------------------
873 # Set option NAME. Presently that only means defining a flag for this option.
874 AC_DEFUN([_AM_SET_OPTION],
875 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
876
877 # _AM_SET_OPTIONS(OPTIONS)
878-# ----------------------------------
879+# ------------------------
880 # OPTIONS is a space-separated list of Automake options.
881 AC_DEFUN([_AM_SET_OPTIONS],
882 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
883@@ -1653,12 +1693,14 @@
884 AC_DEFUN([_AM_IF_OPTION],
885 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
886
887-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
888+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
889 #
890 # This file is free software; the Free Software Foundation
891 # gives unlimited permission to copy and/or distribute it,
892 # with or without modifications, as long as this notice is preserved.
893
894+# serial 1
895+
896 # AM_RUN_LOG(COMMAND)
897 # -------------------
898 # Run COMMAND, save the exit status in ac_status, and log it.
899@@ -1735,13 +1777,13 @@
900 fi
901 AC_MSG_RESULT(yes)])
902
903-# Copyright (C) 2009 Free Software Foundation, Inc.
904+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
905 #
906 # This file is free software; the Free Software Foundation
907 # gives unlimited permission to copy and/or distribute it,
908 # with or without modifications, as long as this notice is preserved.
909
910-# serial 1
911+# serial 2
912
913 # AM_SILENT_RULES([DEFAULT])
914 # --------------------------
915@@ -1756,18 +1798,50 @@
916 no) AM_DEFAULT_VERBOSITY=1;;
917 *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
918 esac
919+dnl
920+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
921+dnl do not support nested variable expansions.
922+dnl See automake bug#9928 and bug#10237.
923+am_make=${MAKE-make}
924+AC_CACHE_CHECK([whether $am_make supports nested variables],
925+ [am_cv_make_support_nested_variables],
926+ [if AS_ECHO([['TRUE=$(BAR$(V))
927+BAR0=false
928+BAR1=true
929+V=1
930+am__doit:
931+ @$(TRUE)
932+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
933+ am_cv_make_support_nested_variables=yes
934+else
935+ am_cv_make_support_nested_variables=no
936+fi])
937+if test $am_cv_make_support_nested_variables = yes; then
938+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
939+ AM_V='$(V)'
940+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
941+else
942+ AM_V=$AM_DEFAULT_VERBOSITY
943+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
944+fi
945+AC_SUBST([AM_V])dnl
946+AM_SUBST_NOTMAKE([AM_V])dnl
947+AC_SUBST([AM_DEFAULT_V])dnl
948+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
949 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
950 AM_BACKSLASH='\'
951 AC_SUBST([AM_BACKSLASH])dnl
952 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
953 ])
954
955-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
956+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
957 #
958 # This file is free software; the Free Software Foundation
959 # gives unlimited permission to copy and/or distribute it,
960 # with or without modifications, as long as this notice is preserved.
961
962+# serial 1
963+
964 # AM_PROG_INSTALL_STRIP
965 # ---------------------
966 # One issue with vendor `install' (even GNU) is that you can't
967@@ -1790,13 +1864,13 @@
968 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
969 AC_SUBST([INSTALL_STRIP_PROGRAM])])
970
971-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
972+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
973 #
974 # This file is free software; the Free Software Foundation
975 # gives unlimited permission to copy and/or distribute it,
976 # with or without modifications, as long as this notice is preserved.
977
978-# serial 2
979+# serial 3
980
981 # _AM_SUBST_NOTMAKE(VARIABLE)
982 # ---------------------------
983@@ -1805,13 +1879,13 @@
984 AC_DEFUN([_AM_SUBST_NOTMAKE])
985
986 # AM_SUBST_NOTMAKE(VARIABLE)
987-# ---------------------------
988+# --------------------------
989 # Public sister of _AM_SUBST_NOTMAKE.
990 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
991
992 # Check how to create a tarball. -*- Autoconf -*-
993
994-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
995+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
996 #
997 # This file is free software; the Free Software Foundation
998 # gives unlimited permission to copy and/or distribute it,
999@@ -1833,10 +1907,11 @@
1000 # a tarball read from stdin.
1001 # $(am__untar) < result.tar
1002 AC_DEFUN([_AM_PROG_TAR],
1003-[# Always define AMTAR for backward compatibility.
1004-AM_MISSING_PROG([AMTAR], [tar])
1005+[# Always define AMTAR for backward compatibility. Yes, it's still used
1006+# in the wild :-( We should find a proper way to deprecate it ...
1007+AC_SUBST([AMTAR], ['$${TAR-tar}'])
1008 m4_if([$1], [v7],
1009- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
1010+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1011 [m4_case([$1], [ustar],, [pax],,
1012 [m4_fatal([Unknown tar format])])
1013 AC_MSG_CHECKING([how to create a $1 tar archive])
1014
1015=== modified file 'build.xml'
1016--- build.xml 2011-07-10 11:35:30 +0000
1017+++ build.xml 2012-02-16 15:09:34 +0000
1018@@ -42,7 +42,7 @@
1019 </description>
1020
1021 <!-- set global properties for this build -->
1022- <property name="version" value="0.48.2"/>
1023+ <property name="version" value="0.48.3"/>
1024 <property name="src" location="src"/>
1025 <property name="lib" location="lib"/>
1026 <property name="build" location="build"/>
1027@@ -673,6 +673,7 @@
1028 <copy todir="${dist}" file="${devlibs}/bin/libgthread-2.0-0.dll"/>
1029 <copy todir="${dist}" file="${devlibs}/bin/libgio-2.0-0.dll"/>
1030 <copy todir="${dist}" file="${devlibs}/bin/libcairo-2.dll"/>
1031+ <copy todir="${dist}" file="${devlibs}/bin/libpixman-1-0.dll"/>
1032 <copy todir="${dist}" file="${devlibs}/bin/libpoppler-5.dll"/>
1033 <copy todir="${dist}" file="${devlibs}/bin/libpoppler-glib-4.dll"/>
1034 <copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
1035@@ -705,7 +706,7 @@
1036 <copy todir="${dist}" file="${devlibs}/bin/libMagickWand-3.dll"/>
1037 <copy todir="${dist}" file="${devlibs}/bin/intl.dll"/>
1038 <copy todir="${dist}" file="${devlibs}/bin/pthreadGC2.dll"/>
1039- <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
1040+ <copy file="${devlibs}/bin/libintl-8.dll" tofile="${dist}/libintl-8.dll"/>
1041 <!-- MINGW support DLLs needed for openmp support -->
1042 <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
1043 <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
1044
1045=== modified file 'compile'
1046--- compile 2011-02-20 12:07:30 +0000
1047+++ compile 2012-02-16 15:09:34 +0000
1048@@ -1,10 +1,10 @@
1049 #! /bin/sh
1050-# Wrapper for compilers which do not understand `-c -o'.
1051-
1052-scriptversion=2009-10-06.20; # UTC
1053-
1054-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
1055-# Foundation, Inc.
1056+# Wrapper for compilers which do not understand '-c -o'.
1057+
1058+scriptversion=2012-01-04.17; # UTC
1059+
1060+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
1061+# Software Foundation, Inc.
1062 # Written by Tom Tromey <tromey@cygnus.com>.
1063 #
1064 # This program is free software; you can redistribute it and/or modify
1065@@ -29,21 +29,186 @@
1066 # bugs to <bug-automake@gnu.org> or send patches to
1067 # <automake-patches@gnu.org>.
1068
1069+nl='
1070+'
1071+
1072+# We need space, tab and new line, in precisely that order. Quoting is
1073+# there to prevent tools from complaining about whitespace usage.
1074+IFS=" "" $nl"
1075+
1076+file_conv=
1077+
1078+# func_file_conv build_file lazy
1079+# Convert a $build file to $host form and store it in $file
1080+# Currently only supports Windows hosts. If the determined conversion
1081+# type is listed in (the comma separated) LAZY, no conversion will
1082+# take place.
1083+func_file_conv ()
1084+{
1085+ file=$1
1086+ case $file in
1087+ / | /[!/]*) # absolute file, and not a UNC file
1088+ if test -z "$file_conv"; then
1089+ # lazily determine how to convert abs files
1090+ case `uname -s` in
1091+ MINGW*)
1092+ file_conv=mingw
1093+ ;;
1094+ CYGWIN*)
1095+ file_conv=cygwin
1096+ ;;
1097+ *)
1098+ file_conv=wine
1099+ ;;
1100+ esac
1101+ fi
1102+ case $file_conv/,$2, in
1103+ *,$file_conv,*)
1104+ ;;
1105+ mingw/*)
1106+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
1107+ ;;
1108+ cygwin/*)
1109+ file=`cygpath -m "$file" || echo "$file"`
1110+ ;;
1111+ wine/*)
1112+ file=`winepath -w "$file" || echo "$file"`
1113+ ;;
1114+ esac
1115+ ;;
1116+ esac
1117+}
1118+
1119+# func_cl_wrapper cl arg...
1120+# Adjust compile command to suit cl
1121+func_cl_wrapper ()
1122+{
1123+ # Assume a capable shell
1124+ lib_path=
1125+ shared=:
1126+ linker_opts=
1127+ for arg
1128+ do
1129+ if test -n "$eat"; then
1130+ eat=
1131+ else
1132+ case $1 in
1133+ -o)
1134+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
1135+ eat=1
1136+ case $2 in
1137+ *.o | *.[oO][bB][jJ])
1138+ func_file_conv "$2"
1139+ set x "$@" -Fo"$file"
1140+ shift
1141+ ;;
1142+ *)
1143+ func_file_conv "$2"
1144+ set x "$@" -Fe"$file"
1145+ shift
1146+ ;;
1147+ esac
1148+ ;;
1149+ -I*)
1150+ func_file_conv "${1#-I}" mingw
1151+ set x "$@" -I"$file"
1152+ shift
1153+ ;;
1154+ -l*)
1155+ lib=${1#-l}
1156+ found=no
1157+ save_IFS=$IFS
1158+ IFS=';'
1159+ for dir in $lib_path $LIB
1160+ do
1161+ IFS=$save_IFS
1162+ if $shared && test -f "$dir/$lib.dll.lib"; then
1163+ found=yes
1164+ set x "$@" "$dir/$lib.dll.lib"
1165+ break
1166+ fi
1167+ if test -f "$dir/$lib.lib"; then
1168+ found=yes
1169+ set x "$@" "$dir/$lib.lib"
1170+ break
1171+ fi
1172+ done
1173+ IFS=$save_IFS
1174+
1175+ test "$found" != yes && set x "$@" "$lib.lib"
1176+ shift
1177+ ;;
1178+ -L*)
1179+ func_file_conv "${1#-L}"
1180+ if test -z "$lib_path"; then
1181+ lib_path=$file
1182+ else
1183+ lib_path="$lib_path;$file"
1184+ fi
1185+ linker_opts="$linker_opts -LIBPATH:$file"
1186+ ;;
1187+ -static)
1188+ shared=false
1189+ ;;
1190+ -Wl,*)
1191+ arg=${1#-Wl,}
1192+ save_ifs="$IFS"; IFS=','
1193+ for flag in $arg; do
1194+ IFS="$save_ifs"
1195+ linker_opts="$linker_opts $flag"
1196+ done
1197+ IFS="$save_ifs"
1198+ ;;
1199+ -Xlinker)
1200+ eat=1
1201+ linker_opts="$linker_opts $2"
1202+ ;;
1203+ -*)
1204+ set x "$@" "$1"
1205+ shift
1206+ ;;
1207+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
1208+ func_file_conv "$1"
1209+ set x "$@" -Tp"$file"
1210+ shift
1211+ ;;
1212+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
1213+ func_file_conv "$1" mingw
1214+ set x "$@" "$file"
1215+ shift
1216+ ;;
1217+ *)
1218+ set x "$@" "$1"
1219+ shift
1220+ ;;
1221+ esac
1222+ fi
1223+ shift
1224+ done
1225+ if test -n "$linker_opts"; then
1226+ linker_opts="-link$linker_opts"
1227+ fi
1228+ exec "$@" $linker_opts
1229+ exit 1
1230+}
1231+
1232+eat=
1233+
1234 case $1 in
1235 '')
1236- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
1237+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
1238 exit 1;
1239 ;;
1240 -h | --h*)
1241 cat <<\EOF
1242 Usage: compile [--help] [--version] PROGRAM [ARGS]
1243
1244-Wrapper for compilers which do not understand `-c -o'.
1245-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
1246+Wrapper for compilers which do not understand '-c -o'.
1247+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
1248 arguments, and rename the output as expected.
1249
1250 If you are trying to build a whole package this is not the
1251-right script to run: please start by reading the file `INSTALL'.
1252+right script to run: please start by reading the file 'INSTALL'.
1253
1254 Report bugs to <bug-automake@gnu.org>.
1255 EOF
1256@@ -53,11 +218,13 @@
1257 echo "compile $scriptversion"
1258 exit $?
1259 ;;
1260+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
1261+ func_cl_wrapper "$@" # Doesn't return...
1262+ ;;
1263 esac
1264
1265 ofile=
1266 cfile=
1267-eat=
1268
1269 for arg
1270 do
1271@@ -66,8 +233,8 @@
1272 else
1273 case $1 in
1274 -o)
1275- # configure might choose to run compile as `compile cc -o foo foo.c'.
1276- # So we strip `-o arg' only if arg is an object.
1277+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
1278+ # So we strip '-o arg' only if arg is an object.
1279 eat=1
1280 case $2 in
1281 *.o | *.obj)
1282@@ -94,10 +261,10 @@
1283 done
1284
1285 if test -z "$ofile" || test -z "$cfile"; then
1286- # If no `-o' option was seen then we might have been invoked from a
1287+ # If no '-o' option was seen then we might have been invoked from a
1288 # pattern rule where we don't need one. That is ok -- this is a
1289 # normal compilation that the losing compiler can handle. If no
1290- # `.c' file was seen then we are probably linking. That is also
1291+ # '.c' file was seen then we are probably linking. That is also
1292 # ok.
1293 exec "$@"
1294 fi
1295@@ -106,7 +273,7 @@
1296 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
1297
1298 # Create the lock directory.
1299-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
1300+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
1301 # that we are using for the .o file. Also, base the name on the expected
1302 # object file name, since that is what matters with a parallel build.
1303 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
1304
1305=== modified file 'config.h.in'
1306--- config.h.in 2011-07-10 11:35:30 +0000
1307+++ config.h.in 2012-02-16 15:09:34 +0000
1308@@ -9,9 +9,6 @@
1309 /* Use AutoPackage? */
1310 #undef ENABLE_BINRELOC
1311
1312-/* Use LittleCms color management */
1313-#undef ENABLE_LCMS
1314-
1315 /* always defined to indicate that i18n is enabled */
1316 #undef ENABLE_NLS
1317
1318@@ -91,6 +88,12 @@
1319 /* Define to 1 if you have the <libintl.h> header file. */
1320 #undef HAVE_LIBINTL_H
1321
1322+/* define to 1 if you have lcms version 1.x */
1323+#undef HAVE_LIBLCMS1
1324+
1325+/* define to 1 if you have lcms version 2.x */
1326+#undef HAVE_LIBLCMS2
1327+
1328 /* Define to 1 if you have the `m' library (-lm). */
1329 #undef HAVE_LIBM
1330
1331@@ -273,6 +276,12 @@
1332 /* Use gnome vfs file load functionality */
1333 #undef WITH_GNOME_VFS
1334
1335+/* Build with Gtkmm 2.22.x */
1336+#undef WITH_GTKMM_2_22
1337+
1338+/* Build with Gtkmm 2.24.x */
1339+#undef WITH_GTKMM_2_24
1340+
1341 /* enable gtk spelling widget */
1342 #undef WITH_GTKSPELL
1343
1344@@ -297,9 +306,6 @@
1345 /* use Python for embedded scripting */
1346 #undef WITH_PYTHON
1347
1348-/* Use Xft font database */
1349-#undef WITH_XFT
1350-
1351 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
1352 significant byte first (like Motorola and SPARC, unlike Intel). */
1353 #if defined AC_APPLE_UNIVERSAL_BUILD
1354
1355=== modified file 'configure'
1356--- configure 2011-07-10 11:35:30 +0000
1357+++ configure 2012-02-16 15:09:34 +0000
1358@@ -1,6 +1,6 @@
1359 #! /bin/sh
1360 # Guess values for system-dependent variables and create Makefiles.
1361-# Generated by GNU Autoconf 2.68 for inkscape 0.48.2.
1362+# Generated by GNU Autoconf 2.68 for inkscape 0.48.3.
1363 #
1364 #
1365 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1366@@ -557,8 +557,8 @@
1367 # Identity of this package.
1368 PACKAGE_NAME='inkscape'
1369 PACKAGE_TARNAME='inkscape'
1370-PACKAGE_VERSION='0.48.2'
1371-PACKAGE_STRING='inkscape 0.48.2'
1372+PACKAGE_VERSION='0.48.3'
1373+PACKAGE_STRING='inkscape 0.48.3'
1374 PACKAGE_BUGREPORT=''
1375 PACKAGE_URL=''
1376
1377@@ -611,6 +611,10 @@
1378 HAVE_CARBON_FALSE
1379 HAVE_CARBON_TRUE
1380 CARBON_LDFLAGS
1381+GTKMM_2_22_LIBS
1382+GTKMM_2_22_CFLAGS
1383+GTKMM_2_24_LIBS
1384+GTKMM_2_24_CFLAGS
1385 INKSCAPE_LIBS
1386 INKSCAPE_CFLAGS
1387 CAIRO_USER_FONTS_LIBS
1388@@ -645,6 +649,8 @@
1389 POPPLER_CFLAGS
1390 LCMS_LIBS
1391 LCMS_CFLAGS
1392+LCMS2_LIBS
1393+LCMS2_CFLAGS
1394 PYTHON_LIBS
1395 PYTHON_CFLAGS
1396 WITH_PYTHON_FALSE
1397@@ -659,12 +665,6 @@
1398 USE_GNOME_VFS_TRUE
1399 GNOME_VFS_LIBS
1400 GNOME_VFS_CFLAGS
1401-PANGOFT2_LIBS
1402-PANGOFT2_CFLAGS
1403-USE_XFT_FALSE
1404-USE_XFT_TRUE
1405-XFT_LIBS
1406-XFT_CFLAGS
1407 PKG_CONFIG_LIBDIR
1408 PKG_CONFIG_PATH
1409 PLATFORM_SOLARIS_FALSE
1410@@ -691,7 +691,8 @@
1411 MSGFMT_OPTS
1412 GETTEXT_PACKAGE
1413 AM_BACKSLASH
1414-AM_DEFAULT_VERBOSITY
1415+AM_DEFAULT_V
1416+AM_V
1417 USE_BZR_VERSION_FALSE
1418 USE_BZR_VERSION_TRUE
1419 EGREP
1420@@ -723,6 +724,13 @@
1421 INTLTOOL_KEYS_RULE
1422 INTLTOOL_DIRECTORY_RULE
1423 INTLTOOL_DESKTOP_RULE
1424+intltool__v_merge_options_0
1425+intltool__v_merge_options_
1426+INTLTOOL_V_MERGE_OPTIONS
1427+INTLTOOL__v_MERGE_0
1428+INTLTOOL__v_MERGE_
1429+INTLTOOL_V_MERGE
1430+AM_DEFAULT_VERBOSITY
1431 INTLTOOL_EXTRACT
1432 INTLTOOL_MERGE
1433 INTLTOOL_UPDATE
1434@@ -742,6 +750,7 @@
1435 am__fastdepCXX_FALSE
1436 am__fastdepCXX_TRUE
1437 CXXDEPMODE
1438+am__nodep
1439 AMDEPBACKSLASH
1440 AMDEP_FALSE
1441 AMDEP_TRUE
1442@@ -831,7 +840,6 @@
1443 enable_dependency_tracking
1444 enable_nls
1445 enable_silent_rules
1446-with_xft
1447 with_gnome_vfs
1448 with_inkjar
1449 with_perl
1450@@ -858,12 +866,10 @@
1451 PKG_CONFIG
1452 PKG_CONFIG_PATH
1453 PKG_CONFIG_LIBDIR
1454-XFT_CFLAGS
1455-XFT_LIBS
1456-PANGOFT2_CFLAGS
1457-PANGOFT2_LIBS
1458 GNOME_VFS_CFLAGS
1459 GNOME_VFS_LIBS
1460+LCMS2_CFLAGS
1461+LCMS2_LIBS
1462 LCMS_CFLAGS
1463 LCMS_LIBS
1464 POPPLER_CFLAGS
1465@@ -886,6 +892,10 @@
1466 CAIRO_USER_FONTS_LIBS
1467 INKSCAPE_CFLAGS
1468 INKSCAPE_LIBS
1469+GTKMM_2_24_CFLAGS
1470+GTKMM_2_24_LIBS
1471+GTKMM_2_22_CFLAGS
1472+GTKMM_2_22_LIBS
1473 CAIRO_PDF_CFLAGS
1474 CAIRO_PDF_LIBS'
1475
1476@@ -1430,7 +1440,7 @@
1477 # Omit some internal or obsolete options to make the list less imposing.
1478 # This message is too long to be a string in the A/UX 3.1 sh.
1479 cat <<_ACEOF
1480-\`configure' configures inkscape 0.48.2 to adapt to many kinds of systems.
1481+\`configure' configures inkscape 0.48.3 to adapt to many kinds of systems.
1482
1483 Usage: $0 [OPTION]... [VAR=VALUE]...
1484
1485@@ -1500,7 +1510,7 @@
1486
1487 if test -n "$ac_init_help"; then
1488 case $ac_init_help in
1489- short | recursive ) echo "Configuration of inkscape 0.48.2:";;
1490+ short | recursive ) echo "Configuration of inkscape 0.48.3:";;
1491 esac
1492 cat <<\_ACEOF
1493
1494@@ -1522,7 +1532,6 @@
1495 Optional Packages:
1496 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1497 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1498- --with-xft use xft scalable font database (default is auto)
1499 --with-gnome-vfs use gnome vfs for loading files
1500 --without-inkjar disable openoffice files (SVG jars)
1501 --with-perl use Perl for embedded scripting (EXPERIMENTAL)
1502@@ -1546,16 +1555,13 @@
1503 directories to add to pkg-config's search path
1504 PKG_CONFIG_LIBDIR
1505 path overriding pkg-config's built-in search path
1506- XFT_CFLAGS C compiler flags for XFT, overriding pkg-config
1507- XFT_LIBS linker flags for XFT, overriding pkg-config
1508- PANGOFT2_CFLAGS
1509- C compiler flags for PANGOFT2, overriding pkg-config
1510- PANGOFT2_LIBS
1511- linker flags for PANGOFT2, overriding pkg-config
1512 GNOME_VFS_CFLAGS
1513 C compiler flags for GNOME_VFS, overriding pkg-config
1514 GNOME_VFS_LIBS
1515 linker flags for GNOME_VFS, overriding pkg-config
1516+ LCMS2_CFLAGS
1517+ C compiler flags for LCMS2, overriding pkg-config
1518+ LCMS2_LIBS linker flags for LCMS2, overriding pkg-config
1519 LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config
1520 LCMS_LIBS linker flags for LCMS, overriding pkg-config
1521 POPPLER_CFLAGS
1522@@ -1598,6 +1604,14 @@
1523 C compiler flags for INKSCAPE, overriding pkg-config
1524 INKSCAPE_LIBS
1525 linker flags for INKSCAPE, overriding pkg-config
1526+ GTKMM_2_24_CFLAGS
1527+ C compiler flags for GTKMM_2_24, overriding pkg-config
1528+ GTKMM_2_24_LIBS
1529+ linker flags for GTKMM_2_24, overriding pkg-config
1530+ GTKMM_2_22_CFLAGS
1531+ C compiler flags for GTKMM_2_22, overriding pkg-config
1532+ GTKMM_2_22_LIBS
1533+ linker flags for GTKMM_2_22, overriding pkg-config
1534 CAIRO_PDF_CFLAGS
1535 C compiler flags for CAIRO_PDF, overriding pkg-config
1536 CAIRO_PDF_LIBS
1537@@ -1669,7 +1683,7 @@
1538 test -n "$ac_init_help" && exit $ac_status
1539 if $ac_init_version; then
1540 cat <<\_ACEOF
1541-inkscape configure 0.48.2
1542+inkscape configure 0.48.3
1543 generated by GNU Autoconf 2.68
1544
1545 Copyright (C) 2010 Free Software Foundation, Inc.
1546@@ -2229,7 +2243,7 @@
1547 This file contains any messages produced by compilers while
1548 running configure, to aid debugging if configure makes a mistake.
1549
1550-It was created by inkscape $as_me 0.48.2, which was
1551+It was created by inkscape $as_me 0.48.3, which was
1552 generated by GNU Autoconf 2.68. Invocation command line was
1553
1554 $ $0 $@
1555@@ -3117,7 +3131,7 @@
1556
1557 # Define the identity of the package.
1558 PACKAGE='inkscape'
1559- VERSION='0.48.2'
1560+ VERSION='0.48.3'
1561
1562
1563 cat >>confdefs.h <<_ACEOF
1564@@ -3147,9 +3161,9 @@
1565
1566 # We need awk for the "check" target. The system "awk" is bad on
1567 # some platforms.
1568-# Always define AMTAR for backward compatibility.
1569-
1570-AMTAR=${AMTAR-"${am_missing_run}tar"}
1571+# Always define AMTAR for backward compatibility. Yes, it's still used
1572+# in the wild :-( We should find a proper way to deprecate it ...
1573+AMTAR='$${TAR-tar}'
1574
1575
1576 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
1577@@ -3312,6 +3326,7 @@
1578 if test "x$enable_dependency_tracking" != xno; then
1579 am_depcomp="$ac_aux_dir/depcomp"
1580 AMDEPBACKSLASH='\'
1581+ am__nodep='_no'
1582 fi
1583 if test "x$enable_dependency_tracking" != xno; then
1584 AMDEP_TRUE=
1585@@ -3842,6 +3857,7 @@
1586 # instance it was reported that on HP-UX the gcc test will end up
1587 # making a dummy file named `D' -- because `-MD' means `put the output
1588 # in D'.
1589+ rm -rf conftest.dir
1590 mkdir conftest.dir
1591 # Copy depcomp to subdir because otherwise we won't find it if we're
1592 # using a relative directory.
1593@@ -3901,7 +3917,7 @@
1594 break
1595 fi
1596 ;;
1597- msvisualcpp | msvcmsys)
1598+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1599 # This compiler won't grok `-c -o', but also, the minuso test has
1600 # not run yet. These depmodes are late enough in the game, and
1601 # so weak that their functioning should not be impacted.
1602@@ -4283,6 +4299,7 @@
1603 # instance it was reported that on HP-UX the gcc test will end up
1604 # making a dummy file named `D' -- because `-MD' means `put the output
1605 # in D'.
1606+ rm -rf conftest.dir
1607 mkdir conftest.dir
1608 # Copy depcomp to subdir because otherwise we won't find it if we're
1609 # using a relative directory.
1610@@ -4342,7 +4359,7 @@
1611 break
1612 fi
1613 ;;
1614- msvisualcpp | msvcmsys)
1615+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1616 # This compiler won't grok `-c -o', but also, the minuso test has
1617 # not run yet. These depmodes are late enough in the game, and
1618 # so weak that their functioning should not be impacted.
1619@@ -4950,6 +4967,7 @@
1620 # instance it was reported that on HP-UX the gcc test will end up
1621 # making a dummy file named `D' -- because `-MD' means `put the output
1622 # in D'.
1623+ rm -rf conftest.dir
1624 mkdir conftest.dir
1625 # Copy depcomp to subdir because otherwise we won't find it if we're
1626 # using a relative directory.
1627@@ -5009,7 +5027,7 @@
1628 break
1629 fi
1630 ;;
1631- msvisualcpp | msvcmsys)
1632+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1633 # This compiler won't grok `-c -o', but also, the minuso test has
1634 # not run yet. These depmodes are late enough in the game, and
1635 # so weak that their functioning should not be impacted.
1636@@ -5087,6 +5105,7 @@
1637 # instance it was reported that on HP-UX the gcc test will end up
1638 # making a dummy file named `D' -- because `-MD' means `put the output
1639 # in D'.
1640+ rm -rf conftest.dir
1641 mkdir conftest.dir
1642 # Copy depcomp to subdir because otherwise we won't find it if we're
1643 # using a relative directory.
1644@@ -5144,7 +5163,7 @@
1645 break
1646 fi
1647 ;;
1648- msvisualcpp | msvcmsys)
1649+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1650 # This compiler won't grok `-c -o', but also, the minuso test has
1651 # not run yet. These depmodes are late enough in the game, and
1652 # so weak that their functioning should not be impacted.
1653@@ -5453,25 +5472,44 @@
1654 as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
1655 fi
1656
1657- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1658-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1659- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1660- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1661- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
1662- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1663- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1664- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1665-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1666- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1667- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1668- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
1669- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1670- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1671- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1672- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1673- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1674- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1675- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1676+if test -z "$AM_DEFAULT_VERBOSITY"; then
1677+ AM_DEFAULT_VERBOSITY=1
1678+fi
1679+
1680+
1681+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
1682+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
1683+INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
1684+
1685+
1686+
1687+
1688+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
1689+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
1690+intltool__v_merge_options_0='-q'
1691+
1692+
1693+
1694+
1695+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1696+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1697+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1698+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1699+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
1700+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1701+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1702+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1703+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1704+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1705+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1706+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
1707+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1708+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1709+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1710+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1711+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1712+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1713+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
1714
1715
1716
1717@@ -5790,7 +5828,7 @@
1718 if test $? -ne 0; then
1719 as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
1720 else
1721- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
1722+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
1723 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
1724 $as_echo "$IT_PERL_VERSION" >&6; }
1725 fi
1726@@ -6259,6 +6297,33 @@
1727 no) AM_DEFAULT_VERBOSITY=1;;
1728 *) AM_DEFAULT_VERBOSITY=0;;
1729 esac
1730+am_make=${MAKE-make}
1731+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
1732+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
1733+if ${am_cv_make_support_nested_variables+:} false; then :
1734+ $as_echo_n "(cached) " >&6
1735+else
1736+ if $as_echo 'TRUE=$(BAR$(V))
1737+BAR0=false
1738+BAR1=true
1739+V=1
1740+am__doit:
1741+ @$(TRUE)
1742+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
1743+ am_cv_make_support_nested_variables=yes
1744+else
1745+ am_cv_make_support_nested_variables=no
1746+fi
1747+fi
1748+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
1749+$as_echo "$am_cv_make_support_nested_variables" >&6; }
1750+if test $am_cv_make_support_nested_variables = yes; then
1751+ AM_V='$(V)'
1752+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1753+else
1754+ AM_V=$AM_DEFAULT_VERBOSITY
1755+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1756+fi
1757 AM_BACKSLASH='\'
1758
1759
1760@@ -6815,6 +6880,7 @@
1761 # instance it was reported that on HP-UX the gcc test will end up
1762 # making a dummy file named `D' -- because `-MD' means `put the output
1763 # in D'.
1764+ rm -rf conftest.dir
1765 mkdir conftest.dir
1766 # Copy depcomp to subdir because otherwise we won't find it if we're
1767 # using a relative directory.
1768@@ -6874,7 +6940,7 @@
1769 break
1770 fi
1771 ;;
1772- msvisualcpp | msvcmsys)
1773+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1774 # This compiler won't grok `-c -o', but also, the minuso test has
1775 # not run yet. These depmodes are late enough in the game, and
1776 # so weak that their functioning should not be impacted.
1777@@ -7074,6 +7140,8 @@
1778 CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS"
1779 # Enable all default warnings
1780 CPPFLAGS="-Wall $CPPFLAGS"
1781+ # Enforce including only <glib.h> (required since 2.31)
1782+ CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
1783
1784 # Test for -Werror=... (introduced some time post-4.0)
1785 # If we hit a format error -- it should be fatal.
1786@@ -7895,6 +7963,10 @@
1787 fi
1788
1789 ;;
1790+ *-*-openbsd*)
1791+ CATOBJEXT=.mo
1792+ DATADIRNAME=share
1793+ ;;
1794 *)
1795 CATOBJEXT=.mo
1796 DATADIRNAME=lib
1797@@ -8891,15 +8963,17 @@
1798
1799
1800
1801-# Check whether --with-xft was given.
1802-if test "${with_xft+set}" = set; then :
1803- withval=$with_xft; with_xft=$withval
1804+# Check whether --with-gnome-vfs was given.
1805+if test "${with_gnome_vfs+set}" = set; then :
1806+ withval=$with_gnome_vfs; with_gnome_vfs=$withval
1807 else
1808- with_xft=auto
1809+ with_gnome_vfs=auto
1810 fi
1811
1812
1813-if test "x$with_xft" != "xno" ; then
1814+if test "x$with_gnome_vfs" = "xno"; then
1815+ gnome_vfs=no
1816+else
1817
1818
1819
1820@@ -9022,280 +9096,6 @@
1821 fi
1822
1823 pkg_failed=no
1824-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFT" >&5
1825-$as_echo_n "checking for XFT... " >&6; }
1826-
1827-if test -n "$XFT_CFLAGS"; then
1828- pkg_cv_XFT_CFLAGS="$XFT_CFLAGS"
1829- elif test -n "$PKG_CONFIG"; then
1830- if test -n "$PKG_CONFIG" && \
1831- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5
1832- ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5
1833- ac_status=$?
1834- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1835- test $ac_status = 0; }; then
1836- pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`
1837- test "x$?" != "x0" && pkg_failed=yes
1838-else
1839- pkg_failed=yes
1840-fi
1841- else
1842- pkg_failed=untried
1843-fi
1844-if test -n "$XFT_LIBS"; then
1845- pkg_cv_XFT_LIBS="$XFT_LIBS"
1846- elif test -n "$PKG_CONFIG"; then
1847- if test -n "$PKG_CONFIG" && \
1848- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5
1849- ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5
1850- ac_status=$?
1851- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1852- test $ac_status = 0; }; then
1853- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`
1854- test "x$?" != "x0" && pkg_failed=yes
1855-else
1856- pkg_failed=yes
1857-fi
1858- else
1859- pkg_failed=untried
1860-fi
1861-
1862-
1863-
1864-if test $pkg_failed = yes; then
1865- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1866-$as_echo "no" >&6; }
1867-
1868-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1869- _pkg_short_errors_supported=yes
1870-else
1871- _pkg_short_errors_supported=no
1872-fi
1873- if test $_pkg_short_errors_supported = yes; then
1874- XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig" 2>&1`
1875- else
1876- XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig" 2>&1`
1877- fi
1878- # Put the nasty error message in config.log where it belongs
1879- echo "$XFT_PKG_ERRORS" >&5
1880-
1881- xft_ok=no
1882-elif test $pkg_failed = untried; then
1883- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1884-$as_echo "no" >&6; }
1885- xft_ok=no
1886-else
1887- XFT_CFLAGS=$pkg_cv_XFT_CFLAGS
1888- XFT_LIBS=$pkg_cv_XFT_LIBS
1889- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1890-$as_echo "yes" >&6; }
1891- xft_ok=yes
1892-fi
1893- if test "x$xft_ok" != "xyes"; then
1894-
1895-pkg_failed=no
1896-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFT" >&5
1897-$as_echo_n "checking for XFT... " >&6; }
1898-
1899-if test -n "$XFT_CFLAGS"; then
1900- pkg_cv_XFT_CFLAGS="$XFT_CFLAGS"
1901- elif test -n "$PKG_CONFIG"; then
1902- if test -n "$PKG_CONFIG" && \
1903- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xft\""; } >&5
1904- ($PKG_CONFIG --exists --print-errors "xft") 2>&5
1905- ac_status=$?
1906- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1907- test $ac_status = 0; }; then
1908- pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`
1909- test "x$?" != "x0" && pkg_failed=yes
1910-else
1911- pkg_failed=yes
1912-fi
1913- else
1914- pkg_failed=untried
1915-fi
1916-if test -n "$XFT_LIBS"; then
1917- pkg_cv_XFT_LIBS="$XFT_LIBS"
1918- elif test -n "$PKG_CONFIG"; then
1919- if test -n "$PKG_CONFIG" && \
1920- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xft\""; } >&5
1921- ($PKG_CONFIG --exists --print-errors "xft") 2>&5
1922- ac_status=$?
1923- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1924- test $ac_status = 0; }; then
1925- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`
1926- test "x$?" != "x0" && pkg_failed=yes
1927-else
1928- pkg_failed=yes
1929-fi
1930- else
1931- pkg_failed=untried
1932-fi
1933-
1934-
1935-
1936-if test $pkg_failed = yes; then
1937- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1938-$as_echo "no" >&6; }
1939-
1940-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1941- _pkg_short_errors_supported=yes
1942-else
1943- _pkg_short_errors_supported=no
1944-fi
1945- if test $_pkg_short_errors_supported = yes; then
1946- XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xft" 2>&1`
1947- else
1948- XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xft" 2>&1`
1949- fi
1950- # Put the nasty error message in config.log where it belongs
1951- echo "$XFT_PKG_ERRORS" >&5
1952-
1953- xft_ok=no
1954-elif test $pkg_failed = untried; then
1955- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1956-$as_echo "no" >&6; }
1957- xft_ok=no
1958-else
1959- XFT_CFLAGS=$pkg_cv_XFT_CFLAGS
1960- XFT_LIBS=$pkg_cv_XFT_LIBS
1961- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1962-$as_echo "yes" >&6; }
1963- xft_ok=yes
1964-fi
1965- if test "x$xft_ok" != "xyes"; then
1966- ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
1967-if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
1968- xft_ok=yes
1969-else
1970- xft_ok=no
1971-fi
1972-
1973-
1974- if test "x$xft_ok" != "xyes"; then
1975- if test "x$with_xft" = "xyes"; then
1976- as_fn_error $? "--with-xft was specified, but appropriate development packages could not be found" "$LINENO" 5
1977- fi
1978- else
1979- XFT_LIBS="-L/usr/X11R6/lib -lXft "
1980- fi
1981- fi
1982- fi
1983-else
1984- xft_ok=no
1985-fi
1986-
1987-
1988-
1989-
1990- if test "x$xft_ok" = "xyes"; then
1991- USE_XFT_TRUE=
1992- USE_XFT_FALSE='#'
1993-else
1994- USE_XFT_TRUE='#'
1995- USE_XFT_FALSE=
1996-fi
1997-
1998-if test "x$xft_ok" = "xyes"; then
1999-
2000-$as_echo "#define WITH_XFT 1" >>confdefs.h
2001-
2002-fi
2003-
2004-
2005-if test "x$xft_ok" = "xyes"; then
2006-
2007-pkg_failed=no
2008-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5
2009-$as_echo_n "checking for PANGOFT2... " >&6; }
2010-
2011-if test -n "$PANGOFT2_CFLAGS"; then
2012- pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS"
2013- elif test -n "$PKG_CONFIG"; then
2014- if test -n "$PKG_CONFIG" && \
2015- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5
2016- ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
2017- ac_status=$?
2018- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2019- test $ac_status = 0; }; then
2020- pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
2021- test "x$?" != "x0" && pkg_failed=yes
2022-else
2023- pkg_failed=yes
2024-fi
2025- else
2026- pkg_failed=untried
2027-fi
2028-if test -n "$PANGOFT2_LIBS"; then
2029- pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS"
2030- elif test -n "$PKG_CONFIG"; then
2031- if test -n "$PKG_CONFIG" && \
2032- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5
2033- ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
2034- ac_status=$?
2035- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2036- test $ac_status = 0; }; then
2037- pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`
2038- test "x$?" != "x0" && pkg_failed=yes
2039-else
2040- pkg_failed=yes
2041-fi
2042- else
2043- pkg_failed=untried
2044-fi
2045-
2046-
2047-
2048-if test $pkg_failed = yes; then
2049- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2050-$as_echo "no" >&6; }
2051-
2052-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2053- _pkg_short_errors_supported=yes
2054-else
2055- _pkg_short_errors_supported=no
2056-fi
2057- if test $_pkg_short_errors_supported = yes; then
2058- PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pangoft2" 2>&1`
2059- else
2060- PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pangoft2" 2>&1`
2061- fi
2062- # Put the nasty error message in config.log where it belongs
2063- echo "$PANGOFT2_PKG_ERRORS" >&5
2064-
2065- pango_ok=no
2066-elif test $pkg_failed = untried; then
2067- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2068-$as_echo "no" >&6; }
2069- pango_ok=no
2070-else
2071- PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS
2072- PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS
2073- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2074-$as_echo "yes" >&6; }
2075- pango_ok=yes
2076-fi
2077- if test "x$pango_ok" = "xyes"; then
2078- XFT_LIBS="$XFT_LIBS $PANGOFT2_LIBS"
2079- fi
2080-fi
2081-
2082-
2083-
2084-
2085-# Check whether --with-gnome-vfs was given.
2086-if test "${with_gnome_vfs+set}" = set; then :
2087- withval=$with_gnome_vfs; with_gnome_vfs=$withval
2088-else
2089- with_gnome_vfs=auto
2090-fi
2091-
2092-
2093-if test "x$with_gnome_vfs" = "xno"; then
2094- gnome_vfs=no
2095-else
2096-
2097-pkg_failed=no
2098 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_VFS" >&5
2099 $as_echo_n "checking for GNOME_VFS... " >&6; }
2100
2101@@ -9798,8 +9598,94 @@
2102
2103
2104 if test "x$enable_lcms" = "xno"; then
2105- lcms=no
2106-else
2107+ # Asked to ignore LittleCms
2108+ lcms=no
2109+ have_lcms2=no
2110+else
2111+ # Have to test LittleCms presence
2112+ if test "x${platform_osx}" != "xyes"; then
2113+ # lcms 2.2 & 2.3 have problems on OSX
2114+
2115+pkg_failed=no
2116+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS2" >&5
2117+$as_echo_n "checking for LCMS2... " >&6; }
2118+
2119+if test -n "$LCMS2_CFLAGS"; then
2120+ pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS"
2121+ elif test -n "$PKG_CONFIG"; then
2122+ if test -n "$PKG_CONFIG" && \
2123+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5
2124+ ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5
2125+ ac_status=$?
2126+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2127+ test $ac_status = 0; }; then
2128+ pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags "lcms2" 2>/dev/null`
2129+ test "x$?" != "x0" && pkg_failed=yes
2130+else
2131+ pkg_failed=yes
2132+fi
2133+ else
2134+ pkg_failed=untried
2135+fi
2136+if test -n "$LCMS2_LIBS"; then
2137+ pkg_cv_LCMS2_LIBS="$LCMS2_LIBS"
2138+ elif test -n "$PKG_CONFIG"; then
2139+ if test -n "$PKG_CONFIG" && \
2140+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5
2141+ ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5
2142+ ac_status=$?
2143+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2144+ test $ac_status = 0; }; then
2145+ pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs "lcms2" 2>/dev/null`
2146+ test "x$?" != "x0" && pkg_failed=yes
2147+else
2148+ pkg_failed=yes
2149+fi
2150+ else
2151+ pkg_failed=untried
2152+fi
2153+
2154+
2155+
2156+if test $pkg_failed = yes; then
2157+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2158+$as_echo "no" >&6; }
2159+
2160+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2161+ _pkg_short_errors_supported=yes
2162+else
2163+ _pkg_short_errors_supported=no
2164+fi
2165+ if test $_pkg_short_errors_supported = yes; then
2166+ LCMS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2" 2>&1`
2167+ else
2168+ LCMS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2" 2>&1`
2169+ fi
2170+ # Put the nasty error message in config.log where it belongs
2171+ echo "$LCMS2_PKG_ERRORS" >&5
2172+
2173+ have_lcms2="no"
2174+elif test $pkg_failed = untried; then
2175+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2176+$as_echo "no" >&6; }
2177+ have_lcms2="no"
2178+else
2179+ LCMS2_CFLAGS=$pkg_cv_LCMS2_CFLAGS
2180+ LCMS2_LIBS=$pkg_cv_LCMS2_LIBS
2181+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2182+$as_echo "yes" >&6; }
2183+ have_lcms2="yes"
2184+fi
2185+ fi
2186+
2187+ if test "x${have_lcms2}" = "xyes"; then
2188+ LIBS="$LIBS $LCMS2_LIBS"
2189+
2190+$as_echo "#define HAVE_LIBLCMS2 1" >>confdefs.h
2191+
2192+
2193+
2194+ else
2195
2196 pkg_failed=no
2197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5
2198@@ -9871,26 +9757,21 @@
2199 $as_echo "yes" >&6; }
2200 lcms=yes
2201 fi
2202- if test "x$lcms" != "xyes"; then
2203- if test "x$enable_lcms" = "xyes"; then
2204- as_fn_error $? "--enable-lcms was specified, but appropriate LittleCms development packages could not be found" "$LINENO" 5
2205- else
2206- # lcms is no, tell us for the log file
2207- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lcms" >&5
2208-$as_echo "$lcms" >&6; }
2209- fi
2210- else
2211- LIBS="$LIBS $LCMS_LIBS"
2212-
2213-$as_echo "#define ENABLE_LCMS 1" >>confdefs.h
2214-
2215- fi
2216+ if test "x$lcms" = "xyes"; then
2217+ LIBS="$LIBS $LCMS_LIBS"
2218+
2219+$as_echo "#define HAVE_LIBLCMS1 1" >>confdefs.h
2220+
2221+
2222+
2223+ else
2224+ # No lcms found. LittleCms was explicitly asked for, so stop
2225+ as_fn_error $? "--enable-lcms was specified, but appropriate LittleCms development packages could not be found" "$LINENO" 5
2226+ fi
2227+ fi
2228 fi
2229
2230
2231-
2232-
2233-
2234 # Check whether --enable-poppler-cairo was given.
2235 if test "${enable_poppler_cairo+set}" = set; then :
2236 enableval=$enable_poppler_cairo; enable_poppler_cairo=$enableval
2237@@ -10841,6 +10722,172 @@
2238
2239 fi
2240
2241+
2242+pkg_failed=no
2243+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKMM_2_24" >&5
2244+$as_echo_n "checking for GTKMM_2_24... " >&6; }
2245+
2246+if test -n "$GTKMM_2_24_CFLAGS"; then
2247+ pkg_cv_GTKMM_2_24_CFLAGS="$GTKMM_2_24_CFLAGS"
2248+ elif test -n "$PKG_CONFIG"; then
2249+ if test -n "$PKG_CONFIG" && \
2250+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.24\""; } >&5
2251+ ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.24") 2>&5
2252+ ac_status=$?
2253+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2254+ test $ac_status = 0; }; then
2255+ pkg_cv_GTKMM_2_24_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4 >= 2.24" 2>/dev/null`
2256+ test "x$?" != "x0" && pkg_failed=yes
2257+else
2258+ pkg_failed=yes
2259+fi
2260+ else
2261+ pkg_failed=untried
2262+fi
2263+if test -n "$GTKMM_2_24_LIBS"; then
2264+ pkg_cv_GTKMM_2_24_LIBS="$GTKMM_2_24_LIBS"
2265+ elif test -n "$PKG_CONFIG"; then
2266+ if test -n "$PKG_CONFIG" && \
2267+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.24\""; } >&5
2268+ ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.24") 2>&5
2269+ ac_status=$?
2270+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2271+ test $ac_status = 0; }; then
2272+ pkg_cv_GTKMM_2_24_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4 >= 2.24" 2>/dev/null`
2273+ test "x$?" != "x0" && pkg_failed=yes
2274+else
2275+ pkg_failed=yes
2276+fi
2277+ else
2278+ pkg_failed=untried
2279+fi
2280+
2281+
2282+
2283+if test $pkg_failed = yes; then
2284+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2285+$as_echo "no" >&6; }
2286+
2287+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2288+ _pkg_short_errors_supported=yes
2289+else
2290+ _pkg_short_errors_supported=no
2291+fi
2292+ if test $_pkg_short_errors_supported = yes; then
2293+ GTKMM_2_24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkmm-2.4 >= 2.24" 2>&1`
2294+ else
2295+ GTKMM_2_24_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkmm-2.4 >= 2.24" 2>&1`
2296+ fi
2297+ # Put the nasty error message in config.log where it belongs
2298+ echo "$GTKMM_2_24_PKG_ERRORS" >&5
2299+
2300+ with_gtkmm_2_24=no
2301+elif test $pkg_failed = untried; then
2302+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2303+$as_echo "no" >&6; }
2304+ with_gtkmm_2_24=no
2305+else
2306+ GTKMM_2_24_CFLAGS=$pkg_cv_GTKMM_2_24_CFLAGS
2307+ GTKMM_2_24_LIBS=$pkg_cv_GTKMM_2_24_LIBS
2308+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2309+$as_echo "yes" >&6; }
2310+ with_gtkmm_2_24=yes
2311+fi
2312+if test "x$with_gtkmm_2_24" = "xyes"; then
2313+
2314+$as_echo "#define WITH_GTKMM_2_24 1" >>confdefs.h
2315+
2316+fi
2317+
2318+
2319+pkg_failed=no
2320+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKMM_2_22" >&5
2321+$as_echo_n "checking for GTKMM_2_22... " >&6; }
2322+
2323+if test -n "$GTKMM_2_22_CFLAGS"; then
2324+ pkg_cv_GTKMM_2_22_CFLAGS="$GTKMM_2_22_CFLAGS"
2325+ elif test -n "$PKG_CONFIG"; then
2326+ if test -n "$PKG_CONFIG" && \
2327+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.22\""; } >&5
2328+ ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.22") 2>&5
2329+ ac_status=$?
2330+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2331+ test $ac_status = 0; }; then
2332+ pkg_cv_GTKMM_2_22_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4 >= 2.22" 2>/dev/null`
2333+ test "x$?" != "x0" && pkg_failed=yes
2334+else
2335+ pkg_failed=yes
2336+fi
2337+ else
2338+ pkg_failed=untried
2339+fi
2340+if test -n "$GTKMM_2_22_LIBS"; then
2341+ pkg_cv_GTKMM_2_22_LIBS="$GTKMM_2_22_LIBS"
2342+ elif test -n "$PKG_CONFIG"; then
2343+ if test -n "$PKG_CONFIG" && \
2344+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.22\""; } >&5
2345+ ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.22") 2>&5
2346+ ac_status=$?
2347+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2348+ test $ac_status = 0; }; then
2349+ pkg_cv_GTKMM_2_22_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4 >= 2.22" 2>/dev/null`
2350+ test "x$?" != "x0" && pkg_failed=yes
2351+else
2352+ pkg_failed=yes
2353+fi
2354+ else
2355+ pkg_failed=untried
2356+fi
2357+
2358+
2359+
2360+if test $pkg_failed = yes; then
2361+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2362+$as_echo "no" >&6; }
2363+
2364+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2365+ _pkg_short_errors_supported=yes
2366+else
2367+ _pkg_short_errors_supported=no
2368+fi
2369+ if test $_pkg_short_errors_supported = yes; then
2370+ GTKMM_2_22_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkmm-2.4 >= 2.22" 2>&1`
2371+ else
2372+ GTKMM_2_22_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkmm-2.4 >= 2.22" 2>&1`
2373+ fi
2374+ # Put the nasty error message in config.log where it belongs
2375+ echo "$GTKMM_2_22_PKG_ERRORS" >&5
2376+
2377+ with_gtkmm_2_22=no
2378+elif test $pkg_failed = untried; then
2379+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2380+$as_echo "no" >&6; }
2381+ with_gtkmm_2_22=no
2382+else
2383+ GTKMM_2_22_CFLAGS=$pkg_cv_GTKMM_2_22_CFLAGS
2384+ GTKMM_2_22_LIBS=$pkg_cv_GTKMM_2_22_LIBS
2385+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2386+$as_echo "yes" >&6; }
2387+ with_gtkmm_2_22=yes
2388+fi
2389+if test "x$with_gtkmm_2_22" = "xyes"; then
2390+
2391+$as_echo "#define WITH_GTKMM_2_22 1" >>confdefs.h
2392+
2393+fi
2394+
2395+# Check for GTK+ backend target
2396+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ backend target" >&5
2397+$as_echo_n "checking for GTK+ backend target... " >&6; }
2398+gtk_backend_target=`pkg-config --variable=target gtk+-2.0`
2399+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_backend_target" >&5
2400+$as_echo "$gtk_backend_target" >&6; }
2401+
2402+# Add X11 library if needed
2403+if test "x$gtk_backend_target" = "xx11"; then
2404+ INKSCAPE_LIBS="$INKSCAPE_LIBS -lX11"
2405+fi
2406+
2407 # Check for Apple Mac OS X Carbon framework
2408 carbon_ok=no
2409 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Carbon support" >&5
2410@@ -10967,7 +11014,7 @@
2411
2412 fi
2413
2414-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 -ldl"
2415+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl"
2416 if test "x$openmp_ok" = "xyes"; then
2417 INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
2418 fi
2419@@ -12119,10 +12166,6 @@
2420 as_fn_error $? "conditional \"PLATFORM_SOLARIS\" was never defined.
2421 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2422 fi
2423-if test -z "${USE_XFT_TRUE}" && test -z "${USE_XFT_FALSE}"; then
2424- as_fn_error $? "conditional \"USE_XFT\" was never defined.
2425-Usually this means the macro was only invoked conditionally." "$LINENO" 5
2426-fi
2427 if test -z "${USE_GNOME_VFS_TRUE}" && test -z "${USE_GNOME_VFS_FALSE}"; then
2428 as_fn_error $? "conditional \"USE_GNOME_VFS\" was never defined.
2429 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2430@@ -12569,7 +12612,7 @@
2431 # report actual input values of CONFIG_FILES etc. instead of their
2432 # values after options handling.
2433 ac_log="
2434-This file was extended by inkscape $as_me 0.48.2, which was
2435+This file was extended by inkscape $as_me 0.48.3, which was
2436 generated by GNU Autoconf 2.68. Invocation command line was
2437
2438 CONFIG_FILES = $CONFIG_FILES
2439@@ -12635,7 +12678,7 @@
2440 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2441 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2442 ac_cs_version="\\
2443-inkscape config.status 0.48.2
2444+inkscape config.status 0.48.3
2445 configured by $0, generated by GNU Autoconf 2.68,
2446 with options \\"\$ac_cs_config\\"
2447
2448@@ -13603,7 +13646,6 @@
2449 CFLAGS: ${CFLAGS}
2450 LDFLAGS: ${LDFLAGS}
2451
2452- Use Xft font database: ${xft_ok}
2453 Use gnome-vfs: ${gnome_vfs}
2454 Use openoffice files: ${ij}
2455 Use relocation support: ${enable_binreloc}
2456@@ -13613,4 +13655,5 @@
2457 Enable Poppler-Cairo: ${enable_poppler_cairo}
2458 ImageMagick Magick++: ${magick_ok}
2459 Libwpg: ${with_libwpg}
2460+ GTK+ backend target: ${gtk_backend_target}
2461 "
2462
2463=== modified file 'configure.ac'
2464--- configure.ac 2011-07-10 11:35:30 +0000
2465+++ configure.ac 2012-02-16 15:09:34 +0000
2466@@ -7,7 +7,7 @@
2467 # `dpkg --compare-versions'. (ii) We don't always know what the next
2468 # version is going to be called until about the time we release it
2469 # (whereas we always know what the previous version was called).
2470-AC_INIT(inkscape, 0.48.2)
2471+AC_INIT(inkscape, 0.48.3)
2472
2473 AC_CANONICAL_HOST
2474 AC_CONFIG_SRCDIR([src/main.cpp])
2475@@ -53,6 +53,8 @@
2476 CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS"
2477 # Enable all default warnings
2478 CPPFLAGS="-Wall $CPPFLAGS"
2479+ # Enforce including only <glib.h> (required since 2.31)
2480+ CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
2481
2482 # Test for -Werror=... (introduced some time post-4.0)
2483 # If we hit a format error -- it should be fatal.
2484@@ -341,60 +343,6 @@
2485 AM_CONDITIONAL(PLATFORM_SOLARIS, test "$platform_solaris" = "yes")
2486
2487 dnl ******************************
2488-dnl Xft checking
2489-dnl ******************************
2490-
2491-AC_ARG_WITH(xft,
2492- AC_HELP_STRING([--with-xft], [use xft scalable font database (default is auto)]),
2493- [with_xft=$withval], [with_xft=auto])
2494-
2495-if test "x$with_xft" != "xno" ; then
2496- dnl Test fontconfig package
2497- PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
2498- if test "x$xft_ok" != "xyes"; then
2499- dnl test xft package
2500- PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
2501- if test "x$xft_ok" != "xyes"; then
2502- dnl Have to test xft presence
2503- AC_CHECK_HEADER(X11/Xft/Xft.h, xft_ok=yes, xft_ok=no)
2504- if test "x$xft_ok" != "xyes"; then
2505- dnl No xft found
2506- if test "x$with_xft" = "xyes"; then
2507- dnl Xft was explicitly asked, so stop
2508- AC_MSG_ERROR([--with-xft was specified, but appropriate development packages could not be found])
2509- fi
2510- else
2511- dnl Working Xft1
2512- XFT_LIBS="-L/usr/X11R6/lib -lXft "
2513- fi
2514- fi
2515- fi
2516-else
2517- dnl Asked to ignore xft
2518- xft_ok=no
2519-fi
2520-
2521-AC_SUBST(XFT_CFLAGS)
2522-AC_SUBST(XFT_LIBS)
2523-
2524-AM_CONDITIONAL(USE_XFT, test "x$xft_ok" = "xyes")
2525-if test "x$xft_ok" = "xyes"; then
2526- AC_DEFINE(WITH_XFT, 1, [Use Xft font database])
2527-fi
2528-
2529-dnl ******************************
2530-dnl pangoft2 for xft
2531-dnl ******************************
2532-
2533-if test "x$xft_ok" = "xyes"; then
2534- PKG_CHECK_MODULES(PANGOFT2, pangoft2, pango_ok=yes, pango_ok=no)
2535- if test "x$pango_ok" = "xyes"; then
2536- XFT_LIBS="$XFT_LIBS $PANGOFT2_LIBS"
2537- fi
2538-fi
2539-
2540-
2541-dnl ******************************
2542 dnl gnome vfs checking
2543 dnl ******************************
2544
2545@@ -546,30 +494,35 @@
2546 [enable_lcms=$enableval], [enable_lcms=yes])
2547
2548 if test "x$enable_lcms" = "xno"; then
2549- dnl Asked to ignore LittleCms
2550- lcms=no
2551+ # Asked to ignore LittleCms
2552+ lcms=no
2553+ have_lcms2=no
2554 else
2555- dnl Have to test LittleCms presence
2556- PKG_CHECK_MODULES(LCMS, lcms >= 1.13, lcms=yes, lcms=no)
2557- if test "x$lcms" != "xyes"; then
2558- dnl No lcms found
2559- if test "x$enable_lcms" = "xyes"; then
2560- dnl LittleCms was explicitly asked for, so stop
2561- AC_MSG_ERROR([--enable-lcms was specified, but appropriate LittleCms development packages could not be found])
2562- else
2563- # lcms is no, tell us for the log file
2564- AC_MSG_RESULT($lcms)
2565- fi
2566- else
2567- dnl Working lcms
2568- LIBS="$LIBS $LCMS_LIBS"
2569- AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
2570- fi
2571+ # Have to test LittleCms presence
2572+ if test "x${platform_osx}" != "xyes"; then
2573+ # lcms 2.2 & 2.3 have problems on OSX
2574+ PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no")
2575+ fi
2576+
2577+ if test "x${have_lcms2}" = "xyes"; then
2578+ LIBS="$LIBS $LCMS2_LIBS"
2579+ AC_DEFINE(HAVE_LIBLCMS2, 1, [define to 1 if you have lcms version 2.x])
2580+ AC_SUBST(LCMS2_CFLAGS)
2581+ AC_SUBST(LCMS2_LIBS)
2582+ else
2583+ PKG_CHECK_MODULES(LCMS, lcms >= 1.13, lcms=yes, lcms=no)
2584+ if test "x$lcms" = "xyes"; then
2585+ LIBS="$LIBS $LCMS_LIBS"
2586+ AC_DEFINE(HAVE_LIBLCMS1, 1, [define to 1 if you have lcms version 1.x])
2587+ AC_SUBST(LCMS_CFLAGS)
2588+ AC_SUBST(LCMS_LIBS)
2589+ else
2590+ # No lcms found. LittleCms was explicitly asked for, so stop
2591+ AC_MSG_ERROR([--enable-lcms was specified, but appropriate LittleCms development packages could not be found])
2592+ fi
2593+ fi
2594 fi
2595
2596-AC_SUBST(LCMS_CFLAGS)
2597-AC_SUBST(LCMS_LIBS)
2598-
2599 dnl ******************************
2600 dnl Libpoppler checking
2601 dnl ******************************
2602@@ -771,6 +724,28 @@
2603 fi
2604 PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
2605
2606+dnl gtkmm provides no preprocessor macros for easily checking versions. This check is used
2607+dnl to figure out if we are working with the newer 2.24 series or not.
2608+PKG_CHECK_MODULES(GTKMM_2_24, gtkmm-2.4 >= 2.24, with_gtkmm_2_24=yes, with_gtkmm_2_24=no)
2609+if test "x$with_gtkmm_2_24" = "xyes"; then
2610+ AC_DEFINE(WITH_GTKMM_2_24,1,[Build with Gtkmm 2.24.x])
2611+fi
2612+
2613+PKG_CHECK_MODULES(GTKMM_2_22, gtkmm-2.4 >= 2.22, with_gtkmm_2_22=yes, with_gtkmm_2_22=no)
2614+if test "x$with_gtkmm_2_22" = "xyes"; then
2615+ AC_DEFINE(WITH_GTKMM_2_22,1,[Build with Gtkmm 2.22.x])
2616+fi
2617+
2618+# Check for GTK+ backend target
2619+AC_MSG_CHECKING([for GTK+ backend target])
2620+gtk_backend_target=`pkg-config --variable=target gtk+-2.0`
2621+AC_MSG_RESULT($gtk_backend_target)
2622+
2623+# Add X11 library if needed
2624+if test "x$gtk_backend_target" = "xx11"; then
2625+ INKSCAPE_LIBS="$INKSCAPE_LIBS -lX11"
2626+fi
2627+
2628 # Check for Apple Mac OS X Carbon framework
2629 carbon_ok=no
2630 AC_MSG_CHECKING([for Mac OS X Carbon support])
2631@@ -795,7 +770,7 @@
2632 fi
2633
2634 dnl Shouldn't we test for libpng and libz?
2635-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 -ldl"
2636+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl"
2637 if test "x$openmp_ok" = "xyes"; then
2638 INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
2639 fi
2640@@ -1067,7 +1042,6 @@
2641 CFLAGS: ${CFLAGS}
2642 LDFLAGS: ${LDFLAGS}
2643
2644- Use Xft font database: ${xft_ok}
2645 Use gnome-vfs: ${gnome_vfs}
2646 Use openoffice files: ${ij}
2647 Use relocation support: ${enable_binreloc}
2648@@ -1077,4 +1051,5 @@
2649 Enable Poppler-Cairo: ${enable_poppler_cairo}
2650 ImageMagick Magick++: ${magick_ok}
2651 Libwpg: ${with_libwpg}
2652+ GTK+ backend target: ${gtk_backend_target}
2653 "
2654
2655=== modified file 'debian/changelog'
2656--- debian/changelog 2011-12-06 09:12:37 +0000
2657+++ debian/changelog 2012-02-16 15:09:34 +0000
2658@@ -1,3 +1,24 @@
2659+inkscape (0.48.3-0ubuntu1) precise; urgency=low
2660+
2661+ * New upstream release (LP: #933188). Fixes several Ubuntu bugs:
2662+ - inkscape fails to build with glib 2.31 (LP: #898538)
2663+ - ctrl c ctrl v of text in edit mode crashes inkscape (LP: #496793)
2664+ - Completely replace lcms1 by lcms2 in Ubuntu (LP: #885324)
2665+ - parameters ending with '\' causes python to bomb (LP: #168417)
2666+ - Extensions with <check> tags fail to load (LP: #668895)
2667+ - ESC doesn't cancel move when using the Node Tool (LP: #788560)
2668+ - unable to edit attributes in Inkscape XML Editor (LP: #884368)
2669+ - Some layers should be visible by default in Layers dialog (LP: #902054)
2670+ - Path Effect List is hidden (LP: #909958)
2671+ - Input Devices > Hardware > Tree of devices is hidden (LP: #910467)
2672+ - Glyphs Font styles are hidden (LP: #911079)
2673+ - Error messages from Extensions hidden (LP: #911079)
2674+ - Messages dialog doesn't work (LP: #911123)
2675+ * Drop 02-add-shebangs-and-fix-permissions.dpatch: Applied upstream.
2676+ * Drop build-dependency on specific libwpd/libwpg version.
2677+
2678+ -- Alex Valavanis <a.valavanis@leeds.ac.uk> Thu, 16 Feb 2012 14:33:40 +0000
2679+
2680 inkscape (0.48.2-0ubuntu4) precise; urgency=low
2681
2682 * No-change rebuild against libpoppler19.
2683
2684=== modified file 'debian/control'
2685--- debian/control 2011-05-30 17:02:03 +0000
2686+++ debian/control 2012-02-16 15:09:34 +0000
2687@@ -30,8 +30,8 @@
2688 libpopt-dev,
2689 libsigc++-2.0-dev (>= 2.0.16-2),
2690 libtool,
2691- libwpd-dev (>= 0.9.0),
2692- libwpg-dev (>= 0.2.0),
2693+ libwpd-dev,
2694+ libwpg-dev,
2695 libxml-parser-perl,
2696 libxml2-dev (>= 2-2.4.24),
2697 libxslt1-dev,
2698
2699=== modified file 'debian/patches/00list'
2700--- debian/patches/00list 2011-07-10 11:35:30 +0000
2701+++ debian/patches/00list 2012-02-16 15:09:34 +0000
2702@@ -1,3 +1,2 @@
2703-02-add-shebangs-and-fix-permissions
2704 01_add_unity_quicklist_support.patch
2705 fix-datamatrix-ui.dpatch
2706
2707=== removed file 'debian/patches/02-add-shebangs-and-fix-permissions.dpatch'
2708--- debian/patches/02-add-shebangs-and-fix-permissions.dpatch 2011-06-01 18:05:51 +0000
2709+++ debian/patches/02-add-shebangs-and-fix-permissions.dpatch 1970-01-01 00:00:00 +0000
2710@@ -1,478 +0,0 @@
2711-#! /bin/sh /usr/share/dpatch/dpatch-run
2712-## 02-add-shebangs-and-fix-permissions.dpatch by <wolfi@sigxcpu.org>
2713-##
2714-## All lines beginning with `## DP:' are a description of the patch.
2715-## DP: Patch to fix permissions and add missing shebang-lines in scripts.
2716-## DP: Taken from upstream's Bug tracker at
2717-## DP: https://bugs.launchpad.net/inkscape/+bug/602005
2718-## DP: original patch by Leo Jackson
2719-## DP: 2011-05-30: Modified by Alex Valavanis <valavanisalex@gmail.com>:
2720-## DP: * Do not add shebangs to JavaScript files. They cannot be run as
2721-## DP: standalone scripts.
2722-## DP: * Install JavaScript files using _DATA rule rather than _SCRIPTS
2723-## DP: rule to avoid making them executable.
2724-
2725-@DPATCH@
2726-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Base.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Base.py
2727---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Base.py 2011-05-30 17:38:10.000000000 +0100
2728-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Base.py 2011-05-30 17:43:57.893386425 +0100
2729-@@ -1,3 +1,4 @@
2730-+#!/usr/bin/env python
2731- '''
2732- Copyright (C) 2007 Martin Owens
2733-
2734-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code128.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code128.py
2735---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code128.py 2011-05-30 17:38:10.000000000 +0100
2736-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code128.py 2011-05-30 17:43:57.893386425 +0100
2737-@@ -1,3 +1,4 @@
2738-+#!/usr/bin/env python
2739- '''
2740- Copyright (C) 2007 Martin Owens
2741-
2742-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39.py
2743---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39.py 2011-05-30 17:38:10.000000000 +0100
2744-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39.py 2011-05-30 17:43:57.893386425 +0100
2745-@@ -1,3 +1,4 @@
2746-+#!/usr/bin/env python
2747- '''
2748- Copyright (C) 2007 Martin Owens
2749-
2750-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39Ext.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39Ext.py
2751---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code39Ext.py 2011-05-30 17:38:10.000000000 +0100
2752-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code39Ext.py 2011-05-30 17:43:57.893386425 +0100
2753-@@ -1,3 +1,4 @@
2754-+#!/usr/bin/env python
2755- '''
2756- Copyright (C) 2007 Martin Owens
2757-
2758-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code93.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code93.py
2759---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/Code93.py 2011-05-30 17:38:10.000000000 +0100
2760-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/Code93.py 2011-05-30 17:43:57.893386425 +0100
2761-@@ -1,3 +1,4 @@
2762-+#!/usr/bin/env python
2763- '''
2764- Copyright (C) 2007 Martin Owens
2765-
2766-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN13.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN13.py
2767---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN13.py 2011-05-30 17:38:10.000000000 +0100
2768-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN13.py 2011-05-30 17:43:57.893386425 +0100
2769-@@ -1,3 +1,4 @@
2770-+#!/usr/bin/env python
2771- '''
2772- Copyright (C) 2007 Martin Owens
2773-
2774-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN5.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN5.py
2775---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN5.py 2011-05-30 17:38:10.000000000 +0100
2776-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN5.py 2011-05-30 17:43:57.893386425 +0100
2777-@@ -1,3 +1,4 @@
2778-+#!/usr/bin/env python
2779- '''
2780- Copyright (C) 2007 Martin Owens
2781- Copyright (C) 2009 Aaron C Spike
2782-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN8.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN8.py
2783---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/EAN8.py 2011-05-30 17:38:10.000000000 +0100
2784-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/EAN8.py 2011-05-30 17:43:57.893386425 +0100
2785-@@ -1,3 +1,4 @@
2786-+#!/usr/bin/env python
2787- '''
2788- Copyright (C) 2007 Martin Owens
2789-
2790-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/RM4CC.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/RM4CC.py
2791---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/RM4CC.py 2011-05-30 17:38:10.000000000 +0100
2792-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/RM4CC.py 2011-05-30 17:43:57.893386425 +0100
2793-@@ -1,3 +1,4 @@
2794-+#!/usr/bin/env python
2795- '''
2796- Copyright (C) 2007 Martin Owens
2797-
2798-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCA.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCA.py
2799---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCA.py 2011-05-30 17:38:10.000000000 +0100
2800-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCA.py 2011-05-30 17:43:57.893386425 +0100
2801-@@ -1,3 +1,4 @@
2802-+#!/usr/bin/env python
2803- '''
2804- Copyright (C) 2007 Martin Owens
2805-
2806-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCE.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCE.py
2807---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/UPCE.py 2011-05-30 17:38:10.000000000 +0100
2808-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/UPCE.py 2011-05-30 17:43:57.893386425 +0100
2809-@@ -1,3 +1,4 @@
2810-+#!/usr/bin/env python
2811- '''
2812- Copyright (C) 2007 Martin Owens
2813-
2814-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/__init__.py inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/__init__.py
2815---- inkscape_0.48.1-2ubuntu5~/share/extensions/Barcode/__init__.py 2011-05-30 17:38:10.000000000 +0100
2816-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Barcode/__init__.py 2011-05-30 17:43:57.893386425 +0100
2817-@@ -1,4 +1,4 @@
2818--
2819-+#!/usr/bin/env python
2820- '''
2821- Barcodes SVG Extention
2822-
2823-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/Makefile.am inkscape_0.48.1-2ubuntu5/share/extensions/Makefile.am
2824---- inkscape_0.48.1-2ubuntu5~/share/extensions/Makefile.am 2011-05-30 17:38:10.000000000 +0100
2825-+++ inkscape_0.48.1-2ubuntu5/share/extensions/Makefile.am 2011-05-30 17:46:40.853386475 +0100
2826-@@ -73,13 +73,9 @@
2827- inkex.py \
2828- Inkscape.pm \
2829- inkwebeffect.py \
2830-- inkweb.js \
2831- interp.py \
2832- interp_att_g.py \
2833-- jessyInk.js \
2834- jessyInk_autoTexts.py \
2835-- jessyInk_core_mouseHandler_noclick.js \
2836-- jessyInk_core_mouseHandler_zoomControl.js \
2837- jessyInk_effects.py \
2838- jessyInk_export.py \
2839- jessyInk_install.py \
2840-@@ -161,6 +157,10 @@
2841- yocto_css.py
2842-
2843- otherstuff = \
2844-+ inkweb.js \
2845-+ jessyInk.js \
2846-+ jessyInk_core_mouseHandler_noclick.js \
2847-+ jessyInk_core_mouseHandler_zoomControl.js \
2848- aisvg.xslt \
2849- colors.xml \
2850- jessyInk_video.svg \
2851-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/SpSVG.pm inkscape_0.48.1-2ubuntu5/share/extensions/SpSVG.pm
2852---- inkscape_0.48.1-2ubuntu5~/share/extensions/SpSVG.pm 2011-05-30 17:38:10.000000000 +0100
2853-+++ inkscape_0.48.1-2ubuntu5/share/extensions/SpSVG.pm 2011-05-30 17:43:57.893386425 +0100
2854-@@ -1,4 +1,4 @@
2855--#!/usr/bin/perl -w
2856-+#!/usr/bin/env perl -w
2857- #
2858- # SpSVG
2859- #
2860-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_blackandwhite.py inkscape_0.48.1-2ubuntu5/share/extensions/color_blackandwhite.py
2861---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_blackandwhite.py 2011-05-30 17:38:10.000000000 +0100
2862-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_blackandwhite.py 2011-05-30 17:43:57.893386425 +0100
2863-@@ -1,3 +1,4 @@
2864-+#!/usr/bin/env python
2865- import coloreffect,sys
2866-
2867- class C(coloreffect.ColorEffect):
2868-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_brighter.py inkscape_0.48.1-2ubuntu5/share/extensions/color_brighter.py
2869---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_brighter.py 2011-05-30 17:38:10.000000000 +0100
2870-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_brighter.py 2011-05-30 17:43:57.893386425 +0100
2871-@@ -1,3 +1,4 @@
2872-+#!/usr/bin/env python
2873- import coloreffect
2874-
2875- class C(coloreffect.ColorEffect):
2876-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_custom.py inkscape_0.48.1-2ubuntu5/share/extensions/color_custom.py
2877---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_custom.py 2011-05-30 17:38:10.000000000 +0100
2878-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_custom.py 2011-05-30 17:43:57.893386425 +0100
2879-@@ -1,3 +1,4 @@
2880-+#!/usr/bin/env python
2881- import coloreffect
2882-
2883- class C(coloreffect.ColorEffect):
2884-@@ -22,4 +23,4 @@
2885- return '%02x%02x%02x' % (int(round(r2*255)),int(round(g2*255)),int(round(b2*255)))
2886-
2887- c = C()
2888--c.affect()
2889-\ No newline at end of file
2890-+c.affect()
2891-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_darker.py inkscape_0.48.1-2ubuntu5/share/extensions/color_darker.py
2892---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_darker.py 2011-05-30 17:38:10.000000000 +0100
2893-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_darker.py 2011-05-30 17:43:57.893386425 +0100
2894-@@ -1,3 +1,4 @@
2895-+#!/usr/bin/env python
2896- import coloreffect
2897-
2898- class C(coloreffect.ColorEffect):
2899-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_desaturate.py inkscape_0.48.1-2ubuntu5/share/extensions/color_desaturate.py
2900---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_desaturate.py 2011-05-30 17:38:10.000000000 +0100
2901-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_desaturate.py 2011-05-30 17:43:57.893386425 +0100
2902-@@ -1,3 +1,4 @@
2903-+#!/usr/bin/env python
2904- import coloreffect
2905-
2906- class C(coloreffect.ColorEffect):
2907-@@ -7,4 +8,4 @@
2908- return '%02x%02x%02x' % (ig,ig,ig)
2909-
2910- c = C()
2911--c.affect()
2912-\ No newline at end of file
2913-+c.affect()
2914-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_grayscale.py inkscape_0.48.1-2ubuntu5/share/extensions/color_grayscale.py
2915---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_grayscale.py 2011-05-30 17:38:10.000000000 +0100
2916-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_grayscale.py 2011-05-30 17:43:57.893386425 +0100
2917-@@ -1,3 +1,4 @@
2918-+#!/usr/bin/env python
2919- import coloreffect
2920-
2921- class C(coloreffect.ColorEffect):
2922-@@ -11,4 +12,4 @@
2923- return '%02x%02x%02x' % (ig,ig,ig)
2924-
2925- c = C()
2926--c.affect()
2927-\ No newline at end of file
2928-+c.affect()
2929-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesshue.py inkscape_0.48.1-2ubuntu5/share/extensions/color_lesshue.py
2930---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesshue.py 2011-05-30 17:38:10.000000000 +0100
2931-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesshue.py 2011-05-30 17:43:57.903386425 +0100
2932-@@ -1,3 +1,4 @@
2933-+#!/usr/bin/env python
2934- import coloreffect, inkex
2935-
2936- class C(coloreffect.ColorEffect):
2937-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesslight.py inkscape_0.48.1-2ubuntu5/share/extensions/color_lesslight.py
2938---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesslight.py 2011-05-30 17:38:10.000000000 +0100
2939-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesslight.py 2011-05-30 17:43:57.903386425 +0100
2940-@@ -1,3 +1,4 @@
2941-+#!/usr/bin/env python
2942- import coloreffect, inkex
2943-
2944- class C(coloreffect.ColorEffect):
2945-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesssaturation.py inkscape_0.48.1-2ubuntu5/share/extensions/color_lesssaturation.py
2946---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_lesssaturation.py 2011-05-30 17:38:10.000000000 +0100
2947-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_lesssaturation.py 2011-05-30 17:43:57.903386425 +0100
2948-@@ -1,3 +1,4 @@
2949-+#!/usr/bin/env python
2950- import coloreffect, inkex
2951-
2952- class C(coloreffect.ColorEffect):
2953-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_morehue.py inkscape_0.48.1-2ubuntu5/share/extensions/color_morehue.py
2954---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morehue.py 2011-05-30 17:38:10.000000000 +0100
2955-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morehue.py 2011-05-30 17:43:57.903386425 +0100
2956-@@ -1,3 +1,4 @@
2957-+#!/usr/bin/env python
2958- import coloreffect, inkex
2959-
2960- class C(coloreffect.ColorEffect):
2961-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_morelight.py inkscape_0.48.1-2ubuntu5/share/extensions/color_morelight.py
2962---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_morelight.py 2011-05-30 17:38:10.000000000 +0100
2963-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_morelight.py 2011-05-30 17:43:57.903386425 +0100
2964-@@ -1,3 +1,4 @@
2965-+#!/usr/bin/env python
2966- import coloreffect, inkex
2967-
2968- class C(coloreffect.ColorEffect):
2969-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_moresaturation.py inkscape_0.48.1-2ubuntu5/share/extensions/color_moresaturation.py
2970---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_moresaturation.py 2011-05-30 17:38:10.000000000 +0100
2971-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_moresaturation.py 2011-05-30 17:43:57.903386425 +0100
2972-@@ -1,3 +1,4 @@
2973-+#!/usr/bin/env python
2974- import coloreffect, inkex
2975-
2976- class C(coloreffect.ColorEffect):
2977-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_negative.py inkscape_0.48.1-2ubuntu5/share/extensions/color_negative.py
2978---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_negative.py 2011-05-30 17:38:10.000000000 +0100
2979-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_negative.py 2011-05-30 17:43:57.903386425 +0100
2980-@@ -1,3 +1,4 @@
2981-+#!/usr/bin/env python
2982- import coloreffect
2983-
2984- class C(coloreffect.ColorEffect):
2985-@@ -5,4 +6,4 @@
2986- return '%02x%02x%02x' % (255-r,255-g,255-b)
2987-
2988- c = C()
2989--c.affect()
2990-\ No newline at end of file
2991-+c.affect()
2992-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_randomize.py inkscape_0.48.1-2ubuntu5/share/extensions/color_randomize.py
2993---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_randomize.py 2011-05-30 17:38:10.000000000 +0100
2994-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_randomize.py 2011-05-30 17:43:57.903386425 +0100
2995-@@ -1,3 +1,4 @@
2996-+#!/usr/bin/env python
2997- import coloreffect,random,inkex
2998-
2999- class C(coloreffect.ColorEffect):
3000-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_removeblue.py inkscape_0.48.1-2ubuntu5/share/extensions/color_removeblue.py
3001---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removeblue.py 2011-05-30 17:38:10.000000000 +0100
3002-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removeblue.py 2011-05-30 17:43:57.903386425 +0100
3003-@@ -1,3 +1,4 @@
3004-+#!/usr/bin/env python
3005- import coloreffect
3006-
3007- class C(coloreffect.ColorEffect):
3008-@@ -5,4 +6,4 @@
3009- return '%02x%02x%02x' % (r,g,0)
3010-
3011- c = C()
3012--c.affect()
3013-\ No newline at end of file
3014-+c.affect()
3015-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_removegreen.py inkscape_0.48.1-2ubuntu5/share/extensions/color_removegreen.py
3016---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removegreen.py 2011-05-30 17:38:10.000000000 +0100
3017-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removegreen.py 2011-05-30 17:43:57.903386425 +0100
3018-@@ -1,3 +1,4 @@
3019-+#!/usr/bin/env python
3020- import coloreffect
3021-
3022- class C(coloreffect.ColorEffect):
3023-@@ -5,4 +6,4 @@
3024- return '%02x%02x%02x' % (r,0,b)
3025-
3026- c = C()
3027--c.affect()
3028-\ No newline at end of file
3029-+c.affect()
3030-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_removered.py inkscape_0.48.1-2ubuntu5/share/extensions/color_removered.py
3031---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_removered.py 2011-05-30 17:38:10.000000000 +0100
3032-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_removered.py 2011-05-30 17:43:57.903386425 +0100
3033-@@ -1,3 +1,4 @@
3034-+#!/usr/bin/env python
3035- import coloreffect
3036-
3037- class C(coloreffect.ColorEffect):
3038-@@ -5,4 +6,4 @@
3039- return '%02x%02x%02x' % (0,g,b)
3040-
3041- c = C()
3042--c.affect()
3043-\ No newline at end of file
3044-+c.affect()
3045-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_replace.py inkscape_0.48.1-2ubuntu5/share/extensions/color_replace.py
3046---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_replace.py 2011-05-30 17:38:10.000000000 +0100
3047-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_replace.py 2011-05-30 17:43:57.903386425 +0100
3048-@@ -1,3 +1,4 @@
3049-+#!/usr/bin/env python
3050- import coloreffect
3051-
3052- import inkex
3053-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/color_rgbbarrel.py inkscape_0.48.1-2ubuntu5/share/extensions/color_rgbbarrel.py
3054---- inkscape_0.48.1-2ubuntu5~/share/extensions/color_rgbbarrel.py 2011-05-30 17:38:10.000000000 +0100
3055-+++ inkscape_0.48.1-2ubuntu5/share/extensions/color_rgbbarrel.py 2011-05-30 17:43:57.903386425 +0100
3056-@@ -1,3 +1,4 @@
3057-+#!/usr/bin/env python
3058- import coloreffect
3059-
3060- class C(coloreffect.ColorEffect):
3061-@@ -5,4 +6,4 @@
3062- return '%02x%02x%02x' % (b,r,g)
3063-
3064- c = C()
3065--c.affect()
3066-\ No newline at end of file
3067-+c.affect()
3068-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/dxf_templates.py inkscape_0.48.1-2ubuntu5/share/extensions/dxf_templates.py
3069---- inkscape_0.48.1-2ubuntu5~/share/extensions/dxf_templates.py 2011-05-30 17:38:10.000000000 +0100
3070-+++ inkscape_0.48.1-2ubuntu5/share/extensions/dxf_templates.py 2011-05-30 17:43:57.903386425 +0100
3071-@@ -1,3 +1,4 @@
3072-+#!/usr/bin/env python
3073- r14_header = ''' 0
3074- SECTION
3075- 2
3076-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/render_alphabetsoup_config.py inkscape_0.48.1-2ubuntu5/share/extensions/render_alphabetsoup_config.py
3077---- inkscape_0.48.1-2ubuntu5~/share/extensions/render_alphabetsoup_config.py 2011-05-30 17:38:10.000000000 +0100
3078-+++ inkscape_0.48.1-2ubuntu5/share/extensions/render_alphabetsoup_config.py 2011-05-30 17:43:57.903386425 +0100
3079-@@ -1,3 +1,4 @@
3080-+#!/usr/bin/env python
3081- # Syntax format: (raise your hand if you know lisp :-)
3082- #
3083- # 'state0': ("file.svg", ( ( ('state1', dx, dy, T-B, L|R),),
3084-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/render_barcode.py inkscape_0.48.1-2ubuntu5/share/extensions/render_barcode.py
3085---- inkscape_0.48.1-2ubuntu5~/share/extensions/render_barcode.py 2011-05-30 17:38:10.000000000 +0100
3086-+++ inkscape_0.48.1-2ubuntu5/share/extensions/render_barcode.py 2011-05-30 17:43:57.903386425 +0100
3087-@@ -1,3 +1,4 @@
3088-+#!/usr/bin/env python
3089- '''
3090- Copyright (C) 2007 Martin Owens
3091-
3092-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/run_command.py inkscape_0.48.1-2ubuntu5/share/extensions/run_command.py
3093---- inkscape_0.48.1-2ubuntu5~/share/extensions/run_command.py 2011-05-30 17:38:10.000000000 +0100
3094-+++ inkscape_0.48.1-2ubuntu5/share/extensions/run_command.py 2011-05-30 17:43:57.903386425 +0100
3095-@@ -1,3 +1,4 @@
3096-+#!/usr/bin/env python
3097- import os
3098- import sys
3099- import tempfile
3100-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/svg_and_media_zip_output.py inkscape_0.48.1-2ubuntu5/share/extensions/svg_and_media_zip_output.py
3101---- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_and_media_zip_output.py 2011-05-30 17:38:10.000000000 +0100
3102-+++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_and_media_zip_output.py 2011-05-30 17:43:57.903386425 +0100
3103-@@ -1,4 +1,4 @@
3104--#! /usr/bin/env python
3105-+#!/usr/bin/env python
3106- """
3107- svg_and_media_zip_output.py
3108- An extention which collects all images to the documents directory and
3109-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/svg_regex.py inkscape_0.48.1-2ubuntu5/share/extensions/svg_regex.py
3110---- inkscape_0.48.1-2ubuntu5~/share/extensions/svg_regex.py 2011-05-30 17:38:10.000000000 +0100
3111-+++ inkscape_0.48.1-2ubuntu5/share/extensions/svg_regex.py 2011-05-30 17:43:57.903386425 +0100
3112-@@ -1,3 +1,4 @@
3113-+#!/usr/bin/env python
3114- # This software is OSI Certified Open Source Software.
3115- # OSI Certified is a certification mark of the Open Source Initiative.
3116- #
3117-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_braille.py inkscape_0.48.1-2ubuntu5/share/extensions/text_braille.py
3118---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_braille.py 2011-05-30 17:38:10.000000000 +0100
3119-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_braille.py 2011-05-30 17:43:57.903386425 +0100
3120-@@ -1,3 +1,4 @@
3121-+#!/usr/bin/env python
3122- #encoding: utf-8
3123- import chardataeffect, inkex, string
3124-
3125-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_flipcase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_flipcase.py
3126---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_flipcase.py 2011-05-30 17:38:10.000000000 +0100
3127-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_flipcase.py 2011-05-30 17:43:57.903386425 +0100
3128-@@ -1,3 +1,4 @@
3129-+#!/usr/bin/env python
3130- import chardataeffect, inkex, string
3131-
3132- class C(chardataeffect.CharDataEffect):
3133-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_lowercase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_lowercase.py
3134---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_lowercase.py 2011-05-30 17:38:10.000000000 +0100
3135-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_lowercase.py 2011-05-30 17:43:57.903386425 +0100
3136-@@ -1,3 +1,4 @@
3137-+#!/usr/bin/env python
3138- import chardataeffect, inkex, string
3139-
3140- class C(chardataeffect.CharDataEffect):
3141-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_randomcase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_randomcase.py
3142---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_randomcase.py 2011-05-30 17:38:10.000000000 +0100
3143-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_randomcase.py 2011-05-30 17:43:57.903386425 +0100
3144-@@ -1,3 +1,4 @@
3145-+#!/usr/bin/env python
3146- import chardataeffect, inkex, string
3147-
3148- import random
3149-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_replace.py inkscape_0.48.1-2ubuntu5/share/extensions/text_replace.py
3150---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_replace.py 2011-05-30 17:38:10.000000000 +0100
3151-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_replace.py 2011-05-30 17:43:57.903386425 +0100
3152-@@ -1,3 +1,4 @@
3153-+#!/usr/bin/env python
3154- import chardataeffect, inkex, string
3155-
3156- class C(chardataeffect.CharDataEffect):
3157-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_sentencecase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_sentencecase.py
3158---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_sentencecase.py 2011-05-30 17:38:10.000000000 +0100
3159-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_sentencecase.py 2011-05-30 17:43:57.903386425 +0100
3160-@@ -1,3 +1,4 @@
3161-+#!/usr/bin/env python
3162- import chardataeffect, inkex, string
3163-
3164- class C(chardataeffect.CharDataEffect):
3165-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_titlecase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_titlecase.py
3166---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_titlecase.py 2011-05-30 17:38:10.000000000 +0100
3167-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_titlecase.py 2011-05-30 17:43:57.913386425 +0100
3168-@@ -1,3 +1,4 @@
3169-+#!/usr/bin/env python
3170- import chardataeffect, inkex, string
3171-
3172- class C(chardataeffect.CharDataEffect):
3173-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/text_uppercase.py inkscape_0.48.1-2ubuntu5/share/extensions/text_uppercase.py
3174---- inkscape_0.48.1-2ubuntu5~/share/extensions/text_uppercase.py 2011-05-30 17:38:10.000000000 +0100
3175-+++ inkscape_0.48.1-2ubuntu5/share/extensions/text_uppercase.py 2011-05-30 17:43:57.913386425 +0100
3176-@@ -1,3 +1,4 @@
3177-+#!/usr/bin/env python
3178- import chardataeffect, inkex, string
3179-
3180- class C(chardataeffect.CharDataEffect):
3181-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/extensions/voronoi.py inkscape_0.48.1-2ubuntu5/share/extensions/voronoi.py
3182---- inkscape_0.48.1-2ubuntu5~/share/extensions/voronoi.py 2011-05-30 17:38:10.000000000 +0100
3183-+++ inkscape_0.48.1-2ubuntu5/share/extensions/voronoi.py 2011-05-30 17:43:57.913386425 +0100
3184-@@ -1,3 +1,4 @@
3185-+#! /usr/bin/env python
3186- #############################################################################
3187- #
3188- # Voronoi diagram calculator/ Delaunay triangulator
3189
3190=== modified file 'depcomp'
3191--- depcomp 2009-12-23 15:38:43 +0000
3192+++ depcomp 2012-02-16 15:09:34 +0000
3193@@ -1,10 +1,10 @@
3194 #! /bin/sh
3195 # depcomp - compile a program generating dependencies as side-effects
3196
3197-scriptversion=2009-04-28.21; # UTC
3198+scriptversion=2011-12-04.11; # UTC
3199
3200-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
3201-# Software Foundation, Inc.
3202+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
3203+# 2011 Free Software Foundation, Inc.
3204
3205 # This program is free software; you can redistribute it and/or modify
3206 # it under the terms of the GNU General Public License as published by
3207@@ -44,7 +44,7 @@
3208 object Object file output by `PROGRAMS ARGS'.
3209 DEPDIR directory where to store dependencies.
3210 depfile Dependency file to output.
3211- tmpdepfile Temporary file to use when outputing dependencies.
3212+ tmpdepfile Temporary file to use when outputting dependencies.
3213 libtool Whether libtool is used (yes/no).
3214
3215 Report bugs to <bug-automake@gnu.org>.
3216@@ -90,10 +90,18 @@
3217 # This is just like msvisualcpp but w/o cygpath translation.
3218 # Just convert the backslash-escaped backslashes to single forward
3219 # slashes to satisfy depend.m4
3220- cygpath_u="sed s,\\\\\\\\,/,g"
3221+ cygpath_u='sed s,\\\\,/,g'
3222 depmode=msvisualcpp
3223 fi
3224
3225+if test "$depmode" = msvc7msys; then
3226+ # This is just like msvc7 but w/o cygpath translation.
3227+ # Just convert the backslash-escaped backslashes to single forward
3228+ # slashes to satisfy depend.m4
3229+ cygpath_u='sed s,\\\\,/,g'
3230+ depmode=msvc7
3231+fi
3232+
3233 case "$depmode" in
3234 gcc3)
3235 ## gcc 3 implements dependency tracking that does exactly what
3236@@ -158,10 +166,12 @@
3237 ' < "$tmpdepfile" |
3238 ## Some versions of gcc put a space before the `:'. On the theory
3239 ## that the space means something, we add a space to the output as
3240-## well.
3241+## well. hp depmode also adds that space, but also prefixes the VPATH
3242+## to the object. Take care to not repeat it in the output.
3243 ## Some versions of the HPUX 10.20 sed can't process this invocation
3244 ## correctly. Breaking it into two sed invocations is a workaround.
3245- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
3246+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
3247+ | sed -e 's/$/ :/' >> "$depfile"
3248 rm -f "$tmpdepfile"
3249 ;;
3250
3251@@ -405,6 +415,52 @@
3252 rm -f "$tmpdepfile"
3253 ;;
3254
3255+msvc7)
3256+ if test "$libtool" = yes; then
3257+ showIncludes=-Wc,-showIncludes
3258+ else
3259+ showIncludes=-showIncludes
3260+ fi
3261+ "$@" $showIncludes > "$tmpdepfile"
3262+ stat=$?
3263+ grep -v '^Note: including file: ' "$tmpdepfile"
3264+ if test "$stat" = 0; then :
3265+ else
3266+ rm -f "$tmpdepfile"
3267+ exit $stat
3268+ fi
3269+ rm -f "$depfile"
3270+ echo "$object : \\" > "$depfile"
3271+ # The first sed program below extracts the file names and escapes
3272+ # backslashes for cygpath. The second sed program outputs the file
3273+ # name when reading, but also accumulates all include files in the
3274+ # hold buffer in order to output them again at the end. This only
3275+ # works with sed implementations that can handle large buffers.
3276+ sed < "$tmpdepfile" -n '
3277+/^Note: including file: *\(.*\)/ {
3278+ s//\1/
3279+ s/\\/\\\\/g
3280+ p
3281+}' | $cygpath_u | sort -u | sed -n '
3282+s/ /\\ /g
3283+s/\(.*\)/ \1 \\/p
3284+s/.\(.*\) \\/\1:/
3285+H
3286+$ {
3287+ s/.*/ /
3288+ G
3289+ p
3290+}' >> "$depfile"
3291+ rm -f "$tmpdepfile"
3292+ ;;
3293+
3294+msvc7msys)
3295+ # This case exists only to let depend.m4 do its work. It works by
3296+ # looking at the text of this script. This case will never be run,
3297+ # since it is checked for above.
3298+ exit 1
3299+ ;;
3300+
3301 #nosideeffect)
3302 # This comment above is used by automake to tell side-effect
3303 # dependency tracking mechanisms from slower ones.
3304@@ -503,7 +559,9 @@
3305 touch "$tmpdepfile"
3306 ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
3307 rm -f "$depfile"
3308- cat < "$tmpdepfile" > "$depfile"
3309+ # makedepend may prepend the VPATH from the source file name to the object.
3310+ # No need to regex-escape $object, excess matching of '.' is harmless.
3311+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
3312 sed '1,2d' "$tmpdepfile" | tr ' ' '
3313 ' | \
3314 ## Some versions of the HPUX 10.20 sed can't process this invocation
3315
3316=== modified file 'doc/Makefile.in'
3317--- doc/Makefile.in 2011-07-10 11:35:30 +0000
3318+++ doc/Makefile.in 2012-02-16 15:09:34 +0000
3319@@ -1,9 +1,9 @@
3320-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3321+# Makefile.in generated by automake 1.11.3 from Makefile.am.
3322 # @configure_input@
3323
3324 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
3325-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
3326-# Inc.
3327+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
3328+# Foundation, Inc.
3329 # This Makefile.in is free software; the Free Software Foundation
3330 # gives unlimited permission to copy and/or distribute it,
3331 # with or without modifications, as long as this notice is preserved.
3332@@ -47,11 +47,11 @@
3333 CONFIG_HEADER = $(top_builddir)/config.h
3334 CONFIG_CLEAN_FILES =
3335 CONFIG_CLEAN_VPATH_FILES =
3336-AM_V_GEN = $(am__v_GEN_$(V))
3337-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
3338+AM_V_GEN = $(am__v_GEN_@AM_V@)
3339+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
3340 am__v_GEN_0 = @echo " GEN " $@;
3341-AM_V_at = $(am__v_at_$(V))
3342-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
3343+AM_V_at = $(am__v_at_@AM_V@)
3344+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
3345 am__v_at_0 = @
3346 SOURCES =
3347 DIST_SOURCES =
3348@@ -102,6 +102,10 @@
3349 GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
3350 GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
3351 GREP = @GREP@
3352+GTKMM_2_22_CFLAGS = @GTKMM_2_22_CFLAGS@
3353+GTKMM_2_22_LIBS = @GTKMM_2_22_LIBS@
3354+GTKMM_2_24_CFLAGS = @GTKMM_2_24_CFLAGS@
3355+GTKMM_2_24_LIBS = @GTKMM_2_24_LIBS@
3356 IMAGEMAGICK_CFLAGS = @IMAGEMAGICK_CFLAGS@
3357 IMAGEMAGICK_LIBS = @IMAGEMAGICK_LIBS@
3358 INKBOARD_CFLAGS = @INKBOARD_CFLAGS@
3359@@ -120,6 +124,12 @@
3360 INTLTOOL_MERGE = @INTLTOOL_MERGE@
3361 INTLTOOL_PERL = @INTLTOOL_PERL@
3362 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
3363+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
3364+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
3365+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
3366+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
3367+LCMS2_CFLAGS = @LCMS2_CFLAGS@
3368+LCMS2_LIBS = @LCMS2_LIBS@
3369 LCMS_CFLAGS = @LCMS_CFLAGS@
3370 LCMS_LIBS = @LCMS_LIBS@
3371 LDFLAGS = @LDFLAGS@
3372@@ -147,8 +157,6 @@
3373 PACKAGE_TARNAME = @PACKAGE_TARNAME@
3374 PACKAGE_URL = @PACKAGE_URL@
3375 PACKAGE_VERSION = @PACKAGE_VERSION@
3376-PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
3377-PANGOFT2_LIBS = @PANGOFT2_LIBS@
3378 PATH_SEPARATOR = @PATH_SEPARATOR@
3379 PERL_CFLAGS = @PERL_CFLAGS@
3380 PERL_LIBS = @PERL_LIBS@
3381@@ -177,8 +185,6 @@
3382 USE_NLS = @USE_NLS@
3383 VERSION = @VERSION@
3384 WIN32_CFLAGS = @WIN32_CFLAGS@
3385-XFT_CFLAGS = @XFT_CFLAGS@
3386-XFT_LIBS = @XFT_LIBS@
3387 XGETTEXT = @XGETTEXT@
3388 abs_builddir = @abs_builddir@
3389 abs_srcdir = @abs_srcdir@
3390@@ -212,6 +218,8 @@
3391 includedir = @includedir@
3392 infodir = @infodir@
3393 install_sh = @install_sh@
3394+intltool__v_merge_options_ = @intltool__v_merge_options_@
3395+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
3396 libdir = @libdir@
3397 libexecdir = @libexecdir@
3398 localedir = @localedir@
3399@@ -332,10 +340,15 @@
3400
3401 installcheck: installcheck-am
3402 install-strip:
3403- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
3404- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
3405- `test -z '$(STRIP)' || \
3406- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
3407+ if test -z '$(STRIP)'; then \
3408+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
3409+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
3410+ install; \
3411+ else \
3412+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
3413+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
3414+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
3415+ fi
3416 mostlyclean-generic:
3417
3418 clean-generic:
3419
3420=== modified file 'doc/keys.en.html'
3421--- doc/keys.en.html 2011-07-10 11:35:30 +0000
3422+++ doc/keys.en.html 2012-02-16 15:09:34 +0000
3423@@ -12,7 +12,7 @@
3424 <div id="header">
3425 <h1>Inkscape keyboard and mouse reference</h1>
3426 <div class="releaseinfo">Version 0.48</div>
3427- <div class="pubdate">Last revision: 2010-12-29</div>
3428+ <div class="pubdate">Last revision: 2011-10-08</div>
3429 </div>
3430 <div id="preface">
3431
3432@@ -53,73 +53,73 @@
3433 <span class="toc-section"> | </span>
3434 <a class="toc-section" href="#d0e1453">Object</a>
3435 <span class="toc-section"> · </span>
3436- <a class="toc-group" href="#d0e1458">Undo/redo</a> · <a class="toc-group" href="#d0e1502">Clipboard</a> · <a class="toc-group" href="#d0e1590">Duplicate</a> · <a class="toc-group" href="#d0e1609">Clone</a> · <a class="toc-group" href="#d0e1662">Bitmaps</a> · <a class="toc-group" href="#d0e1699">Patterns</a> · <a class="toc-group" href="#d0e1733">Group</a> · <a class="toc-group" href="#d0e1784">Z-order</a>
3437- <span class="toc-section"> | </span>
3438- <a class="toc-section" href="#d0e1819">Path</a>
3439- <span class="toc-section"> · </span>
3440- <a class="toc-group" href="#d0e1824">Convert to path</a> · <a class="toc-group" href="#d0e1854">Boolean operations</a> · <a class="toc-group" href="#d0e1946">Offsets</a> · <a class="toc-group" href="#d0e2063">Combine</a> · <a class="toc-group" href="#d0e2103">Simplify</a>
3441- <span class="toc-section"> | </span>
3442- <a class="toc-section" href="#d0e2132">Selector</a>
3443- <span class="toc-section"> · </span>
3444- <a class="toc-group" href="#d0e2137">Select (mouse)</a> · <a class="toc-group" href="#d0e2185">Rubberband, touch selection</a> · <a class="toc-group" href="#d0e2244">Select (keyboard)</a> · <a class="toc-group" href="#d0e2346">Select within group, select under</a> · <a class="toc-group" href="#d0e2460">Move (mouse)</a> · <a class="toc-group" href="#d0e2534">Move (keyboard)</a> · <a class="toc-group" href="#d0e2585">Transform (mouse)</a> · <a class="toc-group" href="#d0e2618">Scale by handles</a> · <a class="toc-group" href="#d0e2669">Scale (keyboard)</a> · <a class="toc-group" href="#d0e2773">Rotate/skew by handles</a> · <a class="toc-group" href="#d0e2812">Rotate (keyboard)</a> · <a class="toc-group" href="#d0e2870">Flip</a> · <a class="toc-group" href="#d0e2893">Rotation center</a> · <a class="toc-group" href="#d0e2932">Cancel</a>
3445- <span class="toc-section"> | </span>
3446- <a class="toc-section" href="#d0e2952">Node tool</a>
3447- <span class="toc-section"> · </span>
3448- <a class="toc-group" href="#d0e2957">Select objects (mouse)</a> · <a class="toc-group" href="#d0e2993">Select nodes (mouse)</a> · <a class="toc-group" href="#d0e3042">Rubberband selection</a> · <a class="toc-group" href="#d0e3074">Select nodes (keyboard)</a> · <a class="toc-group" href="#d0e3157">Grow/shrink node selection</a> · <a class="toc-group" href="#d0e3217">Move nodes (mouse)</a> · <a class="toc-group" href="#d0e3316">Move nodes (keyboard)</a> · <a class="toc-group" href="#d0e3367">Move node handle (mouse)</a> · <a class="toc-group" href="#d0e3429">Scale handle (1 node selected)</a> · <a class="toc-group" href="#d0e3535">Rotate handle (1 node selected)</a> · <a class="toc-group" href="#d0e3621">Handles visibility</a> · <a class="toc-group" href="#d0e3637">Scale nodes (&gt;1 nodes selected)</a> · <a class="toc-group" href="#d0e3713">Rotate nodes (&gt;1 nodes selected)</a> · <a class="toc-group" href="#d0e3757">Flip nodes (&gt;1 nodes selected)</a> · <a class="toc-group" href="#d0e3783">Change segment(s)</a> · <a class="toc-group" href="#d0e3812">Change node type</a> · <a class="toc-group" href="#d0e3877">Join/break</a> · <a class="toc-group" href="#d0e3922">Delete, create, duplicate</a> · <a class="toc-group" href="#d0e4032">Reverse</a> · <a class="toc-group" href="#d0e4048">Edit shapes</a> · <a class="toc-group" href="#d0e4060">Edit fills and path effects</a> · <a class="toc-group" href="#d0e4069">Cancel</a>
3449- <span class="toc-section"> | </span>
3450- <a class="toc-section" href="#d0e4089">Tweak tool</a>
3451- <span class="toc-section"> · </span>
3452- <a class="toc-group" href="#d0e4094">Operation</a> · <a class="toc-group" href="#d0e4142">Modes</a> · <a class="toc-group" href="#d0e4368">Parameters</a>
3453- <span class="toc-section"> | </span>
3454- <a class="toc-section" href="#d0e4411">Zoom tool</a>
3455- <span class="toc-section"> | </span>
3456- <a class="toc-section" href="#d0e4444">Rectangle tool</a>
3457- <span class="toc-section"> · </span>
3458- <a class="toc-group" href="#d0e4449">Draw</a> · <a class="toc-group" href="#d0e4488">Select</a> · <a class="toc-group" href="#d0e4540">Resize by handles</a> · <a class="toc-group" href="#d0e4569">Round corners by handles</a>
3459- <span class="toc-section"> | </span>
3460- <a class="toc-section" href="#d0e4622">3D box tool</a>
3461- <span class="toc-section"> · </span>
3462- <a class="toc-group" href="#d0e4627">Draw</a> · <a class="toc-group" href="#d0e4650">Select</a> · <a class="toc-group" href="#d0e4699">Edit by handles</a> · <a class="toc-group" href="#d0e4738">Edit perspectives</a>
3463- <span class="toc-section"> | </span>
3464- <a class="toc-section" href="#d0e4838">Ellipse tool</a>
3465- <span class="toc-section"> · </span>
3466- <a class="toc-group" href="#d0e4843">Draw</a> · <a class="toc-group" href="#d0e4903">Select</a> · <a class="toc-group" href="#d0e4955">Edit by handles</a>
3467- <span class="toc-section"> | </span>
3468- <a class="toc-section" href="#d0e5008">Star tool</a>
3469- <span class="toc-section"> · </span>
3470- <a class="toc-group" href="#d0e5013">Draw</a> · <a class="toc-group" href="#d0e5039">Select</a> · <a class="toc-group" href="#d0e5091">Edit by handles</a>
3471- <span class="toc-section"> | </span>
3472- <a class="toc-section" href="#d0e5164">Spiral tool</a>
3473- <span class="toc-section"> · </span>
3474- <a class="toc-group" href="#d0e5169">Draw</a> · <a class="toc-group" href="#d0e5195">Select</a> · <a class="toc-group" href="#d0e5246">Edit by handles</a>
3475- <span class="toc-section"> | </span>
3476- <a class="toc-section" href="#d0e5347">Pencil tool</a>
3477- <span class="toc-section"> · </span>
3478- <a class="toc-group" href="#d0e5398">Create dots</a>
3479- <span class="toc-section"> | </span>
3480- <a class="toc-section" href="#d0e5442">Pen (Bezier) tool</a>
3481- <span class="toc-section"> · </span>
3482- <a class="toc-group" href="#d0e5447">Create nodes</a> · <a class="toc-group" href="#d0e5511">Move last node</a> · <a class="toc-group" href="#d0e5565">Create/modify segments</a> · <a class="toc-group" href="#d0e5604">Create dots</a> · <a class="toc-group" href="#d0e5647">Finish</a> · <a class="toc-group" href="#d0e5680">Cancel</a>
3483- <span class="toc-section"> | </span>
3484- <a class="toc-section" href="#d0e5710">Calligraphy tool</a>
3485- <span class="toc-section"> | </span>
3486- <a class="toc-section" href="#d0e5808">Text tool</a>
3487- <span class="toc-section"> · </span>
3488- <a class="toc-group" href="#d0e5813">Select/create</a> · <a class="toc-group" href="#d0e5841">Navigate in text</a> · <a class="toc-group" href="#d0e5930">Flowed text (internal frame)</a> · <a class="toc-group" href="#d0e5969">Flowed text (external frame)</a> · <a class="toc-group" href="#d0e6019">Text on path</a> · <a class="toc-group" href="#d0e6038">Edit text</a> · <a class="toc-group" href="#d0e6092">Select text</a> · <a class="toc-group" href="#d0e6220">Style selection</a> · <a class="toc-group" href="#d0e6249">Letter spacing</a> · <a class="toc-group" href="#d0e6305">Line spacing</a> · <a class="toc-group" href="#d0e6369">Kerning and shifting</a> · <a class="toc-group" href="#d0e6409">Rotate</a>
3489- <span class="toc-section"> | </span>
3490- <a class="toc-section" href="#d0e6459">Spray tool</a>
3491- <span class="toc-section"> · </span>
3492- <a class="toc-group" href="#d0e6464">Modes</a> · <a class="toc-group" href="#d0e6500">Parameters</a>
3493- <span class="toc-section"> | </span>
3494- <a class="toc-section" href="#d0e6540">Eraser tool</a>
3495- <span class="toc-section"> | </span>
3496- <a class="toc-section" href="#d0e6571">Paint Bucket</a>
3497- <span class="toc-section"> | </span>
3498- <a class="toc-section" href="#d0e6654">Gradient tool</a>
3499- <span class="toc-section"> · </span>
3500- <a class="toc-group" href="#d0e6659">Select objects</a> · <a class="toc-group" href="#d0e6692">Create gradients</a> · <a class="toc-group" href="#d0e6721">Select handles</a> · <a class="toc-group" href="#d0e6791">Create/delete intermediate stops</a> · <a class="toc-group" href="#d0e6854">Move handles/stops</a> · <a class="toc-group" href="#d0e6944">Reverse</a> · <a class="toc-group" href="#d0e6965">Gradient editor</a>
3501- <span class="toc-section"> | </span>
3502- <a class="toc-section" href="#d0e6985">Dropper tool</a>
3503+ <a class="toc-group" href="#d0e1458">Undo/redo</a> · <a class="toc-group" href="#d0e1502">Clipboard</a> · <a class="toc-group" href="#d0e1590">Duplicate</a> · <a class="toc-group" href="#d0e1609">Clone</a> · <a class="toc-group" href="#d0e1662">Bitmaps</a> · <a class="toc-group" href="#d0e1699">Patterns</a> · <a class="toc-group" href="#d0e1733">Guides</a> · <a class="toc-group" href="#d0e1749">Group</a> · <a class="toc-group" href="#d0e1800">Z-order</a>
3504+ <span class="toc-section"> | </span>
3505+ <a class="toc-section" href="#d0e1835">Path</a>
3506+ <span class="toc-section"> · </span>
3507+ <a class="toc-group" href="#d0e1840">Convert to path</a> · <a class="toc-group" href="#d0e1870">Boolean operations</a> · <a class="toc-group" href="#d0e1962">Offsets</a> · <a class="toc-group" href="#d0e2079">Combine</a> · <a class="toc-group" href="#d0e2119">Simplify</a>
3508+ <span class="toc-section"> | </span>
3509+ <a class="toc-section" href="#d0e2148">Selector</a>
3510+ <span class="toc-section"> · </span>
3511+ <a class="toc-group" href="#d0e2153">Select (mouse)</a> · <a class="toc-group" href="#d0e2201">Rubberband, touch selection</a> · <a class="toc-group" href="#d0e2260">Select (keyboard)</a> · <a class="toc-group" href="#d0e2362">Select within group, select under</a> · <a class="toc-group" href="#d0e2476">Move (mouse)</a> · <a class="toc-group" href="#d0e2550">Move (keyboard)</a> · <a class="toc-group" href="#d0e2601">Transform (mouse)</a> · <a class="toc-group" href="#d0e2634">Scale by handles</a> · <a class="toc-group" href="#d0e2685">Scale (keyboard)</a> · <a class="toc-group" href="#d0e2789">Rotate/skew by handles</a> · <a class="toc-group" href="#d0e2828">Rotate (keyboard)</a> · <a class="toc-group" href="#d0e2886">Flip</a> · <a class="toc-group" href="#d0e2909">Rotation center</a> · <a class="toc-group" href="#d0e2948">Cancel</a>
3512+ <span class="toc-section"> | </span>
3513+ <a class="toc-section" href="#d0e2968">Node tool</a>
3514+ <span class="toc-section"> · </span>
3515+ <a class="toc-group" href="#d0e2973">Select objects (mouse)</a> · <a class="toc-group" href="#d0e3009">Select nodes (mouse)</a> · <a class="toc-group" href="#d0e3058">Rubberband selection</a> · <a class="toc-group" href="#d0e3090">Select nodes (keyboard)</a> · <a class="toc-group" href="#d0e3173">Grow/shrink node selection</a> · <a class="toc-group" href="#d0e3233">Move nodes (mouse)</a> · <a class="toc-group" href="#d0e3332">Move nodes (keyboard)</a> · <a class="toc-group" href="#d0e3383">Move node handle (mouse)</a> · <a class="toc-group" href="#d0e3445">Scale handle (1 node selected)</a> · <a class="toc-group" href="#d0e3551">Rotate handle (1 node selected)</a> · <a class="toc-group" href="#d0e3637">Handles visibility</a> · <a class="toc-group" href="#d0e3653">Scale nodes (&gt;1 nodes selected)</a> · <a class="toc-group" href="#d0e3729">Rotate nodes (&gt;1 nodes selected)</a> · <a class="toc-group" href="#d0e3773">Flip nodes (&gt;1 nodes selected)</a> · <a class="toc-group" href="#d0e3799">Change segment(s)</a> · <a class="toc-group" href="#d0e3828">Change node type</a> · <a class="toc-group" href="#d0e3893">Join/break</a> · <a class="toc-group" href="#d0e3938">Delete, create, duplicate</a> · <a class="toc-group" href="#d0e4048">Reverse</a> · <a class="toc-group" href="#d0e4064">Edit shapes</a> · <a class="toc-group" href="#d0e4076">Edit fills and path effects</a> · <a class="toc-group" href="#d0e4085">Cancel</a>
3516+ <span class="toc-section"> | </span>
3517+ <a class="toc-section" href="#d0e4105">Tweak tool</a>
3518+ <span class="toc-section"> · </span>
3519+ <a class="toc-group" href="#d0e4110">Operation</a> · <a class="toc-group" href="#d0e4158">Modes</a> · <a class="toc-group" href="#d0e4384">Parameters</a>
3520+ <span class="toc-section"> | </span>
3521+ <a class="toc-section" href="#d0e4427">Zoom tool</a>
3522+ <span class="toc-section"> | </span>
3523+ <a class="toc-section" href="#d0e4460">Rectangle tool</a>
3524+ <span class="toc-section"> · </span>
3525+ <a class="toc-group" href="#d0e4465">Draw</a> · <a class="toc-group" href="#d0e4504">Select</a> · <a class="toc-group" href="#d0e4556">Resize by handles</a> · <a class="toc-group" href="#d0e4585">Round corners by handles</a>
3526+ <span class="toc-section"> | </span>
3527+ <a class="toc-section" href="#d0e4638">3D box tool</a>
3528+ <span class="toc-section"> · </span>
3529+ <a class="toc-group" href="#d0e4643">Draw</a> · <a class="toc-group" href="#d0e4666">Select</a> · <a class="toc-group" href="#d0e4715">Edit by handles</a> · <a class="toc-group" href="#d0e4754">Edit perspectives</a>
3530+ <span class="toc-section"> | </span>
3531+ <a class="toc-section" href="#d0e4854">Ellipse tool</a>
3532+ <span class="toc-section"> · </span>
3533+ <a class="toc-group" href="#d0e4859">Draw</a> · <a class="toc-group" href="#d0e4919">Select</a> · <a class="toc-group" href="#d0e4971">Edit by handles</a>
3534+ <span class="toc-section"> | </span>
3535+ <a class="toc-section" href="#d0e5024">Star tool</a>
3536+ <span class="toc-section"> · </span>
3537+ <a class="toc-group" href="#d0e5029">Draw</a> · <a class="toc-group" href="#d0e5055">Select</a> · <a class="toc-group" href="#d0e5107">Edit by handles</a>
3538+ <span class="toc-section"> | </span>
3539+ <a class="toc-section" href="#d0e5180">Spiral tool</a>
3540+ <span class="toc-section"> · </span>
3541+ <a class="toc-group" href="#d0e5185">Draw</a> · <a class="toc-group" href="#d0e5211">Select</a> · <a class="toc-group" href="#d0e5262">Edit by handles</a>
3542+ <span class="toc-section"> | </span>
3543+ <a class="toc-section" href="#d0e5363">Pencil tool</a>
3544+ <span class="toc-section"> · </span>
3545+ <a class="toc-group" href="#d0e5414">Create dots</a>
3546+ <span class="toc-section"> | </span>
3547+ <a class="toc-section" href="#d0e5458">Pen (Bezier) tool</a>
3548+ <span class="toc-section"> · </span>
3549+ <a class="toc-group" href="#d0e5463">Create nodes</a> · <a class="toc-group" href="#d0e5527">Move last node</a> · <a class="toc-group" href="#d0e5581">Create/modify segments</a> · <a class="toc-group" href="#d0e5620">Create dots</a> · <a class="toc-group" href="#d0e5663">Finish</a> · <a class="toc-group" href="#d0e5696">Cancel</a>
3550+ <span class="toc-section"> | </span>
3551+ <a class="toc-section" href="#d0e5726">Calligraphy tool</a>
3552+ <span class="toc-section"> | </span>
3553+ <a class="toc-section" href="#d0e5824">Text tool</a>
3554+ <span class="toc-section"> · </span>
3555+ <a class="toc-group" href="#d0e5829">Select/create</a> · <a class="toc-group" href="#d0e5857">Navigate in text</a> · <a class="toc-group" href="#d0e5946">Flowed text (internal frame)</a> · <a class="toc-group" href="#d0e5985">Flowed text (external frame)</a> · <a class="toc-group" href="#d0e6035">Text on path</a> · <a class="toc-group" href="#d0e6054">Edit text</a> · <a class="toc-group" href="#d0e6108">Select text</a> · <a class="toc-group" href="#d0e6236">Style selection</a> · <a class="toc-group" href="#d0e6265">Letter spacing</a> · <a class="toc-group" href="#d0e6321">Line spacing</a> · <a class="toc-group" href="#d0e6385">Kerning and shifting</a> · <a class="toc-group" href="#d0e6425">Rotate</a>
3556+ <span class="toc-section"> | </span>
3557+ <a class="toc-section" href="#d0e6475">Spray tool</a>
3558+ <span class="toc-section"> · </span>
3559+ <a class="toc-group" href="#d0e6480">Modes</a> · <a class="toc-group" href="#d0e6516">Parameters</a>
3560+ <span class="toc-section"> | </span>
3561+ <a class="toc-section" href="#d0e6556">Eraser tool</a>
3562+ <span class="toc-section"> | </span>
3563+ <a class="toc-section" href="#d0e6587">Paint Bucket</a>
3564+ <span class="toc-section"> | </span>
3565+ <a class="toc-section" href="#d0e6670">Gradient tool</a>
3566+ <span class="toc-section"> · </span>
3567+ <a class="toc-group" href="#d0e6675">Select objects</a> · <a class="toc-group" href="#d0e6708">Create gradients</a> · <a class="toc-group" href="#d0e6737">Select handles</a> · <a class="toc-group" href="#d0e6807">Create/delete intermediate stops</a> · <a class="toc-group" href="#d0e6870">Move handles/stops</a> · <a class="toc-group" href="#d0e6960">Reverse</a> · <a class="toc-group" href="#d0e6981">Gradient editor</a>
3568+ <span class="toc-section"> | </span>
3569+ <a class="toc-section" href="#d0e7001">Dropper tool</a>
3570 <span class="toc-section"/>
3571 </div>
3572 <div class="chapter">
3573@@ -2143,7 +2143,28 @@
3574 <tr>
3575 <td colspan="2">
3576 <h3>
3577- <a name="d0e1733"/>Group</h3>
3578+ <a name="d0e1733"/>Guides</h3>
3579+ </td>
3580+ </tr>
3581+
3582+ <tr>
3583+ <td class="keys">
3584+ <span class="shortcut">
3585+ <span class="keypad">Shift</span>
3586+ <span class="plussign">+</span>G</span>
3587+ </td>
3588+ <td>
3589+ <span class="action">object(s) to guide(s)</span>
3590+ </td>
3591+ </tr>
3592+
3593+
3594+
3595+
3596+ <tr>
3597+ <td colspan="2">
3598+ <h3>
3599+ <a name="d0e1749"/>Group</h3>
3600 </td>
3601 </tr>
3602
3603@@ -2197,7 +2218,7 @@
3604 <tr>
3605 <td colspan="2">
3606 <h3>
3607- <a name="d0e1784"/>Z-order</h3>
3608+ <a name="d0e1800"/>Z-order</h3>
3609 </td>
3610 </tr>
3611
3612@@ -2242,7 +2263,7 @@
3613 </table>
3614 </div>
3615 <div class="sect">
3616- <a name="d0e1819"/>
3617+ <a name="d0e1835"/>
3618 <h2>Path</h2>
3619 <table class="color10">
3620
3621@@ -2252,7 +2273,7 @@
3622 <tr>
3623 <td colspan="2">
3624 <h3>
3625- <a name="d0e1824"/>Convert to path</h3>
3626+ <a name="d0e1840"/>Convert to path</h3>
3627 </td>
3628 </tr>
3629
3630@@ -2288,7 +2309,7 @@
3631 <tr>
3632 <td colspan="2">
3633 <h3>
3634- <a name="d0e1854"/>Boolean operations</h3>
3635+ <a name="d0e1870"/>Boolean operations</h3>
3636 </td>
3637 </tr>
3638
3639@@ -2414,7 +2435,7 @@
3640 <tr>
3641 <td colspan="2">
3642 <h3>
3643- <a name="d0e1946"/>Offsets</h3>
3644+ <a name="d0e1962"/>Offsets</h3>
3645 </td>
3646 </tr>
3647
3648@@ -2559,7 +2580,7 @@
3649 <tr>
3650 <td colspan="2">
3651 <h3>
3652- <a name="d0e2063"/>Combine</h3>
3653+ <a name="d0e2079"/>Combine</h3>
3654 </td>
3655 </tr>
3656
3657@@ -2617,7 +2638,7 @@
3658 <tr>
3659 <td colspan="2">
3660 <h3>
3661- <a name="d0e2103"/>Simplify</h3>
3662+ <a name="d0e2119"/>Simplify</h3>
3663 </td>
3664 </tr>
3665
3666@@ -2655,7 +2676,7 @@
3667 </table>
3668 </div>
3669 <div class="sect">
3670- <a name="d0e2132"/>
3671+ <a name="d0e2148"/>
3672 <h2>Selector</h2>
3673 <table class="color11">
3674
3675@@ -2665,7 +2686,7 @@
3676 <tr>
3677 <td colspan="2">
3678 <h3>
3679- <a name="d0e2137"/>Select (mouse)</h3>
3680+ <a name="d0e2153"/>Select (mouse)</h3>
3681 </td>
3682 </tr>
3683
3684@@ -2734,7 +2755,7 @@
3685 <tr>
3686 <td colspan="2">
3687 <h3>
3688- <a name="d0e2185"/>Rubberband, touch selection</h3>
3689+ <a name="d0e2201"/>Rubberband, touch selection</h3>
3690 </td>
3691 </tr>
3692
3693@@ -2816,7 +2837,7 @@
3694 <tr>
3695 <td colspan="2">
3696 <h3>
3697- <a name="d0e2244"/>Select (keyboard)</h3>
3698+ <a name="d0e2260"/>Select (keyboard)</h3>
3699 </td>
3700 </tr>
3701
3702@@ -2957,7 +2978,7 @@
3703 <tr>
3704 <td colspan="2">
3705 <h3>
3706- <a name="d0e2346"/>Select within group, select under</h3>
3707+ <a name="d0e2362"/>Select within group, select under</h3>
3708 </td>
3709 </tr>
3710
3711@@ -3101,7 +3122,7 @@
3712 <tr>
3713 <td colspan="2">
3714 <h3>
3715- <a name="d0e2460"/>Move (mouse)</h3>
3716+ <a name="d0e2476"/>Move (mouse)</h3>
3717 </td>
3718 </tr>
3719
3720@@ -3204,7 +3225,7 @@
3721 <tr>
3722 <td colspan="2">
3723 <h3>
3724- <a name="d0e2534"/>Move (keyboard)</h3>
3725+ <a name="d0e2550"/>Move (keyboard)</h3>
3726 </td>
3727 </tr>
3728
3729@@ -3270,7 +3291,7 @@
3730 <tr>
3731 <td colspan="2">
3732 <h3>
3733- <a name="d0e2585"/>Transform (mouse)</h3>
3734+ <a name="d0e2601"/>Transform (mouse)</h3>
3735 </td>
3736 </tr>
3737
3738@@ -3310,7 +3331,7 @@
3739 <tr>
3740 <td colspan="2">
3741 <h3>
3742- <a name="d0e2618"/>Scale by handles</h3>
3743+ <a name="d0e2634"/>Scale by handles</h3>
3744 </td>
3745 </tr>
3746
3747@@ -3375,7 +3396,7 @@
3748 <tr>
3749 <td colspan="2">
3750 <h3>
3751- <a name="d0e2669"/>Scale (keyboard)</h3>
3752+ <a name="d0e2685"/>Scale (keyboard)</h3>
3753 </td>
3754 </tr>
3755
3756@@ -3479,7 +3500,7 @@
3757 <tr>
3758 <td colspan="2">
3759 <h3>
3760- <a name="d0e2773"/>Rotate/skew by handles</h3>
3761+ <a name="d0e2789"/>Rotate/skew by handles</h3>
3762 </td>
3763 </tr>
3764
3765@@ -3532,7 +3553,7 @@
3766 <tr>
3767 <td colspan="2">
3768 <h3>
3769- <a name="d0e2812"/>Rotate (keyboard)</h3>
3770+ <a name="d0e2828"/>Rotate (keyboard)</h3>
3771 </td>
3772 </tr>
3773
3774@@ -3598,7 +3619,7 @@
3775 <tr>
3776 <td colspan="2">
3777 <h3>
3778- <a name="d0e2870"/>Flip</h3>
3779+ <a name="d0e2886"/>Flip</h3>
3780 </td>
3781 </tr>
3782
3783@@ -3632,7 +3653,7 @@
3784 <tr>
3785 <td colspan="2">
3786 <h3>
3787- <a name="d0e2893"/>Rotation center</h3>
3788+ <a name="d0e2909"/>Rotation center</h3>
3789 </td>
3790 </tr>
3791
3792@@ -3685,7 +3706,7 @@
3793 <tr>
3794 <td colspan="2">
3795 <h3>
3796- <a name="d0e2932"/>Cancel</h3>
3797+ <a name="d0e2948"/>Cancel</h3>
3798 </td>
3799 </tr>
3800
3801@@ -3709,7 +3730,7 @@
3802 </table>
3803 </div>
3804 <div class="sect">
3805- <a name="d0e2952"/>
3806+ <a name="d0e2968"/>
3807 <h2>Node tool</h2>
3808 <table class="color12">
3809
3810@@ -3719,7 +3740,7 @@
3811 <tr>
3812 <td colspan="2">
3813 <h3>
3814- <a name="d0e2957"/>Select objects (mouse)</h3>
3815+ <a name="d0e2973"/>Select objects (mouse)</h3>
3816 </td>
3817 </tr>
3818
3819@@ -3766,7 +3787,7 @@
3820 <tr>
3821 <td colspan="2">
3822 <h3>
3823- <a name="d0e2993"/>Select nodes (mouse)</h3>
3824+ <a name="d0e3009"/>Select nodes (mouse)</h3>
3825 </td>
3826 </tr>
3827
3828@@ -3838,7 +3859,7 @@
3829 <tr>
3830 <td colspan="2">
3831 <h3>
3832- <a name="d0e3042"/>Rubberband selection</h3>
3833+ <a name="d0e3058"/>Rubberband selection</h3>
3834 </td>
3835 </tr>
3836
3837@@ -3886,7 +3907,7 @@
3838 <tr>
3839 <td colspan="2">
3840 <h3>
3841- <a name="d0e3074"/>Select nodes (keyboard)</h3>
3842+ <a name="d0e3090"/>Select nodes (keyboard)</h3>
3843 </td>
3844 </tr>
3845
3846@@ -3999,7 +4020,7 @@
3847 <tr>
3848 <td colspan="2">
3849 <h3>
3850- <a name="d0e3157"/>Grow/shrink node selection</h3>
3851+ <a name="d0e3173"/>Grow/shrink node selection</h3>
3852 </td>
3853 </tr>
3854
3855@@ -4071,7 +4092,7 @@
3856 <tr>
3857 <td colspan="2">
3858 <h3>
3859- <a name="d0e3217"/>Move nodes (mouse)</h3>
3860+ <a name="d0e3233"/>Move nodes (mouse)</h3>
3861 </td>
3862 </tr>
3863
3864@@ -4204,7 +4225,7 @@
3865 <tr>
3866 <td colspan="2">
3867 <h3>
3868- <a name="d0e3316"/>Move nodes (keyboard)</h3>
3869+ <a name="d0e3332"/>Move nodes (keyboard)</h3>
3870 </td>
3871 </tr>
3872
3873@@ -4270,7 +4291,7 @@
3874 <tr>
3875 <td colspan="2">
3876 <h3>
3877- <a name="d0e3367"/>Move node handle (mouse)</h3>
3878+ <a name="d0e3383"/>Move node handle (mouse)</h3>
3879 </td>
3880 </tr>
3881
3882@@ -4351,7 +4372,7 @@
3883 <tr>
3884 <td colspan="2">
3885 <h3>
3886- <a name="d0e3429"/>Scale handle (1 node selected)</h3>
3887+ <a name="d0e3445"/>Scale handle (1 node selected)</h3>
3888 </td>
3889 </tr>
3890
3891@@ -4445,7 +4466,7 @@
3892 <tr>
3893 <td colspan="2">
3894 <h3>
3895- <a name="d0e3535"/>Rotate handle (1 node selected)</h3>
3896+ <a name="d0e3551"/>Rotate handle (1 node selected)</h3>
3897 </td>
3898 </tr>
3899
3900@@ -4527,7 +4548,7 @@
3901 <tr>
3902 <td colspan="2">
3903 <h3>
3904- <a name="d0e3621"/>Handles visibility</h3>
3905+ <a name="d0e3637"/>Handles visibility</h3>
3906 </td>
3907 </tr>
3908
3909@@ -4547,7 +4568,7 @@
3910 <tr>
3911 <td colspan="2">
3912 <h3>
3913- <a name="d0e3637"/>Scale nodes (&gt;1 nodes selected)</h3>
3914+ <a name="d0e3653"/>Scale nodes (&gt;1 nodes selected)</h3>
3915 </td>
3916 </tr>
3917
3918@@ -4635,7 +4656,7 @@
3919 <tr>
3920 <td colspan="2">
3921 <h3>
3922- <a name="d0e3713"/>Rotate nodes (&gt;1 nodes selected)</h3>
3923+ <a name="d0e3729"/>Rotate nodes (&gt;1 nodes selected)</h3>
3924 </td>
3925 </tr>
3926
3927@@ -4693,7 +4714,7 @@
3928 <tr>
3929 <td colspan="2">
3930 <h3>
3931- <a name="d0e3757"/>Flip nodes (&gt;1 nodes selected)</h3>
3932+ <a name="d0e3773"/>Flip nodes (&gt;1 nodes selected)</h3>
3933 </td>
3934 </tr>
3935
3936@@ -4733,7 +4754,7 @@
3937 <tr>
3938 <td colspan="2">
3939 <h3>
3940- <a name="d0e3783"/>Change segment(s)</h3>
3941+ <a name="d0e3799"/>Change segment(s)</h3>
3942 </td>
3943 </tr>
3944
3945@@ -4771,7 +4792,7 @@
3946 <tr>
3947 <td colspan="2">
3948 <h3>
3949- <a name="d0e3812"/>Change node type</h3>
3950+ <a name="d0e3828"/>Change node type</h3>
3951 </td>
3952 </tr>
3953
3954@@ -4855,7 +4876,7 @@
3955 <tr>
3956 <td colspan="2">
3957 <h3>
3958- <a name="d0e3877"/>Join/break</h3>
3959+ <a name="d0e3893"/>Join/break</h3>
3960 </td>
3961 </tr>
3962
3963@@ -4916,7 +4937,7 @@
3964 <tr>
3965 <td colspan="2">
3966 <h3>
3967- <a name="d0e3922"/>Delete, create, duplicate</h3>
3968+ <a name="d0e3938"/>Delete, create, duplicate</h3>
3969 </td>
3970 </tr>
3971
3972@@ -5051,7 +5072,7 @@
3973 <tr>
3974 <td colspan="2">
3975 <h3>
3976- <a name="d0e4032"/>Reverse</h3>
3977+ <a name="d0e4048"/>Reverse</h3>
3978 </td>
3979 </tr>
3980
3981@@ -5072,7 +5093,7 @@
3982 <tr>
3983 <td colspan="2">
3984 <h3>
3985- <a name="d0e4048"/>Edit shapes</h3>
3986+ <a name="d0e4064"/>Edit shapes</h3>
3987 </td>
3988 </tr>
3989
3990@@ -5094,7 +5115,7 @@
3991 <tr>
3992 <td colspan="2">
3993 <h3>
3994- <a name="d0e4060"/>Edit fills and path effects</h3>
3995+ <a name="d0e4076"/>Edit fills and path effects</h3>
3996 </td>
3997 </tr>
3998
3999@@ -5110,7 +5131,7 @@
4000 <tr>
4001 <td colspan="2">
4002 <h3>
4003- <a name="d0e4069"/>Cancel</h3>
4004+ <a name="d0e4085"/>Cancel</h3>
4005 </td>
4006 </tr>
4007
4008@@ -5134,7 +5155,7 @@
4009 </table>
4010 </div>
4011 <div class="sect">
4012- <a name="d0e4089"/>
4013+ <a name="d0e4105"/>
4014 <h2>Tweak tool</h2>
4015 <table class="color13">
4016
4017@@ -5144,7 +5165,7 @@
4018 <tr>
4019 <td colspan="2">
4020 <h3>
4021- <a name="d0e4094"/>Operation</h3>
4022+ <a name="d0e4110"/>Operation</h3>
4023 </td>
4024 </tr>
4025
4026@@ -5204,7 +5225,7 @@
4027 <tr>
4028 <td colspan="2">
4029 <h3>
4030- <a name="d0e4142"/>Modes</h3>
4031+ <a name="d0e4158"/>Modes</h3>
4032 </td>
4033 </tr>
4034
4035@@ -5417,7 +5438,7 @@
4036 <tr>
4037 <td colspan="2">
4038 <h3>
4039- <a name="d0e4368"/>Parameters</h3>
4040+ <a name="d0e4384"/>Parameters</h3>
4041 </td>
4042 </tr>
4043
4044@@ -5462,7 +5483,7 @@
4045 </table>
4046 </div>
4047 <div class="sect">
4048- <a name="d0e4411"/>
4049+ <a name="d0e4427"/>
4050 <h2>Zoom tool</h2>
4051 <table class="color14">
4052
4053@@ -5502,7 +5523,7 @@
4054 </table>
4055 </div>
4056 <div class="sect">
4057- <a name="d0e4444"/>
4058+ <a name="d0e4460"/>
4059 <h2>Rectangle tool</h2>
4060 <table class="color15">
4061
4062@@ -5512,7 +5533,7 @@
4063 <tr>
4064 <td colspan="2">
4065 <h3>
4066- <a name="d0e4449"/>Draw</h3>
4067+ <a name="d0e4465"/>Draw</h3>
4068 </td>
4069 </tr>
4070
4071@@ -5565,7 +5586,7 @@
4072 <tr>
4073 <td colspan="2">
4074 <h3>
4075- <a name="d0e4488"/>Select</h3>
4076+ <a name="d0e4504"/>Select</h3>
4077 </td>
4078 </tr>
4079
4080@@ -5626,7 +5647,7 @@
4081 <tr>
4082 <td colspan="2">
4083 <h3>
4084- <a name="d0e4540"/>Resize by handles</h3>
4085+ <a name="d0e4556"/>Resize by handles</h3>
4086 </td>
4087 </tr>
4088
4089@@ -5668,7 +5689,7 @@
4090 <tr>
4091 <td colspan="2">
4092 <h3>
4093- <a name="d0e4569"/>Round corners by handles</h3>
4094+ <a name="d0e4585"/>Round corners by handles</h3>
4095 </td>
4096 </tr>
4097
4098@@ -5737,7 +5758,7 @@
4099 </table>
4100 </div>
4101 <div class="sect">
4102- <a name="d0e4622"/>
4103+ <a name="d0e4638"/>
4104 <h2>3D box tool</h2>
4105 <table class="color16">
4106
4107@@ -5747,7 +5768,7 @@
4108 <tr>
4109 <td colspan="2">
4110 <h3>
4111- <a name="d0e4627"/>Draw</h3>
4112+ <a name="d0e4643"/>Draw</h3>
4113 </td>
4114 </tr>
4115
4116@@ -5777,7 +5798,7 @@
4117 <tr>
4118 <td colspan="2">
4119 <h3>
4120- <a name="d0e4650"/>Select</h3>
4121+ <a name="d0e4666"/>Select</h3>
4122 </td>
4123 </tr>
4124
4125@@ -5832,7 +5853,7 @@
4126 <tr>
4127 <td colspan="2">
4128 <h3>
4129- <a name="d0e4699"/>Edit by handles</h3>
4130+ <a name="d0e4715"/>Edit by handles</h3>
4131 </td>
4132 </tr>
4133
4134@@ -5885,7 +5906,7 @@
4135 <tr>
4136 <td colspan="2">
4137 <h3>
4138- <a name="d0e4738"/>Edit perspectives</h3>
4139+ <a name="d0e4754"/>Edit perspectives</h3>
4140 </td>
4141 </tr>
4142
4143@@ -5989,7 +6010,7 @@
4144 </table>
4145 </div>
4146 <div class="sect">
4147- <a name="d0e4838"/>
4148+ <a name="d0e4854"/>
4149 <h2>Ellipse tool</h2>
4150 <table class="color17">
4151
4152@@ -5999,7 +6020,7 @@
4153 <tr>
4154 <td colspan="2">
4155 <h3>
4156- <a name="d0e4843"/>Draw</h3>
4157+ <a name="d0e4859"/>Draw</h3>
4158 </td>
4159 </tr>
4160
4161@@ -6083,7 +6104,7 @@
4162 <tr>
4163 <td colspan="2">
4164 <h3>
4165- <a name="d0e4903"/>Select</h3>
4166+ <a name="d0e4919"/>Select</h3>
4167 </td>
4168 </tr>
4169
4170@@ -6144,7 +6165,7 @@
4171 <tr>
4172 <td colspan="2">
4173 <h3>
4174- <a name="d0e4955"/>Edit by handles</h3>
4175+ <a name="d0e4971"/>Edit by handles</h3>
4176 </td>
4177 </tr>
4178
4179@@ -6213,7 +6234,7 @@
4180 </table>
4181 </div>
4182 <div class="sect">
4183- <a name="d0e5008"/>
4184+ <a name="d0e5024"/>
4185 <h2>Star tool</h2>
4186 <table class="color18">
4187
4188@@ -6223,7 +6244,7 @@
4189 <tr>
4190 <td colspan="2">
4191 <h3>
4192- <a name="d0e5013"/>Draw</h3>
4193+ <a name="d0e5029"/>Draw</h3>
4194 </td>
4195 </tr>
4196
4197@@ -6259,7 +6280,7 @@
4198 <tr>
4199 <td colspan="2">
4200 <h3>
4201- <a name="d0e5039"/>Select</h3>
4202+ <a name="d0e5055"/>Select</h3>
4203 </td>
4204 </tr>
4205
4206@@ -6320,7 +6341,7 @@
4207 <tr>
4208 <td colspan="2">
4209 <h3>
4210- <a name="d0e5091"/>Edit by handles</h3>
4211+ <a name="d0e5107"/>Edit by handles</h3>
4212 </td>
4213 </tr>
4214
4215@@ -6397,7 +6418,7 @@
4216 </table>
4217 </div>
4218 <div class="sect">
4219- <a name="d0e5164"/>
4220+ <a name="d0e5180"/>
4221 <h2>Spiral tool</h2>
4222 <table class="color19">
4223
4224@@ -6407,7 +6428,7 @@
4225 <tr>
4226 <td colspan="2">
4227 <h3>
4228- <a name="d0e5169"/>Draw</h3>
4229+ <a name="d0e5185"/>Draw</h3>
4230 </td>
4231 </tr>
4232
4233@@ -6443,7 +6464,7 @@
4234 <tr>
4235 <td colspan="2">
4236 <h3>
4237- <a name="d0e5195"/>Select</h3>
4238+ <a name="d0e5211"/>Select</h3>
4239 </td>
4240 </tr>
4241
4242@@ -6504,7 +6525,7 @@
4243 <tr>
4244 <td colspan="2">
4245 <h3>
4246- <a name="d0e5246"/>Edit by handles</h3>
4247+ <a name="d0e5262"/>Edit by handles</h3>
4248 </td>
4249 </tr>
4250
4251@@ -6629,7 +6650,7 @@
4252 </table>
4253 </div>
4254 <div class="sect">
4255- <a name="d0e5347"/>
4256+ <a name="d0e5363"/>
4257 <h2>Pencil tool</h2>
4258 <table class="color20">
4259
4260@@ -6696,7 +6717,7 @@
4261 <tr>
4262 <td colspan="2">
4263 <h3>
4264- <a name="d0e5398"/>Create dots</h3>
4265+ <a name="d0e5414"/>Create dots</h3>
4266 </td>
4267 </tr>
4268
4269@@ -6747,7 +6768,7 @@
4270 </table>
4271 </div>
4272 <div class="sect">
4273- <a name="d0e5442"/>
4274+ <a name="d0e5458"/>
4275 <h2>Pen (Bezier) tool</h2>
4276 <table class="color21">
4277
4278@@ -6757,7 +6778,7 @@
4279 <tr>
4280 <td colspan="2">
4281 <h3>
4282- <a name="d0e5447"/>Create nodes</h3>
4283+ <a name="d0e5463"/>Create nodes</h3>
4284 </td>
4285 </tr>
4286
4287@@ -6843,7 +6864,7 @@
4288 <tr>
4289 <td colspan="2">
4290 <h3>
4291- <a name="d0e5511"/>Move last node</h3>
4292+ <a name="d0e5527"/>Move last node</h3>
4293 </td>
4294 </tr>
4295
4296@@ -6915,7 +6936,7 @@
4297 <tr>
4298 <td colspan="2">
4299 <h3>
4300- <a name="d0e5565"/>Create/modify segments</h3>
4301+ <a name="d0e5581"/>Create/modify segments</h3>
4302 </td>
4303 </tr>
4304
4305@@ -6970,7 +6991,7 @@
4306 <tr>
4307 <td colspan="2">
4308 <h3>
4309- <a name="d0e5604"/>Create dots</h3>
4310+ <a name="d0e5620"/>Create dots</h3>
4311 </td>
4312 </tr>
4313
4314@@ -7023,7 +7044,7 @@
4315 <tr>
4316 <td colspan="2">
4317 <h3>
4318- <a name="d0e5647"/>Finish</h3>
4319+ <a name="d0e5663"/>Finish</h3>
4320 </td>
4321 </tr>
4322
4323@@ -7066,7 +7087,7 @@
4324 <tr>
4325 <td colspan="2">
4326 <h3>
4327- <a name="d0e5680"/>Cancel</h3>
4328+ <a name="d0e5696"/>Cancel</h3>
4329 </td>
4330 </tr>
4331
4332@@ -7097,7 +7118,7 @@
4333 </table>
4334 </div>
4335 <div class="sect">
4336- <a name="d0e5710"/>
4337+ <a name="d0e5726"/>
4338 <h2>Calligraphy tool</h2>
4339 <table class="color22">
4340
4341@@ -7214,7 +7235,7 @@
4342 </table>
4343 </div>
4344 <div class="sect">
4345- <a name="d0e5808"/>
4346+ <a name="d0e5824"/>
4347 <h2>Text tool</h2>
4348 <table class="color23">
4349
4350@@ -7224,7 +7245,7 @@
4351 <tr>
4352 <td colspan="2">
4353 <h3>
4354- <a name="d0e5813"/>Select/create</h3>
4355+ <a name="d0e5829"/>Select/create</h3>
4356 </td>
4357 </tr>
4358
4359@@ -7265,7 +7286,7 @@
4360 <tr>
4361 <td colspan="2">
4362 <h3>
4363- <a name="d0e5841"/>Navigate in text</h3>
4364+ <a name="d0e5857"/>Navigate in text</h3>
4365 </td>
4366 </tr>
4367
4368@@ -7352,7 +7373,7 @@
4369 <tr>
4370 <td colspan="2">
4371 <h3>
4372- <a name="d0e5930"/>Flowed text (internal frame)</h3>
4373+ <a name="d0e5946"/>Flowed text (internal frame)</h3>
4374 </td>
4375 </tr>
4376
4377@@ -7409,7 +7430,7 @@
4378 <tr>
4379 <td colspan="2">
4380 <h3>
4381- <a name="d0e5969"/>Flowed text (external frame)</h3>
4382+ <a name="d0e5985"/>Flowed text (external frame)</h3>
4383 </td>
4384 </tr>
4385
4386@@ -7478,7 +7499,7 @@
4387 <tr>
4388 <td colspan="2">
4389 <h3>
4390- <a name="d0e6019"/>Text on path</h3>
4391+ <a name="d0e6035"/>Text on path</h3>
4392 </td>
4393 </tr>
4394
4395@@ -7505,7 +7526,7 @@
4396 <tr>
4397 <td colspan="2">
4398 <h3>
4399- <a name="d0e6038"/>Edit text</h3>
4400+ <a name="d0e6054"/>Edit text</h3>
4401 </td>
4402 </tr>
4403
4404@@ -7588,7 +7609,7 @@
4405 <tr>
4406 <td colspan="2">
4407 <h3>
4408- <a name="d0e6092"/>Select text</h3>
4409+ <a name="d0e6108"/>Select text</h3>
4410 </td>
4411 </tr>
4412
4413@@ -7718,7 +7739,7 @@
4414 <tr>
4415 <td colspan="2">
4416 <h3>
4417- <a name="d0e6220"/>Style selection</h3>
4418+ <a name="d0e6236"/>Style selection</h3>
4419 </td>
4420 </tr>
4421
4422@@ -7756,7 +7777,7 @@
4423 <tr>
4424 <td colspan="2">
4425 <h3>
4426- <a name="d0e6249"/>Letter spacing</h3>
4427+ <a name="d0e6265"/>Letter spacing</h3>
4428 </td>
4429 </tr>
4430
4431@@ -7826,7 +7847,7 @@
4432 <tr>
4433 <td colspan="2">
4434 <h3>
4435- <a name="d0e6305"/>Line spacing</h3>
4436+ <a name="d0e6321"/>Line spacing</h3>
4437 </td>
4438 </tr>
4439
4440@@ -7904,7 +7925,7 @@
4441 <tr>
4442 <td colspan="2">
4443 <h3>
4444- <a name="d0e6369"/>Kerning and shifting</h3>
4445+ <a name="d0e6385"/>Kerning and shifting</h3>
4446 </td>
4447 </tr>
4448
4449@@ -7962,7 +7983,7 @@
4450 <tr>
4451 <td colspan="2">
4452 <h3>
4453- <a name="d0e6409"/>Rotate</h3>
4454+ <a name="d0e6425"/>Rotate</h3>
4455 </td>
4456 </tr>
4457
4458@@ -8017,7 +8038,7 @@
4459 </table>
4460 </div>
4461 <div class="sect">
4462- <a name="d0e6459"/>
4463+ <a name="d0e6475"/>
4464 <h2>Spray tool</h2>
4465 <table class="color24">
4466
4467@@ -8027,7 +8048,7 @@
4468 <tr>
4469 <td colspan="2">
4470 <h3>
4471- <a name="d0e6464"/>Modes</h3>
4472+ <a name="d0e6480"/>Modes</h3>
4473 </td>
4474 </tr>
4475
4476@@ -8070,7 +8091,7 @@
4477 <tr>
4478 <td colspan="2">
4479 <h3>
4480- <a name="d0e6500"/>Parameters</h3>
4481+ <a name="d0e6516"/>Parameters</h3>
4482 </td>
4483 </tr>
4484
4485@@ -8109,7 +8130,7 @@
4486 </table>
4487 </div>
4488 <div class="sect">
4489- <a name="d0e6540"/>
4490+ <a name="d0e6556"/>
4491 <h2>Eraser tool</h2>
4492 <table class="color25">
4493
4494@@ -8141,7 +8162,7 @@
4495 </table>
4496 </div>
4497 <div class="sect">
4498- <a name="d0e6571"/>
4499+ <a name="d0e6587"/>
4500 <h2>Paint Bucket</h2>
4501 <table class="color26">
4502
4503@@ -8253,7 +8274,7 @@
4504 </table>
4505 </div>
4506 <div class="sect">
4507- <a name="d0e6654"/>
4508+ <a name="d0e6670"/>
4509 <h2>Gradient tool</h2>
4510 <table class="color1">
4511
4512@@ -8263,7 +8284,7 @@
4513 <tr>
4514 <td colspan="2">
4515 <h3>
4516- <a name="d0e6659"/>Select objects</h3>
4517+ <a name="d0e6675"/>Select objects</h3>
4518 </td>
4519 </tr>
4520
4521@@ -8304,7 +8325,7 @@
4522 <tr>
4523 <td colspan="2">
4524 <h3>
4525- <a name="d0e6692"/>Create gradients</h3>
4526+ <a name="d0e6708"/>Create gradients</h3>
4527 </td>
4528 </tr>
4529
4530@@ -8344,7 +8365,7 @@
4531 <tr>
4532 <td colspan="2">
4533 <h3>
4534- <a name="d0e6721"/>Select handles</h3>
4535+ <a name="d0e6737"/>Select handles</h3>
4536 </td>
4537 </tr>
4538
4539@@ -8431,7 +8452,7 @@
4540 <tr>
4541 <td colspan="2">
4542 <h3>
4543- <a name="d0e6791"/>Create/delete intermediate stops</h3>
4544+ <a name="d0e6807"/>Create/delete intermediate stops</h3>
4545 </td>
4546 </tr>
4547
4548@@ -8512,7 +8533,7 @@
4549 <tr>
4550 <td colspan="2">
4551 <h3>
4552- <a name="d0e6854"/>Move handles/stops</h3>
4553+ <a name="d0e6870"/>Move handles/stops</h3>
4554 </td>
4555 </tr>
4556
4557@@ -8633,7 +8654,7 @@
4558 <tr>
4559 <td colspan="2">
4560 <h3>
4561- <a name="d0e6944"/>Reverse</h3>
4562+ <a name="d0e6960"/>Reverse</h3>
4563 </td>
4564 </tr>
4565
4566@@ -8661,7 +8682,7 @@
4567 <tr>
4568 <td colspan="2">
4569 <h3>
4570- <a name="d0e6965"/>Gradient editor</h3>
4571+ <a name="d0e6981"/>Gradient editor</h3>
4572 </td>
4573 </tr>
4574
4575@@ -8685,7 +8706,7 @@
4576 </table>
4577 </div>
4578 <div class="sect">
4579- <a name="d0e6985"/>
4580+ <a name="d0e7001"/>
4581 <h2>Dropper tool</h2>
4582 <table class="color2">
4583
4584
4585=== modified file 'doc/keys.fr.html'
4586--- doc/keys.fr.html 2011-07-10 11:35:30 +0000
4587+++ doc/keys.fr.html 2012-02-16 15:09:34 +0000
4588@@ -12,7 +12,7 @@
4589 <div id="header">
4590 <h1>Référence des raccourcis clavier d'Inkscape</h1>
4591 <div class="releaseinfo">Version 0.48</div>
4592- <div class="pubdate">Dernière mise à jour le 29 décembre 2010</div>
4593+ <div class="pubdate">Dernière mise à jour le 8 octobre 2011</div>
4594 </div>
4595 <div id="preface">
4596
4597@@ -47,73 +47,73 @@
4598 <span class="toc-section"> | </span>
4599 <a class="toc-section" href="#d0e1453">Objet</a>
4600 <span class="toc-section"> · </span>
4601- <a class="toc-group" href="#d0e1458">Annuler/rétablir</a> · <a class="toc-group" href="#d0e1502">Presse-papiers</a> · <a class="toc-group" href="#d0e1590">Dupliquer</a> · <a class="toc-group" href="#d0e1609">Cloner</a> · <a class="toc-group" href="#d0e1662">Bitmaps</a> · <a class="toc-group" href="#d0e1699">Motifs</a> · <a class="toc-group" href="#d0e1733">Grouper</a> · <a class="toc-group" href="#d0e1784">ordre dans le plan</a>
4602- <span class="toc-section"> | </span>
4603- <a class="toc-section" href="#d0e1819">Chemin</a>
4604- <span class="toc-section"> · </span>
4605- <a class="toc-group" href="#d0e1824">Convertir en chemin</a> · <a class="toc-group" href="#d0e1854">Opérations booléennes</a> · <a class="toc-group" href="#d0e1946">Offsets</a> · <a class="toc-group" href="#d0e2063">Combiner</a> · <a class="toc-group" href="#d0e2103">Simplifier</a>
4606- <span class="toc-section"> | </span>
4607- <a class="toc-section" href="#d0e2132">Sélecteur</a>
4608- <span class="toc-section"> · </span>
4609- <a class="toc-group" href="#d0e2137">Sélectionner (souris)</a> · <a class="toc-group" href="#d0e2185">Sélection par cliquer-glisser, sélection par le toucher</a> · <a class="toc-group" href="#d0e2244">Sélectionner (clavier)</a> · <a class="toc-group" href="#d0e2346">Sélectionner à l'intérieur d'un groupe ou sélectionner en dessous</a> · <a class="toc-group" href="#d0e2460">Déplacer (souris)</a> · <a class="toc-group" href="#d0e2534">Déplacer (clavier)</a> · <a class="toc-group" href="#d0e2585">Transformer (souris)</a> · <a class="toc-group" href="#d0e2618">Redimensionner avec les poignées</a> · <a class="toc-group" href="#d0e2669">Redimensionner (clavier)</a> · <a class="toc-group" href="#d0e2773">Tourner et incliner avec les poignées</a> · <a class="toc-group" href="#d0e2812">Tourner (clavier)</a> · <a class="toc-group" href="#d0e2870">Retourner</a> · <a class="toc-group" href="#d0e2893">Centre de rotation</a> · <a class="toc-group" href="#d0e2932">Annuler</a>
4610- <span class="toc-section"> | </span>
4611- <a class="toc-section" href="#d0e2952">Outil NÅ“ud</a>
4612- <span class="toc-section"> · </span>
4613- <a class="toc-group" href="#d0e2957">Sélectionner les objets (souris)</a> · <a class="toc-group" href="#d0e2993">Sélectionner les nœuds (souris)</a> · <a class="toc-group" href="#d0e3042">Sélection par cliquer-glisser</a> · <a class="toc-group" href="#d0e3074">Sélectionner les nœuds (clavier)</a> · <a class="toc-group" href="#d0e3157">Étendre ou restreindre la sélection de nœuds</a> · <a class="toc-group" href="#d0e3217">Déplacer les nœuds (souris)</a> · <a class="toc-group" href="#d0e3316">Déplacer les nœuds (clavier)</a> · <a class="toc-group" href="#d0e3367">Déplacer une poignée de nœud (souris)</a> · <a class="toc-group" href="#d0e3429">Redimensionner une poignée (un nœud sélectionné)</a> · <a class="toc-group" href="#d0e3535">Tourner la poignée (un nœud sélectionné)</a> · <a class="toc-group" href="#d0e3621">Affichage des poignées</a> · <a class="toc-group" href="#d0e3637">Redimensionner les nœuds (plus d'un nœud dans la sélection)</a> · <a class="toc-group" href="#d0e3713">Tourner les nœud s (plus d'un nœud dans la sélection)</a> · <a class="toc-group" href="#d0e3757">Retourner les nœuds (plus d'un nœud dans la sélection)</a> · <a class="toc-group" href="#d0e3783">Modifier les segments</a> · <a class="toc-group" href="#d0e3812">Modifier le type de nœud</a> · <a class="toc-group" href="#d0e3877">Joindre ou briser</a> · <a class="toc-group" href="#d0e3922">Supprimer, créer, dupliquer</a> · <a class="toc-group" href="#d0e4032">Inverser</a> · <a class="toc-group" href="#d0e4048">Éditer les formes</a> · <a class="toc-group" href="#d0e4060">Éditer les remplissages et les effets de chemin</a> · <a class="toc-group" href="#d0e4069">Annuler</a>
4614- <span class="toc-section"> | </span>
4615- <a class="toc-section" href="#d0e4089">Outil Ajuster</a>
4616- <span class="toc-section"> · </span>
4617- <a class="toc-group" href="#d0e4094">Fonctionnement</a> · <a class="toc-group" href="#d0e4142">Modes</a> · <a class="toc-group" href="#d0e4368">Paramètres</a>
4618- <span class="toc-section"> | </span>
4619- <a class="toc-section" href="#d0e4411">Outil Zoom</a>
4620- <span class="toc-section"> | </span>
4621- <a class="toc-section" href="#d0e4444">Outil Rectangle</a>
4622- <span class="toc-section"> · </span>
4623- <a class="toc-group" href="#d0e4449">Dessiner</a> · <a class="toc-group" href="#d0e4488">Sélectionner</a> · <a class="toc-group" href="#d0e4540">Redimensionner avec les poignées</a> · <a class="toc-group" href="#d0e4569">Arrondir les coins avec les poignées</a>
4624- <span class="toc-section"> | </span>
4625- <a class="toc-section" href="#d0e4622">Outil Boîte 3D</a>
4626- <span class="toc-section"> · </span>
4627- <a class="toc-group" href="#d0e4627">Dessiner</a> · <a class="toc-group" href="#d0e4650">Sélectionner</a> · <a class="toc-group" href="#d0e4699">Éditer avec les poignées</a> · <a class="toc-group" href="#d0e4738">Éditer les perspectives</a>
4628- <span class="toc-section"> | </span>
4629- <a class="toc-section" href="#d0e4838">Outil ellipse</a>
4630- <span class="toc-section"> · </span>
4631- <a class="toc-group" href="#d0e4843">Dessiner</a> · <a class="toc-group" href="#d0e4903">Sélectionner</a> · <a class="toc-group" href="#d0e4955">Éditer avec les poignées</a>
4632- <span class="toc-section"> | </span>
4633- <a class="toc-section" href="#d0e5008">Outil Étoile</a>
4634- <span class="toc-section"> · </span>
4635- <a class="toc-group" href="#d0e5013">Dessiner</a> · <a class="toc-group" href="#d0e5039">Sélectionner</a> · <a class="toc-group" href="#d0e5091">Éditer avec les poignées</a>
4636- <span class="toc-section"> | </span>
4637- <a class="toc-section" href="#d0e5164">Outil Spirale</a>
4638- <span class="toc-section"> · </span>
4639- <a class="toc-group" href="#d0e5169">Dessiner</a> · <a class="toc-group" href="#d0e5195">Sélectionner</a> · <a class="toc-group" href="#d0e5246">Éditer avec les poignées</a>
4640- <span class="toc-section"> | </span>
4641- <a class="toc-section" href="#d0e5347">Outil crayon</a>
4642- <span class="toc-section"> · </span>
4643- <a class="toc-group" href="#d0e5398">Créer des points</a>
4644- <span class="toc-section"> | </span>
4645- <a class="toc-section" href="#d0e5442">Outil Stylo (Bézier)</a>
4646- <span class="toc-section"> · </span>
4647- <a class="toc-group" href="#d0e5447">Créer des nœuds</a> · <a class="toc-group" href="#d0e5511">Déplacer le dernier nœud</a> · <a class="toc-group" href="#d0e5565">Créer ou modifier des segments</a> · <a class="toc-group" href="#d0e5604">Créer des points</a> · <a class="toc-group" href="#d0e5647">Terminer</a> · <a class="toc-group" href="#d0e5680">Annuler</a>
4648- <span class="toc-section"> | </span>
4649- <a class="toc-section" href="#d0e5710">Outil Plume calligraphique</a>
4650- <span class="toc-section"> | </span>
4651- <a class="toc-section" href="#d0e5808">Outil Texte</a>
4652- <span class="toc-section"> · </span>
4653- <a class="toc-group" href="#d0e5813">Sélectionner ou créer</a> · <a class="toc-group" href="#d0e5841">Se déplacer dans le texte</a> · <a class="toc-group" href="#d0e5930">Cadre de texte (interne)</a> · <a class="toc-group" href="#d0e5969">Cadre de texte (externe)</a> · <a class="toc-group" href="#d0e6019">Texte le long d'un chemin</a> · <a class="toc-group" href="#d0e6038">Éditer du texte</a> · <a class="toc-group" href="#d0e6092">Sélectionner du texte</a> · <a class="toc-group" href="#d0e6220">Appliquer un style à la sélection</a> · <a class="toc-group" href="#d0e6249">Interlettrage</a> · <a class="toc-group" href="#d0e6305">Hauteur de ligne</a> · <a class="toc-group" href="#d0e6369">Crénage et décalage</a> · <a class="toc-group" href="#d0e6409">Tourner</a>
4654- <span class="toc-section"> | </span>
4655- <a class="toc-section" href="#d0e6459">Outil Aérographe</a>
4656- <span class="toc-section"> · </span>
4657- <a class="toc-group" href="#d0e6464">Modes</a> · <a class="toc-group" href="#d0e6500">Paramètres</a>
4658- <span class="toc-section"> | </span>
4659- <a class="toc-section" href="#d0e6540">Outil Gomme</a>
4660- <span class="toc-section"> | </span>
4661- <a class="toc-section" href="#d0e6571">Remplissage au seau</a>
4662- <span class="toc-section"> | </span>
4663- <a class="toc-section" href="#d0e6654">Outil Gradient</a>
4664- <span class="toc-section"> · </span>
4665- <a class="toc-group" href="#d0e6659">Sélectionner les objets</a> · <a class="toc-group" href="#d0e6692">Créer des gradients</a> · <a class="toc-group" href="#d0e6721">Sélectionner les poignées</a> · <a class="toc-group" href="#d0e6791">Créer ou supprimer des stops intermédiaires</a> · <a class="toc-group" href="#d0e6854">Déplacer les poignées et les stops</a> · <a class="toc-group" href="#d0e6944">Inverser</a> · <a class="toc-group" href="#d0e6965">Éditeur de gradient</a>
4666- <span class="toc-section"> | </span>
4667- <a class="toc-section" href="#d0e6985">Outil Pipette</a>
4668+ <a class="toc-group" href="#d0e1458">Annuler/rétablir</a> · <a class="toc-group" href="#d0e1502">Presse-papiers</a> · <a class="toc-group" href="#d0e1590">Dupliquer</a> · <a class="toc-group" href="#d0e1609">Cloner</a> · <a class="toc-group" href="#d0e1662">Bitmaps</a> · <a class="toc-group" href="#d0e1699">Motifs</a> · <a class="toc-group" href="#d0e1733">Guides</a> · <a class="toc-group" href="#d0e1749">Grouper</a> · <a class="toc-group" href="#d0e1800">ordre dans le plan</a>
4669+ <span class="toc-section"> | </span>
4670+ <a class="toc-section" href="#d0e1835">Chemin</a>
4671+ <span class="toc-section"> · </span>
4672+ <a class="toc-group" href="#d0e1840">Convertir en chemin</a> · <a class="toc-group" href="#d0e1870">Opérations booléennes</a> · <a class="toc-group" href="#d0e1962">Offsets</a> · <a class="toc-group" href="#d0e2079">Combiner</a> · <a class="toc-group" href="#d0e2119">Simplifier</a>
4673+ <span class="toc-section"> | </span>
4674+ <a class="toc-section" href="#d0e2148">Sélecteur</a>
4675+ <span class="toc-section"> · </span>
4676+ <a class="toc-group" href="#d0e2153">Sélectionner (souris)</a> · <a class="toc-group" href="#d0e2201">Sélection par cliquer-glisser, sélection par le toucher</a> · <a class="toc-group" href="#d0e2260">Sélectionner (clavier)</a> · <a class="toc-group" href="#d0e2362">Sélectionner à l'intérieur d'un groupe ou sélectionner en dessous</a> · <a class="toc-group" href="#d0e2476">Déplacer (souris)</a> · <a class="toc-group" href="#d0e2550">Déplacer (clavier)</a> · <a class="toc-group" href="#d0e2601">Transformer (souris)</a> · <a class="toc-group" href="#d0e2634">Redimensionner avec les poignées</a> · <a class="toc-group" href="#d0e2685">Redimensionner (clavier)</a> · <a class="toc-group" href="#d0e2789">Tourner et incliner avec les poignées</a> · <a class="toc-group" href="#d0e2828">Tourner (clavier)</a> · <a class="toc-group" href="#d0e2886">Retourner</a> · <a class="toc-group" href="#d0e2909">Centre de rotation</a> · <a class="toc-group" href="#d0e2948">Annuler</a>
4677+ <span class="toc-section"> | </span>
4678+ <a class="toc-section" href="#d0e2968">Outil NÅ“ud</a>
4679+ <span class="toc-section"> · </span>
4680+ <a class="toc-group" href="#d0e2973">Sélectionner les objets (souris)</a> · <a class="toc-group" href="#d0e3009">Sélectionner les nœuds (souris)</a> · <a class="toc-group" href="#d0e3058">Sélection par cliquer-glisser</a> · <a class="toc-group" href="#d0e3090">Sélectionner les nœuds (clavier)</a> · <a class="toc-group" href="#d0e3173">Étendre ou restreindre la sélection de nœuds</a> · <a class="toc-group" href="#d0e3233">Déplacer les nœuds (souris)</a> · <a class="toc-group" href="#d0e3332">Déplacer les nœuds (clavier)</a> · <a class="toc-group" href="#d0e3383">Déplacer une poignée de nœud (souris)</a> · <a class="toc-group" href="#d0e3445">Redimensionner une poignée (un nœud sélectionné)</a> · <a class="toc-group" href="#d0e3551">Tourner la poignée (un nœud sélectionné)</a> · <a class="toc-group" href="#d0e3637">Affichage des poignées</a> · <a class="toc-group" href="#d0e3653">Redimensionner les nœuds (plus d'un nœud dans la sélection)</a> · <a class="toc-group" href="#d0e3729">Tourner les nœud s (plus d'un nœud dans la sélection)</a> · <a class="toc-group" href="#d0e3773">Retourner les nœuds (plus d'un nœud dans la sélection)</a> · <a class="toc-group" href="#d0e3799">Modifier les segments</a> · <a class="toc-group" href="#d0e3828">Modifier le type de nœud</a> · <a class="toc-group" href="#d0e3893">Joindre ou briser</a> · <a class="toc-group" href="#d0e3938">Supprimer, créer, dupliquer</a> · <a class="toc-group" href="#d0e4048">Inverser</a> · <a class="toc-group" href="#d0e4064">Éditer les formes</a> · <a class="toc-group" href="#d0e4076">Éditer les remplissages et les effets de chemin</a> · <a class="toc-group" href="#d0e4085">Annuler</a>
4681+ <span class="toc-section"> | </span>
4682+ <a class="toc-section" href="#d0e4105">Outil Ajuster</a>
4683+ <span class="toc-section"> · </span>
4684+ <a class="toc-group" href="#d0e4110">Fonctionnement</a> · <a class="toc-group" href="#d0e4158">Modes</a> · <a class="toc-group" href="#d0e4384">Paramètres</a>
4685+ <span class="toc-section"> | </span>
4686+ <a class="toc-section" href="#d0e4427">Outil Zoom</a>
4687+ <span class="toc-section"> | </span>
4688+ <a class="toc-section" href="#d0e4460">Outil Rectangle</a>
4689+ <span class="toc-section"> · </span>
4690+ <a class="toc-group" href="#d0e4465">Dessiner</a> · <a class="toc-group" href="#d0e4504">Sélectionner</a> · <a class="toc-group" href="#d0e4556">Redimensionner avec les poignées</a> · <a class="toc-group" href="#d0e4585">Arrondir les coins avec les poignées</a>
4691+ <span class="toc-section"> | </span>
4692+ <a class="toc-section" href="#d0e4638">Outil Boîte 3D</a>
4693+ <span class="toc-section"> · </span>
4694+ <a class="toc-group" href="#d0e4643">Dessiner</a> · <a class="toc-group" href="#d0e4666">Sélectionner</a> · <a class="toc-group" href="#d0e4715">Éditer avec les poignées</a> · <a class="toc-group" href="#d0e4754">Éditer les perspectives</a>
4695+ <span class="toc-section"> | </span>
4696+ <a class="toc-section" href="#d0e4854">Outil ellipse</a>
4697+ <span class="toc-section"> · </span>
4698+ <a class="toc-group" href="#d0e4859">Dessiner</a> · <a class="toc-group" href="#d0e4919">Sélectionner</a> · <a class="toc-group" href="#d0e4971">Éditer avec les poignées</a>
4699+ <span class="toc-section"> | </span>
4700+ <a class="toc-section" href="#d0e5024">Outil Étoile</a>
4701+ <span class="toc-section"> · </span>
4702+ <a class="toc-group" href="#d0e5029">Dessiner</a> · <a class="toc-group" href="#d0e5055">Sélectionner</a> · <a class="toc-group" href="#d0e5107">Éditer avec les poignées</a>
4703+ <span class="toc-section"> | </span>
4704+ <a class="toc-section" href="#d0e5180">Outil Spirale</a>
4705+ <span class="toc-section"> · </span>
4706+ <a class="toc-group" href="#d0e5185">Dessiner</a> · <a class="toc-group" href="#d0e5211">Sélectionner</a> · <a class="toc-group" href="#d0e5262">Éditer avec les poignées</a>
4707+ <span class="toc-section"> | </span>
4708+ <a class="toc-section" href="#d0e5363">Outil crayon</a>
4709+ <span class="toc-section"> · </span>
4710+ <a class="toc-group" href="#d0e5414">Créer des points</a>
4711+ <span class="toc-section"> | </span>
4712+ <a class="toc-section" href="#d0e5458">Outil Stylo (Bézier)</a>
4713+ <span class="toc-section"> · </span>
4714+ <a class="toc-group" href="#d0e5463">Créer des nœuds</a> · <a class="toc-group" href="#d0e5527">Déplacer le dernier nœud</a> · <a class="toc-group" href="#d0e5581">Créer ou modifier des segments</a> · <a class="toc-group" href="#d0e5620">Créer des points</a> · <a class="toc-group" href="#d0e5663">Terminer</a> · <a class="toc-group" href="#d0e5696">Annuler</a>
4715+ <span class="toc-section"> | </span>
4716+ <a class="toc-section" href="#d0e5726">Outil Plume calligraphique</a>
4717+ <span class="toc-section"> | </span>
4718+ <a class="toc-section" href="#d0e5824">Outil Texte</a>
4719+ <span class="toc-section"> · </span>
4720+ <a class="toc-group" href="#d0e5829">Sélectionner ou créer</a> · <a class="toc-group" href="#d0e5857">Se déplacer dans le texte</a> · <a class="toc-group" href="#d0e5946">Cadre de texte (interne)</a> · <a class="toc-group" href="#d0e5985">Cadre de texte (externe)</a> · <a class="toc-group" href="#d0e6035">Texte le long d'un chemin</a> · <a class="toc-group" href="#d0e6054">Éditer du texte</a> · <a class="toc-group" href="#d0e6108">Sélectionner du texte</a> · <a class="toc-group" href="#d0e6236">Appliquer un style à la sélection</a> · <a class="toc-group" href="#d0e6265">Interlettrage</a> · <a class="toc-group" href="#d0e6321">Hauteur de ligne</a> · <a class="toc-group" href="#d0e6385">Crénage et décalage</a> · <a class="toc-group" href="#d0e6425">Tourner</a>
4721+ <span class="toc-section"> | </span>
4722+ <a class="toc-section" href="#d0e6475">Outil Aérographe</a>
4723+ <span class="toc-section"> · </span>
4724+ <a class="toc-group" href="#d0e6480">Modes</a> · <a class="toc-group" href="#d0e6516">Paramètres</a>
4725+ <span class="toc-section"> | </span>
4726+ <a class="toc-section" href="#d0e6556">Outil Gomme</a>
4727+ <span class="toc-section"> | </span>
4728+ <a class="toc-section" href="#d0e6587">Remplissage au seau</a>
4729+ <span class="toc-section"> | </span>
4730+ <a class="toc-section" href="#d0e6670">Outil Gradient</a>
4731+ <span class="toc-section"> · </span>
4732+ <a class="toc-group" href="#d0e6675">Sélectionner les objets</a> · <a class="toc-group" href="#d0e6708">Créer des gradients</a> · <a class="toc-group" href="#d0e6737">Sélectionner les poignées</a> · <a class="toc-group" href="#d0e6807">Créer ou supprimer des stops intermédiaires</a> · <a class="toc-group" href="#d0e6870">Déplacer les poignées et les stops</a> · <a class="toc-group" href="#d0e6960">Inverser</a> · <a class="toc-group" href="#d0e6981">Éditeur de gradient</a>
4733+ <span class="toc-section"> | </span>
4734+ <a class="toc-section" href="#d0e7001">Outil Pipette</a>
4735 <span class="toc-section"/>
4736 </div>
4737 <div class="chapter">
4738@@ -2137,7 +2137,28 @@
4739 <tr>
4740 <td colspan="2">
4741 <h3>
4742- <a name="d0e1733"/>Grouper</h3>
4743+ <a name="d0e1733"/>Guides</h3>
4744+ </td>
4745+ </tr>
4746+
4747+ <tr>
4748+ <td class="keys">
4749+ <span class="shortcut">
4750+ <span class="keypad">Maj</span>
4751+ <span class="plussign">+</span>G</span>
4752+ </td>
4753+ <td>
4754+ <span class="action">objets en guides</span>
4755+ </td>
4756+ </tr>
4757+
4758+
4759+
4760+
4761+ <tr>
4762+ <td colspan="2">
4763+ <h3>
4764+ <a name="d0e1749"/>Grouper</h3>
4765 </td>
4766 </tr>
4767
4768@@ -2191,7 +2212,7 @@
4769 <tr>
4770 <td colspan="2">
4771 <h3>
4772- <a name="d0e1784"/>ordre dans le plan</h3>
4773+ <a name="d0e1800"/>ordre dans le plan</h3>
4774 </td>
4775 </tr>
4776
4777@@ -2236,7 +2257,7 @@
4778 </table>
4779 </div>
4780 <div class="sect">
4781- <a name="d0e1819"/>
4782+ <a name="d0e1835"/>
4783 <h2>Chemin</h2>
4784 <table class="color10">
4785
4786@@ -2246,7 +2267,7 @@
4787 <tr>
4788 <td colspan="2">
4789 <h3>
4790- <a name="d0e1824"/>Convertir en chemin</h3>
4791+ <a name="d0e1840"/>Convertir en chemin</h3>
4792 </td>
4793 </tr>
4794
4795@@ -2282,7 +2303,7 @@
4796 <tr>
4797 <td colspan="2">
4798 <h3>
4799- <a name="d0e1854"/>Opérations booléennes</h3>
4800+ <a name="d0e1870"/>Opérations booléennes</h3>
4801 </td>
4802 </tr>
4803
4804@@ -2408,7 +2429,7 @@
4805 <tr>
4806 <td colspan="2">
4807 <h3>
4808- <a name="d0e1946"/>Offsets</h3>
4809+ <a name="d0e1962"/>Offsets</h3>
4810 </td>
4811 </tr>
4812
4813@@ -2553,7 +2574,7 @@
4814 <tr>
4815 <td colspan="2">
4816 <h3>
4817- <a name="d0e2063"/>Combiner</h3>
4818+ <a name="d0e2079"/>Combiner</h3>
4819 </td>
4820 </tr>
4821
4822@@ -2611,7 +2632,7 @@
4823 <tr>
4824 <td colspan="2">
4825 <h3>
4826- <a name="d0e2103"/>Simplifier</h3>
4827+ <a name="d0e2119"/>Simplifier</h3>
4828 </td>
4829 </tr>
4830
4831@@ -2649,7 +2670,7 @@
4832 </table>
4833 </div>
4834 <div class="sect">
4835- <a name="d0e2132"/>
4836+ <a name="d0e2148"/>
4837 <h2>Sélecteur</h2>
4838 <table class="color11">
4839
4840@@ -2659,7 +2680,7 @@
4841 <tr>
4842 <td colspan="2">
4843 <h3>
4844- <a name="d0e2137"/>Sélectionner (souris)</h3>
4845+ <a name="d0e2153"/>Sélectionner (souris)</h3>
4846 </td>
4847 </tr>
4848
4849@@ -2728,7 +2749,7 @@
4850 <tr>
4851 <td colspan="2">
4852 <h3>
4853- <a name="d0e2185"/>Sélection par cliquer-glisser, sélection par le toucher</h3>
4854+ <a name="d0e2201"/>Sélection par cliquer-glisser, sélection par le toucher</h3>
4855 </td>
4856 </tr>
4857
4858@@ -2810,7 +2831,7 @@
4859 <tr>
4860 <td colspan="2">
4861 <h3>
4862- <a name="d0e2244"/>Sélectionner (clavier)</h3>
4863+ <a name="d0e2260"/>Sélectionner (clavier)</h3>
4864 </td>
4865 </tr>
4866
4867@@ -2951,7 +2972,7 @@
4868 <tr>
4869 <td colspan="2">
4870 <h3>
4871- <a name="d0e2346"/>Sélectionner à l'intérieur d'un groupe ou sélectionner en dessous</h3>
4872+ <a name="d0e2362"/>Sélectionner à l'intérieur d'un groupe ou sélectionner en dessous</h3>
4873 </td>
4874 </tr>
4875
4876@@ -3095,7 +3116,7 @@
4877 <tr>
4878 <td colspan="2">
4879 <h3>
4880- <a name="d0e2460"/>Déplacer (souris)</h3>
4881+ <a name="d0e2476"/>Déplacer (souris)</h3>
4882 </td>
4883 </tr>
4884
4885@@ -3198,7 +3219,7 @@
4886 <tr>
4887 <td colspan="2">
4888 <h3>
4889- <a name="d0e2534"/>Déplacer (clavier)</h3>
4890+ <a name="d0e2550"/>Déplacer (clavier)</h3>
4891 </td>
4892 </tr>
4893
4894@@ -3264,7 +3285,7 @@
4895 <tr>
4896 <td colspan="2">
4897 <h3>
4898- <a name="d0e2585"/>Transformer (souris)</h3>
4899+ <a name="d0e2601"/>Transformer (souris)</h3>
4900 </td>
4901 </tr>
4902
4903@@ -3304,7 +3325,7 @@
4904 <tr>
4905 <td colspan="2">
4906 <h3>
4907- <a name="d0e2618"/>Redimensionner avec les poignées</h3>
4908+ <a name="d0e2634"/>Redimensionner avec les poignées</h3>
4909 </td>
4910 </tr>
4911
4912@@ -3369,7 +3390,7 @@
4913 <tr>
4914 <td colspan="2">
4915 <h3>
4916- <a name="d0e2669"/>Redimensionner (clavier)</h3>
4917+ <a name="d0e2685"/>Redimensionner (clavier)</h3>
4918 </td>
4919 </tr>
4920
4921@@ -3473,7 +3494,7 @@
4922 <tr>
4923 <td colspan="2">
4924 <h3>
4925- <a name="d0e2773"/>Tourner et incliner avec les poignées</h3>
4926+ <a name="d0e2789"/>Tourner et incliner avec les poignées</h3>
4927 </td>
4928 </tr>
4929
4930@@ -3526,7 +3547,7 @@
4931 <tr>
4932 <td colspan="2">
4933 <h3>
4934- <a name="d0e2812"/>Tourner (clavier)</h3>
4935+ <a name="d0e2828"/>Tourner (clavier)</h3>
4936 </td>
4937 </tr>
4938
4939@@ -3592,7 +3613,7 @@
4940 <tr>
4941 <td colspan="2">
4942 <h3>
4943- <a name="d0e2870"/>Retourner</h3>
4944+ <a name="d0e2886"/>Retourner</h3>
4945 </td>
4946 </tr>
4947
4948@@ -3626,7 +3647,7 @@
4949 <tr>
4950 <td colspan="2">
4951 <h3>
4952- <a name="d0e2893"/>Centre de rotation</h3>
4953+ <a name="d0e2909"/>Centre de rotation</h3>
4954 </td>
4955 </tr>
4956
4957@@ -3679,7 +3700,7 @@
4958 <tr>
4959 <td colspan="2">
4960 <h3>
4961- <a name="d0e2932"/>Annuler</h3>
4962+ <a name="d0e2948"/>Annuler</h3>
4963 </td>
4964 </tr>
4965
4966@@ -3703,7 +3724,7 @@
4967 </table>
4968 </div>
4969 <div class="sect">
4970- <a name="d0e2952"/>
4971+ <a name="d0e2968"/>
4972 <h2>Outil NÅ“ud</h2>
4973 <table class="color12">
4974
4975@@ -3713,7 +3734,7 @@
4976 <tr>
4977 <td colspan="2">
4978 <h3>
4979- <a name="d0e2957"/>Sélectionner les objets (souris)</h3>
4980+ <a name="d0e2973"/>Sélectionner les objets (souris)</h3>
4981 </td>
4982 </tr>
4983
4984@@ -3760,7 +3781,7 @@
4985 <tr>
4986 <td colspan="2">
4987 <h3>
4988- <a name="d0e2993"/>Sélectionner les nœuds (souris)</h3>
4989+ <a name="d0e3009"/>Sélectionner les nœuds (souris)</h3>
4990 </td>
4991 </tr>
4992
4993@@ -3832,7 +3853,7 @@
4994 <tr>
4995 <td colspan="2">
4996 <h3>
4997- <a name="d0e3042"/>Sélection par cliquer-glisser</h3>
4998+ <a name="d0e3058"/>Sélection par cliquer-glisser</h3>
4999 </td>
5000 </tr>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches