pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/inkscape update to 0.48.3.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/86a6a7ba550e
branches:  trunk
changeset: 604539:86a6a7ba550e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jun 01 20:23:10 2012 +0000

description:
update to 0.48.3.1
changes:
-bugfixes
-build fixes, in particular for newer glib2

diffstat:

 graphics/inkscape/Makefile         |    9 +-
 graphics/inkscape/PLIST            |   15 ++-
 graphics/inkscape/distinfo         |   12 +-
 graphics/inkscape/glib2-fixes.mk   |  213 -------------------------------------
 graphics/inkscape/patches/patch-aa |    6 +-
 graphics/inkscape/patches/patch-ac |   35 +++++-
 6 files changed, 53 insertions(+), 237 deletions(-)

diffs (truncated from 389 to 300 lines):

diff -r 164c4803d107 -r 86a6a7ba550e graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile        Fri Jun 01 20:21:03 2012 +0000
+++ b/graphics/inkscape/Makefile        Fri Jun 01 20:23:10 2012 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2012/05/16 18:27:12 marino Exp $
+# $NetBSD: Makefile,v 1.70 2012/06/01 20:23:10 drochner Exp $
 
-DISTNAME=      inkscape-0.48.2
-PKGREVISION=   6
+DISTNAME=      inkscape-0.48.3.1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=  .tar.bz2
@@ -26,6 +25,7 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                MSGFMT=${TOOLS_DIR}/bin/msgfmt
 CONFIGURE_ENV+=                GMSGFMT=${TOOLS_DIR}/bin/msgfmt
+CONFIGURE_ARGS+=       --with-python
 
 REPLACE_PERL+=         share/extensions/*.p[lm]
 REPLACE_PERL+=         share/extensions/svg_dropshadow
@@ -37,9 +37,6 @@
 
 LDFLAGS.DragonFly=     -lX11
 
-# This is a single SUBST, but it's hefty enough I've put it in its own file.
-.include "glib2-fixes.mk"
-
 SUBST_CLASSES+= pypath
 SUBST_STAGE.pypath= pre-configure
 SUBST_FILES.pypath= src/extension/implementation/script.cpp
diff -r 164c4803d107 -r 86a6a7ba550e graphics/inkscape/PLIST
--- a/graphics/inkscape/PLIST   Fri Jun 01 20:21:03 2012 +0000
+++ b/graphics/inkscape/PLIST   Fri Jun 01 20:23:10 2012 +0000
@@ -1,9 +1,18 @@
-@comment $NetBSD: PLIST,v 1.19 2011/02/05 07:57:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/06/01 20:23:10 drochner Exp $
 bin/inkscape
 bin/inkview
-man/fr/man1/inkscape.1
+man/el/man1/inkscape.el.1
+man/fr/man1/inkscape.fr.1
+man/ja/man1/inkscape.ja.1
 man/man1/inkscape.1
+man/man1/inkscape.el.1
+man/man1/inkscape.fr.1
+man/man1/inkscape.ja.1
+man/man1/inkscape.sk.1
+man/man1/inkscape.zh_TW.1
 man/man1/inkview.1
+man/sk/man1/inkscape.ja.1
+man/zh_TW/man1/inkscape.zh_TW.1
 share/applications/inkscape.desktop
 share/icons/hicolor/16x16/apps/inkscape.png
 share/icons/hicolor/22x22/apps/inkscape.png
@@ -419,6 +428,7 @@
 share/inkscape/extensions/uniconv-ext.py
 share/inkscape/extensions/uniconv_output.py
 share/inkscape/extensions/voronoi.py
+share/inkscape/extensions/voronoi2svg.py
 share/inkscape/extensions/web-set-att.inx
 share/inkscape/extensions/web-set-att.py
 share/inkscape/extensions/web-transmit-att.inx
@@ -796,7 +806,6 @@
 share/locale/eu/LC_MESSAGES/inkscape.mo
 share/locale/fa/LC_MESSAGES/inkscape.mo
 share/locale/fi/LC_MESSAGES/inkscape.mo
-share/locale/fr/LC_MESSAGES/inkscape.mo
 share/locale/ga/LC_MESSAGES/inkscape.mo
 share/locale/gl/LC_MESSAGES/inkscape.mo
 share/locale/he/LC_MESSAGES/inkscape.mo
diff -r 164c4803d107 -r 86a6a7ba550e graphics/inkscape/distinfo
--- a/graphics/inkscape/distinfo        Fri Jun 01 20:21:03 2012 +0000
+++ b/graphics/inkscape/distinfo        Fri Jun 01 20:23:10 2012 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.36 2011/07/12 18:55:09 drochner Exp $
+$NetBSD: distinfo,v 1.37 2012/06/01 20:23:10 drochner Exp $
 
-SHA1 (inkscape-0.48.2.tar.bz2) = be30ab2d2714d04ddd69b400bd6ad30b09e83067
-RMD160 (inkscape-0.48.2.tar.bz2) = 3f658d373f976a41191d48d8248b33dfb3d65238
-Size (inkscape-0.48.2.tar.bz2) = 19583331 bytes
-SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb
+SHA1 (inkscape-0.48.3.1.tar.bz2) = 23344555a1b5cc7909ad01d926cfaddb67bfbde9
+RMD160 (inkscape-0.48.3.1.tar.bz2) = 139720f01b987001b558226ec2de60b36fb1123c
+Size (inkscape-0.48.3.1.tar.bz2) = 19688778 bytes
+SHA1 (patch-aa) = d946236902fc6cf0d2ddcbb9dd667b4d9c6f99d4
 SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
-SHA1 (patch-ac) = b185f60464728ece789cb2da27dfb7b849082e42
+SHA1 (patch-ac) = 52a5290810ed43514b540f9a9b324e711f6b4637
 SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
 SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
diff -r 164c4803d107 -r 86a6a7ba550e graphics/inkscape/glib2-fixes.mk
--- a/graphics/inkscape/glib2-fixes.mk  Fri Jun 01 20:21:03 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-# $NetBSD: glib2-fixes.mk,v 1.3 2012/05/08 02:42:09 dholland Exp $
-
-# Fix build with the latest glib2.
-
-SUBST_CLASSES+=                glib2
-SUBST_MESSAGE.glib2=   Fixing glib2 includes.
-# For testing, post-patch is better. For production, pre-build decreases
-# the chances of confusion and of bad interactions with patches.
-#SUBST_STAGE.glib2=    post-patch
-SUBST_STAGE.glib2=     pre-build
-
-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
-SUBST_FILES.glib2+=    src/filters/componenttransfer-fns.h
-SUBST_FILES.glib2+=    src/filters/composite-fns.h
-SUBST_FILES.glib2+=    src/filters/convolvematrix-fns.h
-SUBST_FILES.glib2+=    src/filters/diffuselighting-fns.h
-SUBST_FILES.glib2+=    src/filters/displacementmap-fns.h
-SUBST_FILES.glib2+=    src/filters/flood-fns.h
-SUBST_FILES.glib2+=    src/filters/image-fns.h
-SUBST_FILES.glib2+=    src/filters/merge-fns.h
-SUBST_FILES.glib2+=    src/filters/morphology-fns.h
-SUBST_FILES.glib2+=    src/filters/offset-fns.h
-SUBST_FILES.glib2+=    src/filters/specularlighting-fns.h
-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
-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
-SUBST_FILES.glib2+=    src/live_effects/parameter/path.h
-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
-SUBST_FILES.glib2+=    src/sp-filter-fns.h
-SUBST_FILES.glib2+=    src/sp-gaussian-blur-fns.h
-SUBST_FILES.glib2+=    src/sp-gradient-fns.h
-SUBST_FILES.glib2+=    src/sp-gradient-vector.h
-SUBST_FILES.glib2+=    src/sp-linear-gradient-fns.h
-SUBST_FILES.glib2+=    src/sp-metrics.h
-SUBST_FILES.glib2+=    src/sp-radial-gradient.h
-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>,'



Home | Main Index | Thread Index | Old Index