Add more files.

1 files changed, 73 insertions, 2 deletions

diff --git a/graphics/inkscape/glib2-fixes.mk b/graphics/inkscape/glib2-fixes.mk
index 724f7dc5831..db55bc4665a 100644
--- a/graphics/inkscape/glib2-fixes.mk
+++ b/graphics/inkscape/glib2-fixes.mk
@@ -1,32 +1,51 @@
-# $NetBSD: glib2-fixes.mk,v 1.1 2012/05/06 21:12:04 dholland Exp $
+# $NetBSD: glib2-fixes.mk,v 1.2 2012/05/07 00:54:19 dholland Exp $
 
 # Fix build with the latest glib2.
 
 SUBST_CLASSES+=		glib2
 SUBST_MESSAGE.glib2=	Fixing glib2 includes.
-SUBST_STAGE.glib2=	pre-build
+#SUBST_STAGE.glib2=	pre-build
+SUBST_STAGE.glib2=	post-patch
 
 SUBST_FILES.glib2+=	src/2geom/matrix.h
 SUBST_FILES.glib2+=	src/application/application.h
 SUBST_FILES.glib2+=	src/application/editor.h
+SUBST_FILES.glib2+=	src/attributes.cpp
 SUBST_FILES.glib2+=	src/attributes.h
+SUBST_FILES.glib2+=	src/bind/javabind.cpp
 SUBST_FILES.glib2+=	src/color-profile-fns.h
 SUBST_FILES.glib2+=	src/color-profile.h
 SUBST_FILES.glib2+=	src/color-rgba.h
 SUBST_FILES.glib2+=	src/conn-avoid-ref.h
+SUBST_FILES.glib2+=	src/debug/logger.cpp
 SUBST_FILES.glib2+=	src/debug/simple-event.h
+SUBST_FILES.glib2+=	src/debug/timestamp.cpp
 SUBST_FILES.glib2+=	src/desktop-style.h
+SUBST_FILES.glib2+=	src/dialogs/clonetiler.cpp
+SUBST_FILES.glib2+=	src/dir-util.cpp
 SUBST_FILES.glib2+=	src/dir-util.h
 SUBST_FILES.glib2+=	src/display/canvas-bpath.h
+SUBST_FILES.glib2+=	src/display/curve.cpp
 SUBST_FILES.glib2+=	src/display/curve.h
 SUBST_FILES.glib2+=	src/display/gnome-canvas-acetate.h
+SUBST_FILES.glib2+=	src/display/nr-3dutils.cpp
 SUBST_FILES.glib2+=	src/display/nr-arena.h
+SUBST_FILES.glib2+=	src/display/nr-filter-diffuselighting.cpp
+SUBST_FILES.glib2+=	src/display/nr-filter-specularlighting.cpp
+SUBST_FILES.glib2+=	src/display/nr-plain-stuff.cpp
 SUBST_FILES.glib2+=	src/display/nr-plain-stuff.h
 SUBST_FILES.glib2+=	src/display/sodipodi-ctrlrect.h
 SUBST_FILES.glib2+=	src/display/sp-canvas.h
+SUBST_FILES.glib2+=	src/document-subset.cpp
 SUBST_FILES.glib2+=	src/draw-anchor.h
+SUBST_FILES.glib2+=	src/dyna-draw-context.cpp
+SUBST_FILES.glib2+=	src/eraser-context.cpp
+SUBST_FILES.glib2+=	src/extension/internal/cairo-render-context.cpp
+SUBST_FILES.glib2+=	src/extension/internal/cairo-renderer.cpp
 SUBST_FILES.glib2+=	src/extension/internal/pdfinput/svg-builder.h
+SUBST_FILES.glib2+=	src/extension/internal/win32.cpp
 SUBST_FILES.glib2+=	src/extract-uri.h
+SUBST_FILES.glib2+=	src/file.cpp
 SUBST_FILES.glib2+=	src/file.h
 SUBST_FILES.glib2+=	src/filters/blend-fns.h
 SUBST_FILES.glib2+=	src/filters/colormatrix-fns.h
@@ -45,17 +64,23 @@ SUBST_FILES.glib2+=	src/filters/tile-fns.h
 SUBST_FILES.glib2+=	src/filters/turbulence-fns.h
 SUBST_FILES.glib2+=	src/gc-anchored.h
 SUBST_FILES.glib2+=	src/gc-core.h
+SUBST_FILES.glib2+=	src/gc.cpp
 SUBST_FILES.glib2+=	src/gradient-drag.h
 SUBST_FILES.glib2+=	src/help.h
 SUBST_FILES.glib2+=	src/helper/gnome-utils.h
+SUBST_FILES.glib2+=	src/helper/pixbuf-ops.cpp
 SUBST_FILES.glib2+=	src/helper/pixbuf-ops.h
+SUBST_FILES.glib2+=	src/helper/png-write.cpp
 SUBST_FILES.glib2+=	src/helper/png-write.h
 SUBST_FILES.glib2+=	src/helper/stlport.h
 SUBST_FILES.glib2+=	src/helper/stock-items.h
 SUBST_FILES.glib2+=	src/helper/unit-menu.h
 SUBST_FILES.glib2+=	src/helper/units.h
 SUBST_FILES.glib2+=	src/inkscape.h
+SUBST_FILES.glib2+=	src/inkview.cpp
 SUBST_FILES.glib2+=	src/io/inkjar.h
+SUBST_FILES.glib2+=	src/io/resource.cpp
+SUBST_FILES.glib2+=	src/io/sys.cpp
 SUBST_FILES.glib2+=	src/io/sys.h
 SUBST_FILES.glib2+=	src/knot-holder-entity.h
 SUBST_FILES.glib2+=	src/knotholder.h
@@ -63,12 +88,27 @@ SUBST_FILES.glib2+=	src/libcroco/cr-libxml-node-iface.h
 SUBST_FILES.glib2+=	src/libcroco/cr-node-iface.h
 SUBST_FILES.glib2+=	src/libgdl/gdl-stock.h
 SUBST_FILES.glib2+=	src/libnr/in-svg-plane-test.h
+SUBST_FILES.glib2+=	src/libnr/nr-gradient.cpp
 SUBST_FILES.glib2+=	src/libnr/nr-i-coord.h
 SUBST_FILES.glib2+=	src/libnr/nr-matrix.h
+SUBST_FILES.glib2+=	src/libnr/nr-object.cpp
 SUBST_FILES.glib2+=	src/libnr/nr-object.h
+SUBST_FILES.glib2+=	src/libnr/nr-pixblock-pattern.cpp
+SUBST_FILES.glib2+=	src/libnr/nr-pixblock.cpp
 SUBST_FILES.glib2+=	src/libnr/nr-point-fns-test.h
 SUBST_FILES.glib2+=	src/libnr/nr-rotate-fns-test.h
+SUBST_FILES.glib2+=	src/libnrtype/FontFactory.cpp
+SUBST_FILES.glib2+=	src/libnrtype/Layout-TNG-Output.cpp
+SUBST_FILES.glib2+=	src/libnrtype/nr-type-primitives.cpp
 SUBST_FILES.glib2+=	src/libnrtype/nr-type-primitives.h
+SUBST_FILES.glib2+=	src/livarot/AlphaLigne.cpp
+SUBST_FILES.glib2+=	src/livarot/BitLigne.cpp
+SUBST_FILES.glib2+=	src/livarot/PathSimplify.cpp
+SUBST_FILES.glib2+=	src/livarot/Shape.cpp
+SUBST_FILES.glib2+=	src/livarot/ShapeSweep.cpp
+SUBST_FILES.glib2+=	src/livarot/int-line.cpp
+SUBST_FILES.glib2+=	src/livarot/sweep-event.cpp
+SUBST_FILES.glib2+=	src/livarot/sweep-tree-list.cpp
 SUBST_FILES.glib2+=	src/live_effects/parameter/array.h
 SUBST_FILES.glib2+=	src/live_effects/parameter/bool.h
 SUBST_FILES.glib2+=	src/live_effects/parameter/enum.h
@@ -77,8 +117,11 @@ SUBST_FILES.glib2+=	src/live_effects/parameter/point.h
 SUBST_FILES.glib2+=	src/live_effects/parameter/text.h
 SUBST_FILES.glib2+=	src/live_effects/parameter/vector.h
 SUBST_FILES.glib2+=	src/main-cmdlineact.h
+SUBST_FILES.glib2+=	src/message-context.cpp
+SUBST_FILES.glib2+=	src/message-stack.cpp
 SUBST_FILES.glib2+=	src/modifier-fns.h
 SUBST_FILES.glib2+=	src/object-hierarchy.h
+SUBST_FILES.glib2+=	src/path-chemistry.cpp
 SUBST_FILES.glib2+=	src/removeoverlap.h
 SUBST_FILES.glib2+=	src/sp-conn-end-pair.h
 SUBST_FILES.glib2+=	src/sp-conn-end.h
@@ -93,41 +136,67 @@ SUBST_FILES.glib2+=	src/sp-stop.h
 SUBST_FILES.glib2+=	src/sp-text.h
 SUBST_FILES.glib2+=	src/sp-textpath.h
 SUBST_FILES.glib2+=	src/sp-tspan.h
+SUBST_FILES.glib2+=	src/splivarot.cpp
+SUBST_FILES.glib2+=	src/spray-context.cpp
+SUBST_FILES.glib2+=	src/svg/css-ostringstream.cpp
 SUBST_FILES.glib2+=	src/svg/css-ostringstream.h
 SUBST_FILES.glib2+=	src/svg/stringstream.h
+SUBST_FILES.glib2+=	src/svg/strip-trailing-zeros.cpp
+SUBST_FILES.glib2+=	src/svg/svg-affine.cpp
+SUBST_FILES.glib2+=	src/svg/svg-color.cpp
 SUBST_FILES.glib2+=	src/svg/svg-color.h
+SUBST_FILES.glib2+=	src/svg/svg-length.cpp
 SUBST_FILES.glib2+=	src/svg/svg-length.h
 SUBST_FILES.glib2+=	src/svg/svg-path-geom-test.h
+SUBST_FILES.glib2+=	src/svg/svg-path.cpp
 SUBST_FILES.glib2+=	src/svg/svg.h
 SUBST_FILES.glib2+=	src/text-editing.h
 SUBST_FILES.glib2+=	src/text-tag-attributes.h
+SUBST_FILES.glib2+=	src/trace/potrace/potracelib.cpp
+SUBST_FILES.glib2+=	src/tweak-context.cpp
+SUBST_FILES.glib2+=	src/ui/cache/svg_preview_cache.cpp
 SUBST_FILES.glib2+=	src/ui/dialog/desktop-tracker.h
 SUBST_FILES.glib2+=	src/ui/dialog/dialog-manager.h
+SUBST_FILES.glib2+=	src/ui/dialog/icon-preview.cpp
+SUBST_FILES.glib2+=	src/ui/widget/icon-widget.cpp
+SUBST_FILES.glib2+=	src/ui/widget/spin-slider.cpp
 SUBST_FILES.glib2+=	src/unclump.h
 SUBST_FILES.glib2+=	src/uri.h
 SUBST_FILES.glib2+=	src/util/glib-list-iterators.h
+SUBST_FILES.glib2+=	src/util/share.cpp
+SUBST_FILES.glib2+=	src/version.cpp
 SUBST_FILES.glib2+=	src/version.h
+SUBST_FILES.glib2+=	src/widgets/icon.cpp
 SUBST_FILES.glib2+=	src/widgets/sp-color-icc-selector.h
 SUBST_FILES.glib2+=	src/widgets/sp-color-scales.h
 SUBST_FILES.glib2+=	src/widgets/sp-color-wheel-selector.h
 SUBST_FILES.glib2+=	src/widgets/spinbutton-events.h
 SUBST_FILES.glib2+=	src/widgets/spw-utilities.h
+SUBST_FILES.glib2+=	src/widgets/stroke-style.cpp
 SUBST_FILES.glib2+=	src/xml/attribute-record.h
 SUBST_FILES.glib2+=	src/xml/comment-node.h
+SUBST_FILES.glib2+=	src/xml/croco-node-iface.cpp
 SUBST_FILES.glib2+=	src/xml/event.h
 SUBST_FILES.glib2+=	src/xml/node-event-vector.h
 SUBST_FILES.glib2+=	src/xml/node-observer.h
 SUBST_FILES.glib2+=	src/xml/node.h
 SUBST_FILES.glib2+=	src/xml/pi-node.h
+SUBST_FILES.glib2+=	src/xml/quote.cpp
+SUBST_FILES.glib2+=	src/xml/rebase-hrefs.cpp
 SUBST_FILES.glib2+=	src/xml/rebase-hrefs.h
 SUBST_FILES.glib2+=	src/xml/repr.h
+SUBST_FILES.glib2+=	src/xml/simple-node.cpp
 SUBST_FILES.glib2+=	src/xml/text-node.h
 
 SUBST_SED.glib2+=	-e '/\#include/s,"glib/glist.h","glib.h",'
+SUBST_SED.glib2+=	-e '/\#include/s,"glib/gstrfuncs.h","glib.h",'
 SUBST_SED.glib2+=	-e '/\#include/s,"glib/gslist.h","glib.h",'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/garray.h>,<glib.h>,'
+SUBST_SED.glib2+=	-e '/\#include/s,<glib/gconvert.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gdir.h>,<glib.h>,'
+SUBST_SED.glib2+=	-e '/\#include/s,<glib/gerror.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gfileutils.h>,<glib.h>,'
+SUBST_SED.glib2+=	-e '/\#include/s,<glib/ghash.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/glist.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gmacros.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gmain.h>,<glib.h>,'
@@ -138,3 +207,5 @@ SUBST_SED.glib2+=	-e '/\#include/s,<glib/gslist.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gstrfuncs.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gstring.h>,<glib.h>,'
 SUBST_SED.glib2+=	-e '/\#include/s,<glib/gtypes.h>,<glib.h>,'
+SUBST_SED.glib2+=	-e '/\#include/s,<glib/gurifuncs.h>,<glib.h>,'
+SUBST_SED.glib2+=	-e '/\#include/s,<glib/gutils.h>,<glib.h>,'