Update inkscape to 0.48.0, from brad

ok sthen@
This commit is contained in:
armani 2010-10-05 08:57:47 +00:00
parent c98fade553
commit edafc0303d
14 changed files with 394 additions and 445 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2010/09/13 17:52:53 jasper Exp $
# $OpenBSD: Makefile,v 1.15 2010/10/05 08:57:47 armani Exp $
COMMENT= SVG vector drawing application
DISTNAME= inkscape-0.46
REVISION= 12
DISTNAME= inkscape-0.48.0
CATEGORIES= graphics
MAINTAINER= Benoit Chesneau <benoitc@metavers.net>
@ -19,12 +18,12 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xft Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
Xi Xinerama Xrandr Xrender aspell atk-1.0 c cairo \
cairomm-1.0 expat fontconfig freetype glib-2.0 glibmm-2.4 \
glitz gmodule-2.0 gobject-2.0 gthread-2.0 m \
glitz gmodule-2.0 gobject-2.0 gsl gslcblas gthread-2.0 m \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread \
sigc-2.0 stdc++ xml2 z gio-2.0 giomm-2.4 \
pthread-stubs xcb gc.>=3 popt MagickCore Magick++ MagickWand \
pthread-stubs xcb gc.>=3 popt MagickCore Magick++ \
lcms png xslt poppler poppler-glib atkmm-1.6 gdkmm-2.4 \
gtkmm-2.4 pangomm-1.4 gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \
gtkspell xcb-render xcb-render-util
@ -33,21 +32,19 @@ MODULES= devel/gettext \
textproc/intltool
BUILD_DEPENDS= ::devel/boost
LIB_DEPENDS= ::devel/boehm-gc \
::devel/gsl \
::devel/pangomm \
::devel/popt \
::graphics/ImageMagick \
::graphics/lcms \
::graphics/png \
::textproc/libxslt \
::print/poppler \
::textproc/aspell/core \
::textproc/gtkspell \
::textproc/libxslt \
::x11/gtk2mm \
::devel/pangomm \
::x11/gtk+2 \
::textproc/gtkspell
FAKE_FLAGS= itlocaledir="${PREFIX}/share/locale/"
::x11/gtk+2
RUN_DEPENDS= ::devel/desktop-file-utils \
::textproc/py-lxml
@ -56,21 +53,14 @@ USE_LIBTOOL= Yes
USE_X11= Yes
NO_REGRESS= Yes
CONFIGURE_STYLE= autoconf gnu
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS= --with-popt --mandir=${PREFIX}/man \
--with-xft --without-gnome-print \
--without-gnome-vfs --enable-lcms
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-silent-rules --without-gnome-vfs
CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/libpng \
-I${LOCALBASE}/include/ImageMagick
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig" \
GMSGFMT="${LOCALBASE}/bin/msgfmt" \
MSGFMT="${LOCALBASE}/bin/msgfmt"
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (inkscape-0.46.tar.gz) = O66QNARzeQEhJ+UvmxONMg==
RMD160 (inkscape-0.46.tar.gz) = RJ4H+kyqcfIAJXdDU9GcrWdGMaw=
SHA1 (inkscape-0.46.tar.gz) = t8U8bSvA3k/yTUpr7oY1n/Eb7yc=
SHA256 (inkscape-0.46.tar.gz) = kYYeDXIigRbTHgcZL3f+nglo1O0GSZgpstZuZBSWmTo=
SIZE (inkscape-0.46.tar.gz) = 18615326
MD5 (inkscape-0.48.0.tar.gz) = u5RUO4ExV9gygWV6iUZdRg==
RMD160 (inkscape-0.48.0.tar.gz) = DZfBcTb+aaIki7TPTS9ils4Yw38=
SHA1 (inkscape-0.48.0.tar.gz) = IgremBBpqR06+rnL/3X2XHURnaI=
SHA256 (inkscape-0.48.0.tar.gz) = CBL2ymOqfEuyNskyoCvU4MtSCUBLtCz/X2WtD4SEQXY=
SIZE (inkscape-0.48.0.tar.gz) = 25870275

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- Makefile.in.orig Sun Mar 30 20:56:25 2008
+++ Makefile.in Sun Mar 30 20:56:57 2008
@@ -14,6 +14,7 @@
@SET_MAKE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- configure.ac.orig Sun Mar 30 20:35:59 2008
+++ configure.ac Sun Mar 30 20:36:04 2008
@@ -315,6 +315,9 @@ fi
AC_SUBST(GNOME_VFS_CFLAGS)
AC_SUBST(GNOME_VFS_LIBS)
+# glib-genmarshal
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
dnl ******************************
dnl libinkjar checking
dnl ******************************

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- src/Makefile.in.orig Tue Mar 11 05:47:10 2008
+++ src/Makefile.in Sun Mar 30 20:58:16 2008
@@ -77,7 +77,7 @@
# repaced with (wrapper of?) DOM
#
-
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -7282,16 +7282,10 @@ helper/clean:
helper/unit-menu.$(OBJEXT): helper/sp-marshal.h
-# TODO: Check that the generated sp-marshal.h is the same as before.
-helper/sp-marshal.h: helper/sp-marshal.list
- glib-genmarshal --prefix=sp_marshal --header $(srcdir)/helper/sp-marshal.list > helper/tmp.$$$$ \
- && mv helper/tmp.$$$$ helper/sp-marshal.h
-
-helper/sp-marshal.cpp: helper/sp-marshal.list helper/sp-marshal.h
- ( echo '#include "helper/sp-marshal.h"' && \
- glib-genmarshal --prefix=sp_marshal --body $(srcdir)/helper/sp-marshal.list ) \
- > helper/tmp.$$$$ \
- && mv helper/tmp.$$$$ helper/sp-marshal.cpp
+helper/sp-marshal.h: helper/sp-marshal.list $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --header --prefix=sp_marshal > $@
+helper/sp-marshal.c: helper/sp-marshal.list $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --body --prefix=sp_marshal > $@
helper/sp-marshal.cpp helper/sp-marshal.h: Makefile

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_display_nr-arena-shape_cpp,v 1.1 2010/10/05 08:57:47 armani Exp $
--- src/display/nr-arena-shape.cpp.orig Wed Sep 15 13:14:17 2010
+++ src/display/nr-arena-shape.cpp Wed Sep 15 13:14:31 2010
@@ -39,7 +39,6 @@
#include <glib.h>
#include "svg/svg.h"
-#include <fenv.h>
//int showRuns=0;
void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS);

View File

@ -1,117 +0,0 @@
$OpenBSD: patch-src_extension_internal_pdfinput_pdf-parser_cpp,v 1.2 2009/12/04 20:12:35 kili Exp $
--- src/extension/internal/pdfinput/pdf-parser.cpp.orig Tue Mar 11 05:20:21 2008
+++ src/extension/internal/pdfinput/pdf-parser.cpp Mon Nov 30 21:32:15 2009
@@ -810,7 +810,7 @@ void PdfParser::opSetExtGState(Object args[], int numA
blendingColorSpace = NULL;
isolated = knockout = gFalse;
if (!obj4.dictLookup("CS", &obj5)->isNull()) {
- blendingColorSpace = GfxColorSpace::parse(&obj5);
+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
}
obj5.free();
if (obj4.dictLookup("I", &obj5)->isBool()) {
@@ -1010,9 +1010,9 @@ void PdfParser::opSetFillColorSpace(Object args[], int
state->setFillPattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0]);
+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
} else {
- colorSpace = GfxColorSpace::parse(&obj);
+ colorSpace = GfxColorSpace::parse(&obj, NULL);
}
obj.free();
if (colorSpace) {
@@ -1033,9 +1033,9 @@ void PdfParser::opSetStrokeColorSpace(Object args[], i
state->setStrokePattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0]);
+ colorSpace = GfxColorSpace::parse(&args[0], NULL);
} else {
- colorSpace = GfxColorSpace::parse(&obj);
+ colorSpace = GfxColorSpace::parse(&obj, NULL);
}
obj.free();
if (colorSpace) {
@@ -1102,7 +1102,7 @@ void PdfParser::opSetFillColorN(Object args[], int num
builder->updateStyle(state);
}
if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
state->setFillPattern(pattern);
builder->updateStyle(state);
}
@@ -1146,7 +1146,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int n
builder->updateStyle(state);
}
if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
state->setStrokePattern(pattern);
builder->updateStyle(state);
}
@@ -1544,7 +1544,7 @@ void PdfParser::opShFill(Object args[], int numArgs) {
double *matrix = NULL;
GBool savedState = gFalse;
- if (!(shading = res->lookupShading(args[0].getName()))) {
+ if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
return;
}
@@ -2196,7 +2196,7 @@ void PdfParser::doShowText(GooString *s) {
int wMode;
double riseX, riseY;
CharCode code;
- Unicode u[8];
+ Unicode *u = NULL;
double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
double originX, originY, tOriginX, tOriginY;
double oldCTM[6], newCTM[6];
@@ -2244,7 +2244,7 @@ void PdfParser::doShowText(GooString *s) {
len = s->getLength();
while (len > 0) {
n = font->getNextChar(p, len, &code,
- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
+ &u, &uLen,
&dx, &dy, &originX, &originY);
dx = dx * state->getFontSize() + state->getCharSpace();
if (n == 1 && *p == ' ') {
@@ -2293,7 +2293,7 @@ void PdfParser::doShowText(GooString *s) {
len = s->getLength();
while (len > 0) {
n = font->getNextChar(p, len, &code,
- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
+ &u, &uLen,
&dx, &dy, &originX, &originY);
if (wMode) {
@@ -2487,7 +2487,7 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
}
}
if (!obj1.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj1);
+ colorSpace = GfxColorSpace::parse(&obj1, NULL);
} else if (csMode == streamCSDeviceGray) {
colorSpace = new GfxDeviceGrayColorSpace();
} else if (csMode == streamCSDeviceRGB) {
@@ -2572,7 +2572,7 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
obj2.free();
}
}
- maskColorSpace = GfxColorSpace::parse(&obj1);
+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
obj1.free();
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
goto err1;
@@ -2747,7 +2747,7 @@ void PdfParser::doForm(Object *str) {
if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
transpGroup = gTrue;
if (!obj1.dictLookup("CS", &obj3)->isNull()) {
- blendingColorSpace = GfxColorSpace::parse(&obj3);
+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
}
obj3.free();
if (obj1.dictLookup("I", &obj3)->isBool()) {

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_helper_Makefile_insert,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- src/helper/Makefile_insert.orig Sun Mar 30 20:48:01 2008
+++ src/helper/Makefile_insert Sun Mar 30 20:48:58 2008
@@ -35,17 +35,10 @@ helper_libspchelp_a_SOURCES = \
helper/stock-items.cpp \
helper/stock-items.h
-
-# TODO: Check that the generated sp-marshal.h is the same as before.
-helper/sp-marshal.h: helper/sp-marshal.list
- glib-genmarshal --prefix=sp_marshal --header $(srcdir)/helper/sp-marshal.list > helper/tmp.$$$$ \
- && mv helper/tmp.$$$$ helper/sp-marshal.h
-
-helper/sp-marshal.cpp: helper/sp-marshal.list helper/sp-marshal.h
- ( echo '#include "helper/sp-marshal.h"' && \
- glib-genmarshal --prefix=sp_marshal --body $(srcdir)/helper/sp-marshal.list ) \
- > helper/tmp.$$$$ \
- && mv helper/tmp.$$$$ helper/sp-marshal.cpp
+helper/sp-marshal.h: helper/sp-marshal.list $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --header --prefix=sp_marshal > $@
+helper/sp-marshal.c: helper/sp-marshal.list $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --body --prefix=sp_marshal > $@
helper/sp-marshal.cpp helper/sp-marshal.h: Makefile

View File

@ -1,110 +0,0 @@
$OpenBSD: patch-src_persp3d_cpp,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- src/persp3d.cpp.orig Tue Mar 11 05:20:26 2008
+++ src/persp3d.cpp Wed Apr 2 21:19:13 2008
@@ -93,7 +93,8 @@ persp3d_init(Persp3D *persp)
{
persp->tmat = Proj::TransfMat3x4 ();
- persp->boxes_transformed.clear();
+ persp->boxes_transformed = new std::map<SPBox3D *, bool>;
+ persp->boxes_transformed->clear();
persp->document = NULL;
persp->my_counter = global_counter++;
@@ -123,6 +124,8 @@ static void persp3d_build(SPObject *object, SPDocument
* Virtual release of Persp3D members before destruction.
*/
static void persp3d_release(SPObject *object) {
+ Persp3D *persp = SP_PERSP3D (object);
+ delete persp->boxes_transformed;
SP_OBJECT_REPR(object)->removeListenerByData(object);
}
@@ -420,44 +423,44 @@ persp3d_has_box (Persp3D *persp, SPBox3D *box) {
void
persp3d_add_box_transform (Persp3D *persp, SPBox3D *box) {
- std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.find(box);
- if (i != persp->boxes_transformed.end() && (*i).second == true) {
+ std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->find(box);
+ if (i != persp->boxes_transformed->end() && (*i).second == true) {
g_print ("Warning! In %s (%d): trying to add transform status for box %d twice when it's already listed as true.\n", SP_OBJECT_REPR(persp)->attribute("id"), persp->my_counter, box->my_counter);
return;
}
- persp->boxes_transformed[box] = false;
+ (*persp->boxes_transformed)[box] = false;
}
void
persp3d_remove_box_transform (Persp3D *persp, SPBox3D *box) {
- persp->boxes_transformed.erase(box);
+ persp->boxes_transformed->erase(box);
}
void
persp3d_set_box_transformed (Persp3D *persp, SPBox3D *box, bool transformed) {
- if (persp->boxes_transformed.find(box) == persp->boxes_transformed.end()) {
+ if (persp->boxes_transformed->find(box) == persp->boxes_transformed->end()) {
g_print ("Warning! In %s (%d): trying to set transform status for box %d, but it is not listed in the perspective!! Aborting.\n",
SP_OBJECT_REPR(persp)->attribute("id"), persp->my_counter,
box->my_counter);
return;
}
- persp->boxes_transformed[box] = transformed;
+ (*persp->boxes_transformed)[box] = transformed;
}
bool
persp3d_was_transformed (Persp3D *persp) {
- if (persp->boxes_transformed.size() == 1) {
+ if (persp->boxes_transformed->size() == 1) {
/* either the transform has not been applied to the single box associated to this perspective yet
or the transform was already reset; in both cases we need to return false because upcoming
transforms need to be applied */
- (*persp->boxes_transformed.begin()).second = false; // make sure the box is marked as untransformed (in case more boxes are added later)
+ (*persp->boxes_transformed->begin()).second = false; // make sure the box is marked as untransformed (in case more boxes are added later)
return false;
}
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
if ((*i).second == true) {
// at least one of the boxes in the perspective has already been transformed;
return true;
@@ -468,8 +471,8 @@ persp3d_was_transformed (Persp3D *persp) {
bool
persp3d_all_transformed(Persp3D *persp) {
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
if ((*i).second == false) {
return false;
}
@@ -479,8 +482,8 @@ persp3d_all_transformed(Persp3D *persp) {
void
persp3d_unset_transforms(Persp3D *persp) {
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
(*i).second = false;
}
}
@@ -650,8 +653,8 @@ persp3d_print_all_selected() {
for (std::set<Persp3D *>::iterator j = sel_persps.begin(); j != sel_persps.end(); ++j) {
Persp3D *persp = SP_PERSP3D(*j);
g_print (" %s (%d): ", SP_OBJECT_REPR(persp)->attribute("id"), persp->my_counter);
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
g_print ("<%d,%d> ", (*i).first->my_counter, (*i).second);
}
g_print ("\n");

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_persp3d_h,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- src/persp3d.h.orig Tue Mar 11 05:20:30 2008
+++ src/persp3d.h Wed Apr 2 21:19:13 2008
@@ -34,7 +34,7 @@ struct Persp3D : public SPObject {
// Also write the list of boxes into the xml repr and vice versa link boxes to their persp3d?
std::vector<SPBox3D *> boxes;
- std::map<SPBox3D *, bool> boxes_transformed; // TODO: eventually we should merge this with 'boxes'
+ std::map<SPBox3D *, bool>* boxes_transformed; // TODO: eventually we should merge this with 'boxes'
SPDocument *document; // should this rather be the SPDesktop?
// for debugging only

View File

@ -1,13 +1,11 @@
$OpenBSD: patch-src_ui_dialog_print_cpp,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
--- src/ui/dialog/print.cpp.orig Fri Mar 28 17:50:41 2008
+++ src/ui/dialog/print.cpp Fri Mar 28 17:51:21 2008
@@ -16,6 +16,9 @@
#include <io.h>
$OpenBSD: patch-src_ui_dialog_print_cpp,v 1.2 2010/10/05 08:57:47 armani Exp $
--- src/ui/dialog/print.cpp.orig Wed Sep 15 20:24:17 2010
+++ src/ui/dialog/print.cpp Wed Sep 15 20:24:39 2010
@@ -17,6 +17,7 @@
#endif
+#if defined(__OpenBSD__)
+#include <unistd.h>
+#endif
#include <gtkmm/stock.h>
+#include <unistd.h>
#include "print.h"
#include "extension/internal/cairo-render-context.h"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_widgets_sp-xmlview-attr-list_h,v 1.1 2009/01/25 00:29:03 stsp Exp $
--- src/widgets/sp-xmlview-attr-list.h.orig Sat Jan 24 12:24:43 2009
+++ src/widgets/sp-xmlview-attr-list.h Sat Jan 24 12:26:02 2009
@@ -13,7 +13,7 @@
*/
#include <stdio.h>
-#include <gtk/gtkclist.h>
+#include <gtk/gtk.h>
#include "../xml/repr.h"
#include <glib.h>

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-utf8-to-roff,v 1.1 2008/10/03 11:17:17 sthen Exp $
r18573 from upstream;
"utf8-to-roff: work around what's arguably a bug in perl 5.10"
--- utf8-to-roff.orig Tue Mar 11 04:20:51 2008
+++ utf8-to-roff Fri Oct 3 12:05:01 2008
@@ -1,9 +1,25 @@
-#! /usr/bin/perl -w -CI
+if (true || '\'); then exec perl -CI "$0" "$@"; fi # ') {}
+# The above uses the fact that backslash isn't special in single quotes in
+# shell script, whereas in perl it escapes the following single quote.
+#
+# The problem it tries to solve is that we want perl to be run with -CI flag
+# (to have stdin interpreted as utf-8), so we would use `#! /usr/bin/perl -CI',
+# except that if we do that then perl 5.10 complains about it being too late
+# to apply -CI if the script is run with `perl -CI ./utf8-to-roff', as we want
+# to do from the Makefile. The reason we don't do `./utf8-to-roff' from the makefile
+# is that then we require the #! line to have the right location of perl instead of
+# just consulting the path. (Similarly, we could use `#! /usr/bin/env perl -CI',
+# though that still requires that /usr/bin/env exist.) The reason we don't just
+# remove the `-CI' from the #! line is that then the script couldn't be run correctly
+# with ./utf8-to-roff.
+
+
# Converts a man page from utf8 (not understood by groff 1.18) to groff escapes.
# I couldn't find any existing tool to convert from utf8 to groff, though I
# seem to recall seeing some code to do so somewhere.
#
# Hereby released into public domain by Peter Moulder.
+use warnings;
use strict;
# Table generated automatically using:

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2009/12/22 16:06:41 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/10/05 08:57:47 armani Exp $
@bin bin/inkscape
@bin bin/inkview
man/fr/
@ -7,6 +7,26 @@ man/fr/man1/
@man man/man1/inkscape.1
@man man/man1/inkview.1
share/applications/inkscape.desktop
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/inkscape.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/inkscape.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/inkscape.png
share/icons/hicolor/256x256/
share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/inkscape.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/inkscape.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/inkscape.png
share/inkscape/
share/inkscape/clipart/
share/inkscape/clipart/README
@ -23,6 +43,7 @@ share/inkscape/examples/blend_modes.svg
share/inkscape/examples/car.svgz
share/inkscape/examples/data_uri.svg
share/inkscape/examples/eastern-motive-P4G.svg
share/inkscape/examples/filters.svg
share/inkscape/examples/flow-go.svg
share/inkscape/examples/flowsample.svg
share/inkscape/examples/gallardo.svgz
@ -32,17 +53,20 @@ share/inkscape/examples/gradient.svg
share/inkscape/examples/i18n.svg
share/inkscape/examples/istest.pov
share/inkscape/examples/l-systems.svgz
share/inkscape/examples/lighting_effects.svg
share/inkscape/examples/lighting_filters.svg
share/inkscape/examples/live-path-effects-curvestitch.svg
share/inkscape/examples/live-path-effects-gears.svg
share/inkscape/examples/live-path-effects-pathalongpath.svg
share/inkscape/examples/markers.svg
share/inkscape/examples/replace-hue.svg
share/inkscape/examples/rope-3D.svg
share/inkscape/examples/stars.svgz
share/inkscape/examples/svgfont.svg
share/inkscape/examples/tesselation-P3.svg
share/inkscape/examples/text-on-path.svg
share/inkscape/examples/tiger.svgz
share/inkscape/examples/turbulence_effects.svg
share/inkscape/examples/tref.svg
share/inkscape/examples/turbulence_filters.svg
share/inkscape/extensions/
share/inkscape/extensions/Barcode/
share/inkscape/extensions/Barcode/Base.py
@ -51,22 +75,129 @@ share/inkscape/extensions/Barcode/Code39.py
share/inkscape/extensions/Barcode/Code39Ext.py
share/inkscape/extensions/Barcode/Code93.py
share/inkscape/extensions/Barcode/EAN13.py
share/inkscape/extensions/Barcode/EAN5.py
share/inkscape/extensions/Barcode/EAN8.py
share/inkscape/extensions/Barcode/RM4CC.py
share/inkscape/extensions/Barcode/UPCA.py
share/inkscape/extensions/Barcode/UPCE.py
share/inkscape/extensions/Barcode/__init__.py
share/inkscape/extensions/Inkscape.pm
share/inkscape/extensions/Poly3DObjects/
share/inkscape/extensions/Poly3DObjects/cube.obj
share/inkscape/extensions/Poly3DObjects/cuboct.obj
share/inkscape/extensions/Poly3DObjects/dodec.obj
share/inkscape/extensions/Poly3DObjects/great_dodec.obj
share/inkscape/extensions/Poly3DObjects/great_rhombicosidodec.obj
share/inkscape/extensions/Poly3DObjects/great_rhombicuboct.obj
share/inkscape/extensions/Poly3DObjects/great_stel_dodec.obj
share/inkscape/extensions/Poly3DObjects/icos.obj
share/inkscape/extensions/Poly3DObjects/icosidodec.obj
share/inkscape/extensions/Poly3DObjects/jessens_orthog_icos.obj
share/inkscape/extensions/Poly3DObjects/methane.obj
share/inkscape/extensions/Poly3DObjects/oct.obj
share/inkscape/extensions/Poly3DObjects/rh_axes.obj
share/inkscape/extensions/Poly3DObjects/rhomb_dodec.obj
share/inkscape/extensions/Poly3DObjects/rhomb_triacont.obj
share/inkscape/extensions/Poly3DObjects/small_rhombicosidodec.obj
share/inkscape/extensions/Poly3DObjects/small_rhombicuboct.obj
share/inkscape/extensions/Poly3DObjects/small_triam_icos.obj
share/inkscape/extensions/Poly3DObjects/snub_cube.obj
share/inkscape/extensions/Poly3DObjects/snub_dodec.obj
share/inkscape/extensions/Poly3DObjects/szilassi.obj
share/inkscape/extensions/Poly3DObjects/tet.obj
share/inkscape/extensions/Poly3DObjects/trunc_cube.obj
share/inkscape/extensions/Poly3DObjects/trunc_dodec.obj
share/inkscape/extensions/Poly3DObjects/trunc_icos.obj
share/inkscape/extensions/Poly3DObjects/trunc_oct.obj
share/inkscape/extensions/Poly3DObjects/trunc_tet.obj
share/inkscape/extensions/SpSVG.pm
share/inkscape/extensions/addnodes.inx
share/inkscape/extensions/addnodes.py
share/inkscape/extensions/ai_input.inx
share/inkscape/extensions/ai_output.inx
share/inkscape/extensions/aisvg.inx
share/inkscape/extensions/aisvg.xslt
share/inkscape/extensions/alphabet_soup/
share/inkscape/extensions/alphabet_soup/2.svg
share/inkscape/extensions/alphabet_soup/3.svg
share/inkscape/extensions/alphabet_soup/6.svg
share/inkscape/extensions/alphabet_soup/7.svg
share/inkscape/extensions/alphabet_soup/Cblob.svg
share/inkscape/extensions/alphabet_soup/Chook.svg
share/inkscape/extensions/alphabet_soup/Ctail.svg
share/inkscape/extensions/alphabet_soup/Delta.svg
share/inkscape/extensions/alphabet_soup/Eb.svg
share/inkscape/extensions/alphabet_soup/Eserif.svg
share/inkscape/extensions/alphabet_soup/Et.svg
share/inkscape/extensions/alphabet_soup/G.svg
share/inkscape/extensions/alphabet_soup/IBSerif.svg
share/inkscape/extensions/alphabet_soup/ITSerif.svg
share/inkscape/extensions/alphabet_soup/Lb.svg
share/inkscape/extensions/alphabet_soup/Lt.svg
share/inkscape/extensions/alphabet_soup/Ocross.svg
share/inkscape/extensions/alphabet_soup/Oterm.svg
share/inkscape/extensions/alphabet_soup/P.svg
share/inkscape/extensions/alphabet_soup/Q.svg
share/inkscape/extensions/alphabet_soup/Rblock.svg
share/inkscape/extensions/alphabet_soup/Tb.svg
share/inkscape/extensions/alphabet_soup/Tt.svg
share/inkscape/extensions/alphabet_soup/U.svg
share/inkscape/extensions/alphabet_soup/Vser.svg
share/inkscape/extensions/alphabet_soup/Xh.svg
share/inkscape/extensions/alphabet_soup/Xne.svg
share/inkscape/extensions/alphabet_soup/Xnw.svg
share/inkscape/extensions/alphabet_soup/Xvb.svg
share/inkscape/extensions/alphabet_soup/Xvt.svg
share/inkscape/extensions/alphabet_soup/a.svg
share/inkscape/extensions/alphabet_soup/abase.svg
share/inkscape/extensions/alphabet_soup/acap.svg
share/inkscape/extensions/alphabet_soup/b.svg
share/inkscape/extensions/alphabet_soup/bar.svg
share/inkscape/extensions/alphabet_soup/bar2.svg
share/inkscape/extensions/alphabet_soup/barcap.svg
share/inkscape/extensions/alphabet_soup/c.svg
share/inkscape/extensions/alphabet_soup/cross.svg
share/inkscape/extensions/alphabet_soup/cserif.svg
share/inkscape/extensions/alphabet_soup/e.svg
share/inkscape/extensions/alphabet_soup/epsilon.svg
share/inkscape/extensions/alphabet_soup/f.svg
share/inkscape/extensions/alphabet_soup/gamma.svg
share/inkscape/extensions/alphabet_soup/h.svg
share/inkscape/extensions/alphabet_soup/h2.svg
share/inkscape/extensions/alphabet_soup/hcap.svg
share/inkscape/extensions/alphabet_soup/idot.svg
share/inkscape/extensions/alphabet_soup/j.svg
share/inkscape/extensions/alphabet_soup/k.svg
share/inkscape/extensions/alphabet_soup/l.svg
share/inkscape/extensions/alphabet_soup/lserif.svg
share/inkscape/extensions/alphabet_soup/m.svg
share/inkscape/extensions/alphabet_soup/mcap.svg
share/inkscape/extensions/alphabet_soup/n.svg
share/inkscape/extensions/alphabet_soup/o.svg
share/inkscape/extensions/alphabet_soup/ocap.svg
share/inkscape/extensions/alphabet_soup/question.svg
share/inkscape/extensions/alphabet_soup/r.svg
share/inkscape/extensions/alphabet_soup/rcap.svg
share/inkscape/extensions/alphabet_soup/s.svg
share/inkscape/extensions/alphabet_soup/serif.svg
share/inkscape/extensions/alphabet_soup/t.svg
share/inkscape/extensions/alphabet_soup/tserif.svg
share/inkscape/extensions/alphabet_soup/v.svg
share/inkscape/extensions/alphabet_soup/vcap.svg
share/inkscape/extensions/alphabet_soup/vserl.svg
share/inkscape/extensions/alphabet_soup/vserr.svg
share/inkscape/extensions/alphabet_soup/x.svg
share/inkscape/extensions/alphabet_soup/y.svg
share/inkscape/extensions/alphabet_soup/yogh.svg
share/inkscape/extensions/alphabet_soup/z.svg
share/inkscape/extensions/bezmisc.py
share/inkscape/extensions/cdr2svg.sh
share/inkscape/extensions/ccx_input.inx
share/inkscape/extensions/cdr_input.inx
share/inkscape/extensions/cdt_input.inx
share/inkscape/extensions/cgm_input.inx
share/inkscape/extensions/chardataeffect.py
share/inkscape/extensions/cmx_input.inx
share/inkscape/extensions/color_blackandwhite.inx
share/inkscape/extensions/color_blackandwhite.py
share/inkscape/extensions/color_brighter.inx
share/inkscape/extensions/color_brighter.py
share/inkscape/extensions/color_custom.inx
@ -105,6 +236,8 @@ share/inkscape/extensions/color_rgbbarrel.inx
share/inkscape/extensions/color_rgbbarrel.py
share/inkscape/extensions/coloreffect.py
share/inkscape/extensions/colors.xml
share/inkscape/extensions/convert2dashes.inx
share/inkscape/extensions/convert2dashes.py
share/inkscape/extensions/cspsubdiv.py
share/inkscape/extensions/cubicsuperpath.py
share/inkscape/extensions/dia.inx
@ -113,42 +246,57 @@ share/inkscape/extensions/dimension.inx
share/inkscape/extensions/dimension.py
share/inkscape/extensions/dots.inx
share/inkscape/extensions/dots.py
share/inkscape/extensions/draw_from_triangle.inx
share/inkscape/extensions/draw_from_triangle.py
share/inkscape/extensions/dxf_input.inx
share/inkscape/extensions/dxf_input.py
share/inkscape/extensions/dxf_outlines.inx
share/inkscape/extensions/dxf_outlines.py
share/inkscape/extensions/dxf_output.inx
share/inkscape/extensions/dxf_templates.py
share/inkscape/extensions/edge3d.inx
share/inkscape/extensions/edge3d.py
share/inkscape/extensions/embed_raster_in_svg.pl
share/inkscape/extensions/embedimage.inx
share/inkscape/extensions/embedimage.py
share/inkscape/extensions/eps_input.inx
share/inkscape/extensions/epsi_output.inx
share/inkscape/extensions/eqtexsvg.inx
share/inkscape/extensions/eqtexsvg.py
share/inkscape/extensions/export_gimp_palette.inx
share/inkscape/extensions/export_gimp_palette.py
share/inkscape/extensions/extractimage.inx
share/inkscape/extensions/extractimage.py
share/inkscape/extensions/extrude.inx
share/inkscape/extensions/extrude.py
share/inkscape/extensions/ffgeom.py
share/inkscape/extensions/fig2svg.sh
share/inkscape/extensions/fig2dev-ext.py
share/inkscape/extensions/fig_input.inx
share/inkscape/extensions/flatten.inx
share/inkscape/extensions/flatten.py
share/inkscape/extensions/foldablebox.inx
share/inkscape/extensions/foldablebox.py
share/inkscape/extensions/fractalize.inx
share/inkscape/extensions/fractalize.py
share/inkscape/extensions/funcplot.inx
share/inkscape/extensions/funcplot.py
share/inkscape/extensions/gears.inx
share/inkscape/extensions/gears.py
share/inkscape/extensions/generate_voronoi.inx
share/inkscape/extensions/generate_voronoi.py
share/inkscape/extensions/gimp_xcf.inx
share/inkscape/extensions/gimp_xcf.py
share/inkscape/extensions/grid_cartesian.inx
share/inkscape/extensions/grid_cartesian.py
share/inkscape/extensions/grid_polar.inx
share/inkscape/extensions/grid_polar.py
share/inkscape/extensions/guides_creator.inx
share/inkscape/extensions/guides_creator.py
share/inkscape/extensions/handles.inx
share/inkscape/extensions/handles.py
share/inkscape/extensions/hpgl_output.inx
share/inkscape/extensions/hpgl_output.py
share/inkscape/extensions/ill2svg.pl
share/inkscape/extensions/inkex.py
share/inkscape/extensions/inkscape-shadow-white.sh
share/inkscape/extensions/inkscape-shadow.sh
share/inkscape/extensions/inkscape_help_askaquestion.inx
share/inkscape/extensions/inkscape_help_commandline.inx
share/inkscape/extensions/inkscape_help_faq.inx
@ -157,8 +305,41 @@ share/inkscape/extensions/inkscape_help_manual.inx
share/inkscape/extensions/inkscape_help_relnotes.inx
share/inkscape/extensions/inkscape_help_reportabug.inx
share/inkscape/extensions/inkscape_help_svgspec.inx
share/inkscape/extensions/inkweb.js
share/inkscape/extensions/inkwebeffect.py
share/inkscape/extensions/interp.inx
share/inkscape/extensions/interp.py
share/inkscape/extensions/interp_att_g.inx
share/inkscape/extensions/interp_att_g.py
share/inkscape/extensions/jessyInk.js
share/inkscape/extensions/jessyInk_autoTexts.inx
share/inkscape/extensions/jessyInk_autoTexts.py
share/inkscape/extensions/jessyInk_core_mouseHandler_noclick.js
share/inkscape/extensions/jessyInk_core_mouseHandler_zoomControl.js
share/inkscape/extensions/jessyInk_effects.inx
share/inkscape/extensions/jessyInk_effects.py
share/inkscape/extensions/jessyInk_export.inx
share/inkscape/extensions/jessyInk_export.py
share/inkscape/extensions/jessyInk_install.inx
share/inkscape/extensions/jessyInk_install.py
share/inkscape/extensions/jessyInk_keyBindings.inx
share/inkscape/extensions/jessyInk_keyBindings.py
share/inkscape/extensions/jessyInk_masterSlide.inx
share/inkscape/extensions/jessyInk_masterSlide.py
share/inkscape/extensions/jessyInk_mouseHandler.inx
share/inkscape/extensions/jessyInk_mouseHandler.py
share/inkscape/extensions/jessyInk_summary.inx
share/inkscape/extensions/jessyInk_summary.py
share/inkscape/extensions/jessyInk_transitions.inx
share/inkscape/extensions/jessyInk_transitions.py
share/inkscape/extensions/jessyInk_uninstall.inx
share/inkscape/extensions/jessyInk_uninstall.py
share/inkscape/extensions/jessyInk_video.inx
share/inkscape/extensions/jessyInk_video.py
share/inkscape/extensions/jessyInk_video.svg
share/inkscape/extensions/jessyInk_view.inx
share/inkscape/extensions/jessyInk_view.py
share/inkscape/extensions/launch_webbrowser.py
share/inkscape/extensions/lindenmayer.inx
share/inkscape/extensions/lindenmayer.py
share/inkscape/extensions/lorem_ipsum.inx
@ -171,39 +352,62 @@ share/inkscape/extensions/motion.inx
share/inkscape/extensions/motion.py
share/inkscape/extensions/outline2svg.inx
share/inkscape/extensions/outline2svg.pl
share/inkscape/extensions/param_curves.inx
share/inkscape/extensions/param_curves.py
share/inkscape/extensions/pathalongpath.inx
share/inkscape/extensions/pathalongpath.py
share/inkscape/extensions/pathmodifier.py
share/inkscape/extensions/pdf_output.inx.txt
share/inkscape/extensions/pdf_output_via_gs_on_win32.inx.txt
share/inkscape/extensions/pathscatter.inx
share/inkscape/extensions/pathscatter.py
share/inkscape/extensions/perfectboundcover.inx
share/inkscape/extensions/perfectboundcover.py
share/inkscape/extensions/perspective.inx
share/inkscape/extensions/perspective.py
share/inkscape/extensions/pixelsnap.inx
share/inkscape/extensions/pixelsnap.py
share/inkscape/extensions/plt_input.inx
share/inkscape/extensions/plt_output.inx
share/inkscape/extensions/plt_output.py
share/inkscape/extensions/polyhedron_3d.inx
share/inkscape/extensions/polyhedron_3d.py
share/inkscape/extensions/printing-marks.inx
share/inkscape/extensions/printing-marks.py
share/inkscape/extensions/ps2dxf.sh
share/inkscape/extensions/ps2epsi.sh
share/inkscape/extensions/ps2pdf.cmd
share/inkscape/extensions/ps2pdf.sh
share/inkscape/extensions/ps2pdf-ext.py
share/inkscape/extensions/ps_input.inx
share/inkscape/extensions/pturtle.py
share/inkscape/extensions/radiusrand.inx
share/inkscape/extensions/radiusrand.py
share/inkscape/extensions/randompnt.inx
share/inkscape/extensions/randompos.inx
share/inkscape/extensions/render_alphabetsoup.inx
share/inkscape/extensions/render_alphabetsoup.py
share/inkscape/extensions/render_alphabetsoup_config.py
share/inkscape/extensions/render_barcode.inx
share/inkscape/extensions/render_barcode.py
share/inkscape/extensions/render_barcode_datamatrix.inx
share/inkscape/extensions/render_barcode_datamatrix.py
share/inkscape/extensions/restack.inx
share/inkscape/extensions/restack.py
share/inkscape/extensions/rtree.inx
share/inkscape/extensions/rtree.py
share/inkscape/extensions/rubberstretch.inx
share/inkscape/extensions/rubberstretch.py
share/inkscape/extensions/run_command.py
share/inkscape/extensions/scour.inkscape.py
share/inkscape/extensions/scour.inx
share/inkscape/extensions/scour.py
share/inkscape/extensions/simplepath.py
share/inkscape/extensions/simplepath.rb
share/inkscape/extensions/simplestyle.py
share/inkscape/extensions/simpletransform.py
share/inkscape/extensions/sk1_input.inx
share/inkscape/extensions/sk1_output.inx
share/inkscape/extensions/sk1_output.py
share/inkscape/extensions/sk2svg.sh
share/inkscape/extensions/sk_input.inx
share/inkscape/extensions/spirograph.inx
share/inkscape/extensions/spirograph.py
share/inkscape/extensions/split.inx
share/inkscape/extensions/split.py
share/inkscape/extensions/straightseg.inx
share/inkscape/extensions/straightseg.py
share/inkscape/extensions/summersnight.inx
@ -212,8 +416,11 @@ share/inkscape/extensions/svg2xaml.inx
share/inkscape/extensions/svg2xaml.xsl
share/inkscape/extensions/svg_and_media_zip_output.inx
share/inkscape/extensions/svg_and_media_zip_output.py
share/inkscape/extensions/svgz_input.inx
share/inkscape/extensions/svgz_output.inx
share/inkscape/extensions/svg_regex.py
share/inkscape/extensions/svgcalendar.inx
share/inkscape/extensions/svgcalendar.py
share/inkscape/extensions/text_braille.inx
share/inkscape/extensions/text_braille.py
share/inkscape/extensions/text_flipcase.inx
share/inkscape/extensions/text_flipcase.py
share/inkscape/extensions/text_lowercase.inx
@ -228,19 +435,31 @@ share/inkscape/extensions/text_titlecase.inx
share/inkscape/extensions/text_titlecase.py
share/inkscape/extensions/text_uppercase.inx
share/inkscape/extensions/text_uppercase.py
share/inkscape/extensions/triangle.inx
share/inkscape/extensions/triangle.py
share/inkscape/extensions/txt2svg.inx
share/inkscape/extensions/txt2svg.pl
share/inkscape/extensions/webbrowser_askaquestion.py
share/inkscape/extensions/webbrowser_commandline.py
share/inkscape/extensions/webbrowser_faq.py
share/inkscape/extensions/webbrowser_keys.py
share/inkscape/extensions/webbrowser_manual.py
share/inkscape/extensions/webbrowser_relnotes.py
share/inkscape/extensions/webbrowser_reportabug.py
share/inkscape/extensions/webbrowser_svgspec.py
share/inkscape/extensions/uniconv-ext.py
share/inkscape/extensions/uniconv_output.py
share/inkscape/extensions/voronoi.py
share/inkscape/extensions/web-set-att.inx
share/inkscape/extensions/web-set-att.py
share/inkscape/extensions/web-transmit-att.inx
share/inkscape/extensions/web-transmit-att.py
share/inkscape/extensions/webslicer_create_group.inx
share/inkscape/extensions/webslicer_create_group.py
share/inkscape/extensions/webslicer_create_rect.inx
share/inkscape/extensions/webslicer_create_rect.py
share/inkscape/extensions/webslicer_effect.py
share/inkscape/extensions/webslicer_export.inx
share/inkscape/extensions/webslicer_export.py
share/inkscape/extensions/whirl.inx
share/inkscape/extensions/whirl.py
share/inkscape/extensions/wireframe_sphere.inx
share/inkscape/extensions/wireframe_sphere.py
share/inkscape/extensions/wmf_input.inx
share/inkscape/extensions/wmf_output.inx
share/inkscape/extensions/wmf_output.py
share/inkscape/extensions/xaml2svg/
share/inkscape/extensions/xaml2svg.inx
share/inkscape/extensions/xaml2svg.xsl
@ -252,13 +471,18 @@ share/inkscape/extensions/xaml2svg/geometry.xsl
share/inkscape/extensions/xaml2svg/properties.xsl
share/inkscape/extensions/xaml2svg/shapes.xsl
share/inkscape/extensions/xaml2svg/transform.xsl
share/inkscape/extensions/yocto_css.py
share/inkscape/filters/
share/inkscape/filters/README
share/inkscape/filters/filters.svg
share/inkscape/filters/filters.svg.h
share/inkscape/fonts/
share/inkscape/fonts/README
share/inkscape/gradients/
share/inkscape/gradients/README
share/inkscape/icons/
share/inkscape/icons/README.icon_themes
share/inkscape/icons/README.legacy_icons
share/inkscape/icons/README
share/inkscape/icons/color-management-icon.png
share/inkscape/icons/feBlend-icon.png
share/inkscape/icons/feBlend-icon.svg
share/inkscape/icons/feColorMatrix-icon.png
@ -291,9 +515,14 @@ share/inkscape/icons/icons.svg
share/inkscape/icons/inkscape.file.png
share/inkscape/icons/inkscape.file.svg
share/inkscape/icons/inkscape.svg
share/inkscape/icons/legacy_icons.svg
share/inkscape/icons/out-of-gamut-icon.png
share/inkscape/icons/out-of-gamut-icon.svg
share/inkscape/icons/remove-color.png
share/inkscape/icons/remove-color.svg
share/inkscape/icons/tango_icons.svg
share/inkscape/icons/ticotico.jpg
share/inkscape/icons/too-much-ink-icon.png
share/inkscape/icons/too-much-ink-icon.svg
share/inkscape/keys/
share/inkscape/keys/acd-canvas.xml
share/inkscape/keys/adobe-illustrator-cs2.xml
@ -314,12 +543,14 @@ share/inkscape/palettes/Greens.gpl
share/inkscape/palettes/Hilite.gpl
share/inkscape/palettes/Khaki.gpl
share/inkscape/palettes/LaTeX-Beamer.gpl
share/inkscape/palettes/MATLAB-Jet-72.gpl
share/inkscape/palettes/README
share/inkscape/palettes/Reds.gpl
share/inkscape/palettes/Royal.gpl
share/inkscape/palettes/Tango-Palette.gpl
share/inkscape/palettes/Topographic.gpl
share/inkscape/palettes/Ubuntu.gpl
share/inkscape/palettes/echo-palette.gpl
share/inkscape/palettes/inkscape.gpl
share/inkscape/palettes/svg.gpl
share/inkscape/palettes/webhex.gpl
@ -328,17 +559,8 @@ share/inkscape/palettes/windowsXP.gpl
share/inkscape/patterns/
share/inkscape/patterns/README
share/inkscape/patterns/patterns.svg
share/inkscape/patterns/patterns.svg.h
share/inkscape/screens/
share/inkscape/screens/about.bg.svg
share/inkscape/screens/about.br.svg
share/inkscape/screens/about.gl.svg
share/inkscape/screens/about.it.svg
share/inkscape/screens/about.pt_BR.svg
share/inkscape/screens/about.ru.svg
share/inkscape/screens/about.sk.svg
share/inkscape/screens/about.sl.svg
share/inkscape/screens/about.sr.svg
share/inkscape/screens/about.sr@latin.svg
share/inkscape/screens/about.svg
share/inkscape/templates/
share/inkscape/templates/A4.svg
@ -355,6 +577,7 @@ share/inkscape/templates/README
share/inkscape/templates/black_opaque.svg
share/inkscape/templates/business_card_85x54mm.svg
share/inkscape/templates/business_card_90x50mm.svg
share/inkscape/templates/default.be.svg
share/inkscape/templates/default.ca.svg
share/inkscape/templates/default.cs.svg
share/inkscape/templates/default.de.svg
@ -365,7 +588,9 @@ share/inkscape/templates/default.fi.svg
share/inkscape/templates/default.fr.svg
share/inkscape/templates/default.hu.svg
share/inkscape/templates/default.it.svg
share/inkscape/templates/default.ja.svg
share/inkscape/templates/default.lt.svg
share/inkscape/templates/default.nl.svg
share/inkscape/templates/default.pl.svg
share/inkscape/templates/default.pt_BR.svg
share/inkscape/templates/default.sk.svg
@ -391,20 +616,43 @@ share/inkscape/templates/web_banner_728x90.svg
share/inkscape/templates/white_opaque.svg
share/inkscape/tutorials/
share/inkscape/tutorials/README
share/inkscape/tutorials/edge3d.svg
share/inkscape/tutorials/gpl-2.svg
share/inkscape/tutorials/making_markers.svg
share/inkscape/tutorials/oldguitar.jpg
share/inkscape/tutorials/potrace-be.png
share/inkscape/tutorials/potrace-ca.png
share/inkscape/tutorials/potrace-de.png
share/inkscape/tutorials/potrace-en.png
share/inkscape/tutorials/potrace-es.png
share/inkscape/tutorials/potrace-eu.png
share/inkscape/tutorials/potrace-fr.png
share/inkscape/tutorials/potrace-hu.png
share/inkscape/tutorials/potrace-ja.png
share/inkscape/tutorials/potrace-nl.png
share/inkscape/tutorials/potrace-pl.png
share/inkscape/tutorials/potrace-pt_BR.png
share/inkscape/tutorials/potrace-ru.png
share/inkscape/tutorials/potrace-sk.png
share/inkscape/tutorials/potrace-sl.png
share/inkscape/tutorials/potrace-vi.png
share/inkscape/tutorials/potrace-zh_CN.png
share/inkscape/tutorials/potrace-zh_TW.png
share/inkscape/tutorials/potrace.png
share/inkscape/tutorials/tutorial-advanced.be.svg
share/inkscape/tutorials/tutorial-advanced.ca.svg
share/inkscape/tutorials/tutorial-advanced.cs.svg
share/inkscape/tutorials/tutorial-advanced.de.svg
share/inkscape/tutorials/tutorial-advanced.es.svg
share/inkscape/tutorials/tutorial-advanced.eu.svg
share/inkscape/tutorials/tutorial-advanced.fa.svg
share/inkscape/tutorials/tutorial-advanced.fr.svg
share/inkscape/tutorials/tutorial-advanced.hu.svg
share/inkscape/tutorials/tutorial-advanced.id.svg
share/inkscape/tutorials/tutorial-advanced.it.svg
share/inkscape/tutorials/tutorial-advanced.ja.svg
share/inkscape/tutorials/tutorial-advanced.nl.svg
share/inkscape/tutorials/tutorial-advanced.pl.svg
share/inkscape/tutorials/tutorial-advanced.pt_BR.svg
share/inkscape/tutorials/tutorial-advanced.ru.svg
share/inkscape/tutorials/tutorial-advanced.sk.svg
@ -412,16 +660,25 @@ share/inkscape/tutorials/tutorial-advanced.sl.svg
share/inkscape/tutorials/tutorial-advanced.svg
share/inkscape/tutorials/tutorial-advanced.vi.svg
share/inkscape/tutorials/tutorial-advanced.zh_CN.svg
share/inkscape/tutorials/tutorial-advanced.zh_TW.svg
share/inkscape/tutorials/tutorial-basic.be.svg
share/inkscape/tutorials/tutorial-basic.bg.svg
share/inkscape/tutorials/tutorial-basic.ca.svg
share/inkscape/tutorials/tutorial-basic.cs.svg
share/inkscape/tutorials/tutorial-basic.da.svg
share/inkscape/tutorials/tutorial-basic.de.svg
share/inkscape/tutorials/tutorial-basic.eo.svg
share/inkscape/tutorials/tutorial-basic.es.svg
share/inkscape/tutorials/tutorial-basic.eu.svg
share/inkscape/tutorials/tutorial-basic.fa.svg
share/inkscape/tutorials/tutorial-basic.fr.svg
share/inkscape/tutorials/tutorial-basic.hu.svg
share/inkscape/tutorials/tutorial-basic.id.svg
share/inkscape/tutorials/tutorial-basic.it.svg
share/inkscape/tutorials/tutorial-basic.ja.svg
share/inkscape/tutorials/tutorial-basic.nl.svg
share/inkscape/tutorials/tutorial-basic.nn.svg
share/inkscape/tutorials/tutorial-basic.pl.svg
share/inkscape/tutorials/tutorial-basic.pt_BR.svg
share/inkscape/tutorials/tutorial-basic.ru.svg
share/inkscape/tutorials/tutorial-basic.sk.svg
@ -430,31 +687,66 @@ share/inkscape/tutorials/tutorial-basic.svg
share/inkscape/tutorials/tutorial-basic.tr.svg
share/inkscape/tutorials/tutorial-basic.vi.svg
share/inkscape/tutorials/tutorial-basic.zh_CN.svg
share/inkscape/tutorials/tutorial-basic.zh_TW.svg
share/inkscape/tutorials/tutorial-calligraphy.be.svg
share/inkscape/tutorials/tutorial-calligraphy.ca.svg
share/inkscape/tutorials/tutorial-calligraphy.cs.svg
share/inkscape/tutorials/tutorial-calligraphy.de.svg
share/inkscape/tutorials/tutorial-calligraphy.es.svg
share/inkscape/tutorials/tutorial-calligraphy.eu.svg
share/inkscape/tutorials/tutorial-calligraphy.fa.svg
share/inkscape/tutorials/tutorial-calligraphy.fr.svg
share/inkscape/tutorials/tutorial-calligraphy.hu.svg
share/inkscape/tutorials/tutorial-calligraphy.ja.svg
share/inkscape/tutorials/tutorial-calligraphy.pl.svg
share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg
share/inkscape/tutorials/tutorial-calligraphy.ru.svg
share/inkscape/tutorials/tutorial-calligraphy.sk.svg
share/inkscape/tutorials/tutorial-calligraphy.sl.svg
share/inkscape/tutorials/tutorial-calligraphy.svg
share/inkscape/tutorials/tutorial-calligraphy.vi.svg
share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg
share/inkscape/tutorials/tutorial-elements.be.svg
share/inkscape/tutorials/tutorial-elements.ca.svg
share/inkscape/tutorials/tutorial-elements.de.svg
share/inkscape/tutorials/tutorial-elements.es.svg
share/inkscape/tutorials/tutorial-elements.eu.svg
share/inkscape/tutorials/tutorial-elements.fa.svg
share/inkscape/tutorials/tutorial-elements.fr.svg
share/inkscape/tutorials/tutorial-elements.hu.svg
share/inkscape/tutorials/tutorial-elements.ja.svg
share/inkscape/tutorials/tutorial-elements.pl.svg
share/inkscape/tutorials/tutorial-elements.pt_BR.svg
share/inkscape/tutorials/tutorial-elements.ru.svg
share/inkscape/tutorials/tutorial-elements.sk.svg
share/inkscape/tutorials/tutorial-elements.sl.svg
share/inkscape/tutorials/tutorial-elements.svg
share/inkscape/tutorials/tutorial-elements.zh_TW.svg
share/inkscape/tutorials/tutorial-interpolate.be.svg
share/inkscape/tutorials/tutorial-interpolate.de.svg
share/inkscape/tutorials/tutorial-interpolate.fr.svg
share/inkscape/tutorials/tutorial-interpolate.hu.svg
share/inkscape/tutorials/tutorial-interpolate.ja.svg
share/inkscape/tutorials/tutorial-interpolate.pl.svg
share/inkscape/tutorials/tutorial-interpolate.sk.svg
share/inkscape/tutorials/tutorial-interpolate.sl.svg
share/inkscape/tutorials/tutorial-interpolate.svg
share/inkscape/tutorials/tutorial-interpolate.vi.svg
share/inkscape/tutorials/tutorial-interpolate.zh_TW.svg
share/inkscape/tutorials/tutorial-shapes.be.svg
share/inkscape/tutorials/tutorial-shapes.ca.svg
share/inkscape/tutorials/tutorial-shapes.cs.svg
share/inkscape/tutorials/tutorial-shapes.de.svg
share/inkscape/tutorials/tutorial-shapes.es.svg
share/inkscape/tutorials/tutorial-shapes.eu.svg
share/inkscape/tutorials/tutorial-shapes.fa.svg
share/inkscape/tutorials/tutorial-shapes.fr.svg
share/inkscape/tutorials/tutorial-shapes.hu.svg
share/inkscape/tutorials/tutorial-shapes.id.svg
share/inkscape/tutorials/tutorial-shapes.it.svg
share/inkscape/tutorials/tutorial-shapes.ja.svg
share/inkscape/tutorials/tutorial-shapes.nl.svg
share/inkscape/tutorials/tutorial-shapes.pl.svg
share/inkscape/tutorials/tutorial-shapes.pt_BR.svg
share/inkscape/tutorials/tutorial-shapes.ru.svg
share/inkscape/tutorials/tutorial-shapes.sk.svg
@ -462,25 +754,43 @@ share/inkscape/tutorials/tutorial-shapes.sl.svg
share/inkscape/tutorials/tutorial-shapes.svg
share/inkscape/tutorials/tutorial-shapes.vi.svg
share/inkscape/tutorials/tutorial-shapes.zh_CN.svg
share/inkscape/tutorials/tutorial-shapes.zh_TW.svg
share/inkscape/tutorials/tutorial-tips.be.svg
share/inkscape/tutorials/tutorial-tips.ca.svg
share/inkscape/tutorials/tutorial-tips.de.svg
share/inkscape/tutorials/tutorial-tips.es.svg
share/inkscape/tutorials/tutorial-tips.eu.svg
share/inkscape/tutorials/tutorial-tips.fa.svg
share/inkscape/tutorials/tutorial-tips.fr.svg
share/inkscape/tutorials/tutorial-tips.hu.svg
share/inkscape/tutorials/tutorial-tips.it.svg
share/inkscape/tutorials/tutorial-tips.ja.svg
share/inkscape/tutorials/tutorial-tips.pl.svg
share/inkscape/tutorials/tutorial-tips.pt_BR.svg
share/inkscape/tutorials/tutorial-tips.ru.svg
share/inkscape/tutorials/tutorial-tips.sk.svg
share/inkscape/tutorials/tutorial-tips.sl.svg
share/inkscape/tutorials/tutorial-tips.svg
share/inkscape/tutorials/tutorial-tips.vi.svg
share/inkscape/tutorials/tutorial-tips.zh_TW.svg
share/inkscape/tutorials/tutorial-tracing.be.svg
share/inkscape/tutorials/tutorial-tracing.ca.svg
share/inkscape/tutorials/tutorial-tracing.de.svg
share/inkscape/tutorials/tutorial-tracing.es.svg
share/inkscape/tutorials/tutorial-tracing.eu.svg
share/inkscape/tutorials/tutorial-tracing.fa.svg
share/inkscape/tutorials/tutorial-tracing.fr.svg
share/inkscape/tutorials/tutorial-tracing.hu.svg
share/inkscape/tutorials/tutorial-tracing.ja.svg
share/inkscape/tutorials/tutorial-tracing.nl.svg
share/inkscape/tutorials/tutorial-tracing.pl.svg
share/inkscape/tutorials/tutorial-tracing.pt_BR.svg
share/inkscape/tutorials/tutorial-tracing.ru.svg
share/inkscape/tutorials/tutorial-tracing.sk.svg
share/inkscape/tutorials/tutorial-tracing.sl.svg
share/inkscape/tutorials/tutorial-tracing.svg
share/inkscape/tutorials/tutorial-tracing.vi.svg
share/inkscape/tutorials/tutorial-tracing.zh_TW.svg
share/inkscape/tutorials/tux.png
share/inkscape/ui/
share/inkscape/ui/keybindings.rc
@ -535,6 +845,9 @@ share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/inkscape.mo
share/locale/et/LC_MESSAGES/inkscape.mo
share/locale/eu/LC_MESSAGES/inkscape.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
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
@ -542,6 +855,9 @@ share/locale/gl/LC_MESSAGES/inkscape.mo
share/locale/he/LC_MESSAGES/inkscape.mo
share/locale/hr/LC_MESSAGES/inkscape.mo
share/locale/hu/LC_MESSAGES/inkscape.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/inkscape.mo
share/locale/id/LC_MESSAGES/inkscape.mo
share/locale/it/LC_MESSAGES/inkscape.mo
share/locale/ja/LC_MESSAGES/inkscape.mo
@ -585,6 +901,9 @@ share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/inkscape.mo
share/locale/sv/LC_MESSAGES/inkscape.mo
share/locale/te_IN/
share/locale/te_IN/LC_MESSAGES/
share/locale/te_IN/LC_MESSAGES/inkscape.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/inkscape.mo
@ -593,7 +912,5 @@ share/locale/uk/LC_MESSAGES/inkscape.mo
share/locale/vi/LC_MESSAGES/inkscape.mo
share/locale/zh_CN/LC_MESSAGES/inkscape.mo
share/locale/zh_TW/LC_MESSAGES/inkscape.mo
share/pixmaps/
share/pixmaps/inkscape.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database