From a7a84469dff9439d4ee2dbf984eadba4261b9f2e Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 27 Oct 2023 18:47:39 +0200 Subject: [PATCH] Fix building against an installed lib2geom Previously this was only working against the submodule, but packagers usually want to use system-wide installed libraries. --- src/extension/internal/odf.cpp | 8 ++++---- src/live_effects/lpe-curvestitch.cpp | 3 ++- src/object/sp-linear-gradient.cpp | 3 ++- src/object/sp-polygon.cpp | 9 +++++---- src/object/sp-radial-gradient.cpp | 3 ++- src/object/sp-root.cpp | 5 +++-- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index e537413629..f7aa676b30 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -36,16 +36,16 @@ //# 2geom includes #include <2geom/pathvector.h> #include <2geom/transforms.h> +#include <2geom/affine.h> // for Affine +#include <2geom/bezier-curve.h> // for CubicBezier +#include <2geom/coord.h> // for Dim2, X, Y +#include <2geom/curve.h> // for Curve #include "helper/geom.h" #include "helper/geom-curves.h" //# Inkscape includes -#include "affine.h" // for Affine #include "attributes.h" // for SPAttr -#include "bezier-curve.h" // for CubicBezier #include "color.h" // for SPColor -#include "coord.h" // for Dim2, X, Y -#include "curve.h" // for Curve #include "document.h" // for SPDocument #include "preferences.h" // for guint32 #include "style-internal.h" // for SPIPaint, SPIScale24, SPILe... diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp index 6935549815..29b787c26d 100644 --- a/src/live_effects/lpe-curvestitch.cpp +++ b/src/live_effects/lpe-curvestitch.cpp @@ -17,7 +17,8 @@ #include -#include "sbasis-to-bezier.h" // for path_from_piecewise +#include <2geom/sbasis-to-bezier.h> // for path_from_piecewise + #include "object/sp-path.h" #include "svg/svg.h" #include "xml/node.h" diff --git a/src/object/sp-linear-gradient.cpp b/src/object/sp-linear-gradient.cpp index bf10719fe2..dee8fcc97f 100644 --- a/src/object/sp-linear-gradient.cpp +++ b/src/object/sp-linear-gradient.cpp @@ -10,8 +10,9 @@ #include "sp-linear-gradient.h" +#include <2geom/rect.h> // for Rect + #include "attributes.h" // for SPAttr -#include "rect.h" // for Rect #include "style-internal.h" // for SPIFontSize #include "style.h" // for SPStyle diff --git a/src/object/sp-polygon.cpp b/src/object/sp-polygon.cpp index 58e067d79d..86062f0f13 100644 --- a/src/object/sp-polygon.cpp +++ b/src/object/sp-polygon.cpp @@ -16,15 +16,16 @@ #include +#include <2geom/curve.h> // for Curve +#include <2geom/path.h> // for Path, BaseIterator +#include <2geom/pathvector.h> // for PathVector +#include <2geom/point.h> // for Point + #include "attributes.h" // for SPAttr -#include "curve.h" // for Curve #include "display/curve.h" // for SPCurve #include "helper/geom-curves.h" // for is_straight_curve #include "object/sp-object.h" // for SP_OBJECT_WRITE_BUILD #include "object/sp-shape.h" // for SPShape -#include "path.h" // for Path, BaseIterator -#include "pathvector.h" // for PathVector -#include "point.h" // for Point #include "svg/stringstream.h" // for SVGOStringStream #include "xml/document.h" // for Document #include "xml/node.h" // for Node diff --git a/src/object/sp-radial-gradient.cpp b/src/object/sp-radial-gradient.cpp index 0dfa573d4e..e9350ab636 100644 --- a/src/object/sp-radial-gradient.cpp +++ b/src/object/sp-radial-gradient.cpp @@ -10,8 +10,9 @@ #include "sp-radial-gradient.h" +#include <2geom/rect.h> // for Rect + #include "attributes.h" // for SPAttr -#include "rect.h" // for Rect #include "style.h" // for SPStyle #include "display/drawing-paintserver.h" // for DrawingRadialGradient, Draw... diff --git a/src/object/sp-root.cpp b/src/object/sp-root.cpp index 761ec4d4e5..2dcd8831b1 100644 --- a/src/object/sp-root.cpp +++ b/src/object/sp-root.cpp @@ -16,13 +16,14 @@ #include "sp-root.h" -#include "affine.h" // for identity, Affine +#include <2geom/affine.h> // for identity, Affine +#include <2geom/rect.h> // for Rect + #include "attributes.h" // for SPAttr #include "display/drawing-group.h" // for DrawingGroup #include "display/drawing-item-ptr.h" // for DrawingItemPtr #include "document.h" // for SPDocument #include "print.h" // for SPPrintContext -#include "rect.h" // for Rect #include "sp-defs.h" // for SPDefs #include "sp-namedview.h" // for SPNamedView #include "sp-use.h" // for SPUse -- GitLab