Do not include individual GTK+ headers
Bug #792263 reported by
Alex Valavanis
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Inkscape |
Fix Released
|
High
|
Alex Valavanis | ||
Bug Description
GTK+ 3 will not permit individual GTK+ headers to be included.[1] Instead, we should only use:
* gtk/gtk.h for GTK
* gtk/gtkunixprint.h for low-level, UNIX-specific printing functions
* gdk/gdk.h for GDK
* gdk/gdkx.h for GDK functions that are X11-specific
* gdk/gdkwin32.h for GDK functions that are Windows-specific
I attach a list of all the inclusions of individual g[td]k/.*h files.
[1] http://
Related branches
lp:~valavanisalex/inkscape/fix-792263
- Jon A. Cruz: Approve
-
Diff: 1952 lines (+135/-266)139 files modifiedsrc/color.h (+1/-1)
src/context-fns.h (+1/-1)
src/debug/gdk-event-latency-tracker.h (+1/-1)
src/debug/log-display-config.cpp (+1/-2)
src/desktop-events.h (+2/-2)
src/desktop.h (+2/-2)
src/device-manager.cpp (+1/-1)
src/dialogs/clonetiler.h (+1/-1)
src/dialogs/dialog-events.h (+1/-2)
src/dialogs/find.h (+1/-1)
src/dialogs/item-properties.cpp (+0/-9)
src/dialogs/item-properties.h (+1/-1)
src/dialogs/object-attributes.h (+1/-1)
src/dialogs/spellcheck.h (+1/-1)
src/display/canvas-temporary-item.cpp (+1/-1)
src/display/grayscale.h (+1/-1)
src/display/nr-3dutils.h (+1/-1)
src/display/nr-filter-diffuselighting.h (+1/-1)
src/display/nr-filter-specularlighting.h (+1/-1)
src/display/nr-light.h (+1/-1)
src/display/sodipodi-ctrl.h (+1/-1)
src/display/sp-canvas-item.h (+2/-2)
src/display/sp-canvas.cpp (+1/-3)
src/display/sp-canvas.h (+2/-4)
src/document.cpp (+1/-1)
src/ege-adjustment-action.cpp (+0/-11)
src/ege-adjustment-action.h (+1/-1)
src/ege-color-prof-tracker.cpp (+1/-3)
src/ege-output-action.cpp (+1/-3)
src/ege-output-action.h (+1/-1)
src/ege-select-one-action.cpp (+0/-9)
src/ege-select-one-action.h (+1/-2)
src/event-context.cpp (+1/-2)
src/event-context.h (+1/-2)
src/extension/effect.h (+1/-1)
src/extension/implementation/implementation.h (+1/-1)
src/extension/input.h (+1/-1)
src/extension/internal/pdfinput/pdf-input.cpp (+1/-1)
src/extension/output.h (+1/-1)
src/file.h (+1/-1)
src/help.h (+1/-1)
src/helper/unit-menu.cpp (+1/-4)
src/helper/unit-menu.h (+1/-1)
src/helper/unit-tracker.cpp (+1/-1)
src/helper/unit-tracker.h (+1/-2)
src/helper/window.cpp (+1/-1)
src/helper/window.h (+1/-1)
src/icon-size.h (+1/-1)
src/ink-action.cpp (+2/-7)
src/ink-action.h (+1/-3)
src/ink-comboboxentry-action.cpp (+0/-3)
src/ink-comboboxentry-action.h (+1/-2)
src/inkscape.cpp (+1/-2)
src/inkview.cpp (+1/-5)
src/interface.h (+1/-1)
src/io/sys.cpp (+1/-1)
src/knot.h (+1/-1)
src/libgdl/gdl-dock-bar.h (+1/-1)
src/libgdl/gdl-dock-item-grip.c (+1/-3)
src/libgdl/gdl-dock-item-grip.h (+1/-1)
src/libgdl/gdl-dock-master.h (+1/-1)
src/libgdl/gdl-dock-object.h (+1/-1)
src/libgdl/gdl-dock-paned.c (+1/-2)
src/libgdl/gdl-stock.c (+0/-1)
src/libgdl/gdl-switcher.c (+0/-4)
src/libgdl/gdl-switcher.h (+1/-1)
src/libgdl/gdl-tools.h (+1/-1)
src/libnrtype/Layout-TNG-Input.cpp (+1/-1)
src/live_effects/parameter/path.cpp (+1/-1)
src/main.cpp (+1/-5)
src/modifier-fns.h (+1/-1)
src/select-context.h (+1/-1)
src/seltrans-handles.h (+1/-1)
src/shortcuts.cpp (+1/-1)
src/sp-gradient.h (+1/-1)
src/sp-pattern.h (+1/-1)
src/spiral-context.h (+1/-1)
src/svg-view-widget.cpp (+1/-1)
src/text-context.cpp (+1/-2)
src/text-context.h (+1/-1)
src/ui/context-menu.cpp (+1/-1)
src/ui/context-menu.h (+1/-1)
src/ui/dialog/color-item.cpp (+1/-1)
src/ui/dialog/extensions.cpp (+1/-1)
src/ui/dialog/filedialogimpl-gtkmm.h (+1/-5)
src/ui/dialog/glyphs.cpp (+1/-3)
src/ui/dialog/inkscape-preferences.cpp (+1/-1)
src/ui/dialog/layers.cpp (+1/-2)
src/ui/dialog/ocaldialogs.h (+1/-3)
src/ui/dialog/print.h (+1/-1)
src/ui/dialog/swatches.cpp (+1/-5)
src/ui/dialog/tile.cpp (+1/-2)
src/ui/dialog/tracedialog.cpp (+1/-1)
src/ui/dialog/undo-history.cpp (+1/-1)
src/ui/view/view-widget.h (+1/-1)
src/ui/view/view.h (+1/-1)
src/ui/widget/combo-text.cpp (+1/-1)
src/ui/widget/panel.cpp (+1/-1)
src/ui/widget/selected-style.cpp (+1/-1)
src/ui/widget/toolbox.cpp (+1/-1)
src/verbs.cpp (+1/-1)
src/widgets/button.h (+1/-3)
src/widgets/desktop-widget.h (+1/-2)
src/widgets/eek-preview.h (+2/-2)
src/widgets/fill-style.cpp (+1/-1)
src/widgets/font-selector.cpp (+0/-7)
src/widgets/font-selector.h (+1/-1)
src/widgets/gradient-image.h (+1/-1)
src/widgets/gradient-selector.cpp (+1/-5)
src/widgets/gradient-selector.h (+1/-1)
src/widgets/gradient-toolbar.h (+1/-1)
src/widgets/gradient-vector.h (+1/-1)
src/widgets/icon.h (+1/-1)
src/widgets/paint-selector.cpp (+1/-8)
src/widgets/paint-selector.h (+1/-1)
src/widgets/ruler.h (+1/-1)
src/widgets/select-toolbar.cpp (+0/-1)
src/widgets/select-toolbar.h (+1/-2)
src/widgets/shrink-wrap-button.cpp (+1/-1)
src/widgets/sp-attribute-widget.cpp (+1/-2)
src/widgets/sp-attribute-widget.h (+1/-2)
src/widgets/sp-color-gtkselector.h (+1/-1)
src/widgets/sp-color-icc-selector.cpp (+0/-5)
src/widgets/sp-color-icc-selector.h (+1/-2)
src/widgets/sp-color-notebook.h (+1/-3)
src/widgets/sp-color-preview.h (+1/-1)
src/widgets/sp-color-scales.h (+1/-2)
src/widgets/sp-color-selector.h (+1/-1)
src/widgets/sp-color-slider.cpp (+1/-2)
src/widgets/sp-color-slider.h (+1/-1)
src/widgets/sp-color-wheel-selector.cpp (+1/-4)
src/widgets/sp-color-wheel-selector.h (+1/-2)
src/widgets/sp-widget.h (+1/-1)
src/widgets/sp-xmlview-attr-list.h (+0/-1)
src/widgets/sp-xmlview-content.h (+1/-1)
src/widgets/sp-xmlview-tree.h (+1/-1)
src/widgets/spinbutton-events.h (+1/-2)
src/widgets/spw-utilities.h (+1/-1)
src/widgets/toolbox.h (+1/-2)
Revision history for this message
| Alex Valavanis (valavanisalex) wrote | #1 |
Revision history for this message
| Alex Valavanis (valavanisalex) wrote | #2 |
| tags: | added: build |
Revision history for this message
| Alex Valavanis (valavanisalex) wrote | #3 |
Revision history for this message
| su_v (suv-lp) wrote | #4 |
Revision history for this message
| Alex Valavanis (valavanisalex) wrote | #5 |
| Changed in inkscape: | |
| status: | New → In Progress |
| importance: | Undecided → High |
| assignee: | nobody → Alex Valavanis (valavanisalex) |
| Changed in inkscape: | |
| milestone: | 0.49 → 0.48.2 |
| Changed in inkscape: | |
| status: | In Progress → Fix Committed |
Revision history for this message
| su_v (suv-lp) wrote | #6 |
| Changed in inkscape: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
We can test for the presence of individual headers during build using
CFLAGS+