Merge lp://qastaging/~inkscape.dev/inkscape/fix-1606558 into lp://qastaging/~inkscape.dev/inkscape/trunk

Proposed by Alex Valavanis
Status: Merged
Merged at revision: 15038
Proposed branch: lp://qastaging/~inkscape.dev/inkscape/fix-1606558
Merge into: lp://qastaging/~inkscape.dev/inkscape/trunk
Diff against target: 28797 lines (+395/-19492) (has conflicts)
241 files modified
CMakeLists.txt (+0/-2)
CMakeScripts/DefineDependsandFlags.cmake (+0/-31)
build-x64-gtk3.xml (+0/-2)
build-x64.xml (+0/-2)
build.xml (+0/-2)
configure.ac (+61/-146)
src/CMakeLists.txt (+3/-1)
src/Makefile.am (+0/-11)
src/color-profile.cpp (+7/-38)
src/desktop-events.cpp (+8/-42)
src/desktop.cpp (+0/-4)
src/device-manager.cpp (+9/-39)
src/display/canvas-axonomgrid.cpp (+2/-38)
src/display/canvas-grid.cpp (+2/-38)
src/display/sp-canvas.cpp (+10/-90)
src/display/sp-canvas.h (+0/-7)
src/extension/error-file.cpp (+1/-5)
src/extension/extension.cpp (+2/-20)
src/extension/extension.h (+0/-9)
src/extension/implementation/script.cpp (+1/-5)
src/extension/internal/cdr-input.cpp (+1/-10)
src/extension/internal/pdfinput/pdf-input.cpp (+1/-35)
src/extension/internal/pdfinput/pdf-input.h (+1/-14)
src/extension/internal/vsd-input.cpp (+1/-11)
src/extension/param/bool.cpp (+1/-5)
src/extension/param/float.cpp (+2/-10)
src/extension/param/int.cpp (+2/-11)
src/extension/param/notebook.cpp (+0/-8)
src/extension/param/radiobutton.cpp (+2/-7)
src/extension/prefdialog.cpp (+1/-26)
src/inkview.cpp (+1/-15)
src/knot.cpp (+3/-38)
src/libgdl/CMakeLists.txt (+0/-50)
src/libgdl/Makefile_insert (+0/-92)
src/libgdl/README.gdl-dock (+0/-184)
src/libgdl/gdl-dock-bar.c (+0/-1049)
src/libgdl/gdl-dock-bar.h (+0/-74)
src/libgdl/gdl-dock-item-button-image.c (+0/-166)
src/libgdl/gdl-dock-item-button-image.h (+0/-70)
src/libgdl/gdl-dock-item-grip.c (+0/-809)
src/libgdl/gdl-dock-item-grip.h (+0/-77)
src/libgdl/gdl-dock-item.c (+0/-2401)
src/libgdl/gdl-dock-item.h (+0/-223)
src/libgdl/gdl-dock-master.c (+0/-1011)
src/libgdl/gdl-dock-master.h (+0/-106)
src/libgdl/gdl-dock-notebook.c (+0/-530)
src/libgdl/gdl-dock-notebook.h (+0/-59)
src/libgdl/gdl-dock-object.c (+0/-1027)
src/libgdl/gdl-dock-object.h (+0/-225)
src/libgdl/gdl-dock-paned.c (+0/-678)
src/libgdl/gdl-dock-paned.h (+0/-64)
src/libgdl/gdl-dock-placeholder.c (+0/-827)
src/libgdl/gdl-dock-placeholder.h (+0/-69)
src/libgdl/gdl-dock-tablabel.c (+0/-632)
src/libgdl/gdl-dock-tablabel.h (+0/-74)
src/libgdl/gdl-dock.c (+0/-1365)
src/libgdl/gdl-dock.h (+0/-99)
src/libgdl/gdl-i18n.c (+0/-43)
src/libgdl/gdl-i18n.h (+0/-72)
src/libgdl/gdl-switcher.c (+0/-1031)
src/libgdl/gdl-switcher.h (+0/-67)
src/libgdl/gdl-win32.c (+0/-42)
src/libgdl/gdl-win32.h (+0/-21)
src/libgdl/gdl.h (+0/-32)
src/libgdl/libgdlmarshal.c (+0/-173)
src/libgdl/libgdlmarshal.h (+0/-48)
src/libgdl/libgdlmarshal.list (+0/-7)
src/libgdl/libgdltypebuiltins.c (+0/-162)
src/libgdl/libgdltypebuiltins.h (+0/-38)
src/libgdl/makefile.in (+0/-17)
src/live_effects/parameter/togglebutton.cpp (+1/-5)
src/main.cpp (+0/-5)
src/svg-view-widget.cpp (+2/-33)
src/svg-view.cpp (+0/-4)
src/ui/clipboard.cpp (+1/-10)
src/ui/dialog/aboutbox.cpp (+1/-13)
src/ui/dialog/align-and-distribute.cpp (+1/-37)
src/ui/dialog/align-and-distribute.h (+4/-34)
src/ui/dialog/calligraphic-profile-rename.cpp (+2/-23)
src/ui/dialog/calligraphic-profile-rename.h (+0/-9)
src/ui/dialog/clonetiler.cpp (+28/-189)
src/ui/dialog/clonetiler.h (+0/-5)
src/ui/dialog/debug.cpp (+1/-6)
src/ui/dialog/document-metadata.cpp (+0/-31)
src/ui/dialog/document-metadata.h (+1/-11)
src/ui/dialog/document-properties.cpp (+1/-128)
src/ui/dialog/document-properties.h (+1/-5)
src/ui/dialog/export.cpp (+6/-89)
src/ui/dialog/export.h (+0/-40)
src/ui/dialog/filedialogimpl-gtkmm.cpp (+12/-74)
src/ui/dialog/filedialogimpl-win32.cpp (+0/-4)
src/ui/dialog/fill-and-stroke.cpp (+0/-19)
src/ui/dialog/fill-and-stroke.h (+0/-4)
src/ui/dialog/filter-effects-dialog.cpp (+11/-153)
src/ui/dialog/filter-effects-dialog.h (+0/-12)
src/ui/dialog/find.h (+0/-6)
src/ui/dialog/floating-behavior.cpp (+0/-8)
src/ui/dialog/font-substitution.cpp (+1/-5)
src/ui/dialog/glyphs.cpp (+6/-73)
src/ui/dialog/grid-arrange-tab.cpp (+1/-19)
src/ui/dialog/grid-arrange-tab.h (+0/-5)
src/ui/dialog/guides.cpp (+2/-56)
src/ui/dialog/guides.h (+1/-11)
src/ui/dialog/icon-preview.h (+0/-6)
src/ui/dialog/inkscape-preferences.cpp (+5/-37)
src/ui/dialog/inkscape-preferences.h (+0/-8)
src/ui/dialog/input.cpp (+2/-129)
src/ui/dialog/layer-properties.cpp (+1/-30)
src/ui/dialog/layer-properties.h (+0/-10)
src/ui/dialog/layers.cpp (+0/-4)
src/ui/dialog/layers.h (+0/-6)
src/ui/dialog/livepatheffect-add.cpp (+1/-5)
src/ui/dialog/livepatheffect-editor.cpp (+0/-7)
src/ui/dialog/livepatheffect-editor.h (+0/-4)
src/ui/dialog/new-from-template.cpp (+0/-8)
src/ui/dialog/object-properties.cpp (+3/-91)
src/ui/dialog/object-properties.h (+0/-4)
src/ui/dialog/objects.cpp (+0/-21)
src/ui/dialog/objects.h (+0/-10)
src/ui/dialog/ocaldialogs.cpp (+9/-157)
src/ui/dialog/ocaldialogs.h (+2/-39)
src/ui/dialog/polar-arrange-tab.cpp (+0/-31)
src/ui/dialog/polar-arrange-tab.h (+1/-10)
src/ui/dialog/spellcheck.h (+0/-15)
src/ui/dialog/svg-fonts-dialog.cpp (+0/-5)
src/ui/dialog/svg-fonts-dialog.h (+0/-9)
src/ui/dialog/swatches.cpp (+0/-4)
src/ui/dialog/symbols.cpp (+5/-44)
src/ui/dialog/tags.cpp (+0/-4)
src/ui/dialog/tags.h (+0/-6)
src/ui/dialog/text-edit.cpp (+1/-24)
src/ui/dialog/text-edit.h (+0/-11)
src/ui/dialog/tile.h (+0/-5)
src/ui/dialog/transformation.cpp (+0/-102)
src/ui/dialog/transformation.h (+0/-4)
src/ui/dialog/undo-history.cpp (+0/-33)
src/ui/dialog/undo-history.h (+0/-18)
src/ui/dialog/xml-tree.cpp (+0/-18)
src/ui/dialog/xml-tree.h (+0/-11)
src/ui/interface.cpp (+1/-31)
src/ui/previewholder.cpp (+22/-119)
src/ui/previewholder.h (+0/-9)
src/ui/tools/dropper-tool.cpp (+0/-8)
src/ui/tools/select-tool.cpp (+0/-8)
src/ui/tools/tool-base.cpp (+0/-22)
src/ui/widget/addtoicon.cpp (+1/-34)
src/ui/widget/addtoicon.h (+0/-14)
src/ui/widget/anchor-selector.cpp (+0/-10)
src/ui/widget/anchor-selector.h (+1/-11)
src/ui/widget/clipmaskicon.cpp (+1/-34)
src/ui/widget/clipmaskicon.h (+0/-13)
src/ui/widget/color-icc-selector.cpp (+0/-23)
src/ui/widget/color-icc-selector.h (+0/-8)
src/ui/widget/color-notebook.cpp (+0/-30)
src/ui/widget/color-notebook.h (+0/-8)
src/ui/widget/color-picker.cpp (+0/-5)
src/ui/widget/color-preview.cpp (+0/-26)
src/ui/widget/color-preview.h (+0/-6)
src/ui/widget/color-scales.cpp (+0/-27)
src/ui/widget/color-scales.h (+0/-8)
src/ui/widget/color-slider.cpp (+5/-117)
src/ui/widget/color-slider.h (+0/-18)
src/ui/widget/color-wheel-selector.cpp (+4/-42)
src/ui/widget/color-wheel-selector.h (+0/-12)
src/ui/widget/dock-item.cpp (+0/-8)
src/ui/widget/dock-item.h (+0/-4)
src/ui/widget/dock.cpp (+0/-12)
src/ui/widget/gimpcolorwheel.c (+0/-137)
src/ui/widget/gimpspinscale.c (+2/-258)
src/ui/widget/highlight-picker.cpp (+1/-34)
src/ui/widget/highlight-picker.h (+0/-14)
src/ui/widget/imagetoggler.cpp (+1/-34)
src/ui/widget/imagetoggler.h (+0/-14)
src/ui/widget/insertordericon.cpp (+1/-33)
src/ui/widget/insertordericon.h (+0/-13)
src/ui/widget/layertypeicon.cpp (+1/-34)
src/ui/widget/layertypeicon.h (+0/-14)
src/ui/widget/licensor.cpp (+0/-8)
src/ui/widget/notebook-page.cpp (+0/-12)
src/ui/widget/notebook-page.h (+0/-13)
src/ui/widget/page-sizer.cpp (+0/-43)
src/ui/widget/page-sizer.h (+1/-25)
src/ui/widget/panel.cpp (+0/-6)
src/ui/widget/panel.h (+1/-17)
src/ui/widget/point.cpp (+0/-4)
src/ui/widget/point.h (+0/-4)
src/ui/widget/preferences-widget.cpp (+2/-78)
src/ui/widget/preferences-widget.h (+0/-25)
src/ui/widget/random.cpp (+0/-4)
src/ui/widget/random.h (+0/-4)
src/ui/widget/scalar.cpp (+1/-9)
src/ui/widget/scalar.h (+0/-4)
src/ui/widget/selected-style.cpp (+0/-45)
src/ui/widget/selected-style.h (+1/-14)
src/ui/widget/spin-scale.cpp (+7/-21)
src/ui/widget/spin-scale.h (+6/-19)
src/ui/widget/spin-slider.cpp (+13/-66)
src/ui/widget/spin-slider.h (+4/-14)
src/ui/widget/spinbutton.h (+0/-4)
src/ui/widget/style-swatch.cpp (+1/-22)
src/ui/widget/style-swatch.h (+0/-8)
src/ui/widget/tolerance-slider.cpp (+1/-9)
src/ui/widget/tolerance-slider.h (+0/-10)
src/widgets/CMakeLists.txt (+2/-5)
src/widgets/Makefile_insert (+2/-6)
src/widgets/button.cpp (+0/-29)
src/widgets/dash-selector.cpp (+1/-13)
src/widgets/dash-selector.h (+0/-5)
src/widgets/desktop-widget.cpp (+16/-163)
src/widgets/eek-preview.cpp (+1/-147)
src/widgets/ege-adjustment-action.cpp (+1/-11)
src/widgets/ege-output-action.cpp (+1/-5)
src/widgets/ege-select-one-action.cpp (+2/-30)
src/widgets/font-selector.cpp (+4/-29)
src/widgets/gradient-image.cpp (+0/-45)
src/widgets/gradient-selector.cpp (+1/-12)
src/widgets/gradient-selector.h (+0/-8)
src/widgets/gradient-vector.cpp (+2/-63)
src/widgets/gradient-vector.h (+0/-8)
src/widgets/icon.cpp (+0/-51)
src/widgets/ink-action.cpp (+1/-38)
src/widgets/ink-comboboxentry-action.cpp (+0/-14)
src/widgets/paint-selector.cpp (+8/-46)
src/widgets/paint-selector.h (+0/-8)
src/widgets/ruler.cpp (+20/-167)
src/widgets/select-toolbar.cpp (+1/-5)
src/widgets/sp-attribute-widget.cpp (+1/-26)
src/widgets/sp-attribute-widget.h (+0/-9)
src/widgets/sp-color-selector.cpp (+0/-6)
src/widgets/sp-color-selector.h (+0/-9)
src/widgets/sp-widget.cpp (+0/-30)
src/widgets/sp-xmlview-attr-list.cpp (+1/-18)
src/widgets/sp-xmlview-content.cpp (+1/-18)
src/widgets/sp-xmlview-tree.cpp (+1/-19)
src/widgets/spw-utilities.cpp (+2/-67)
src/widgets/spw-utilities.h (+0/-12)
src/widgets/stroke-style.cpp (+0/-60)
src/widgets/stroke-style.h (+0/-11)
src/widgets/text-toolbar.cpp (+2/-17)
src/widgets/toolbox.cpp (+9/-46)
testfiles/CMakeLists.txt (+0/-4)
Text conflict in src/CMakeLists.txt
To merge this branch: bzr merge lp://qastaging/~inkscape.dev/inkscape/fix-1606558
Reviewer Review Type Date Requested Status
Alex Valavanis Pending
Review via email: mp+301408@code.qastaging.launchpad.net

Description of the change

This branch removes support for GTK+ 2 and removes our internal fork of GDL.

There are many existing known bugs in GTK+ 3 builds, and fixing them will be a core goal of the 0.93 release.

Please only consider critical errors (e.g. FTBFS or crash on startup) as stoppers for this merge.

To post a comment you must log in.
15032. By Alex Valavanis

ruler: Backport upstream patches

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.