--- inkscape-0.46.orig/configure +++ inkscape-0.46/configure @@ -14714,6 +14714,12 @@ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF + case "$host_cpu" in + mips|mipsel) + CXXFLAGS="$CXXFLAGS -Wa,-xgot" + CFLAGS="$CFLAGS -Wa,-xgot" + ;; + esac fi done @@ -17943,12 +17949,6 @@ CXXFLAGS="-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -D_FORTIFY_SOURCE=2 $CXXFLAGS" - case "$host_cpu" in - mips|mipsel) - CXXFLAGS="$CXXFLAGS -Wa,-xgot" - CFLAGS="$CFLAGS -Wa,-xgot" - ;; - esac fi --- inkscape-0.46.orig/config.guess +++ inkscape-0.46/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -799,6 +799,9 @@ EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- inkscape-0.46.orig/config.sub +++ inkscape-0.46/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-06-28' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -813,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1021,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; --- inkscape-0.46.orig/debian/dirs +++ inkscape-0.46/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/application-registry/ --- inkscape-0.46.orig/debian/docs +++ inkscape-0.46/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- inkscape-0.46.orig/debian/mime +++ inkscape-0.46/debian/mime @@ -0,0 +1,4 @@ +image/svg+xml; inkscape '%s'; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' '%s'; edit=inkscape '%s'; compose=inkscape '%s'; priority=7 +image/svg; inkscape '%s'; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' '%s'; edit=inkscape '%s'; compose=inkscape '%s'; priority=7 +image/svg+xml; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' '%s'; priority=7 +image/svg; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' '%s'; priority=7 --- inkscape-0.46.orig/debian/control +++ inkscape-0.46/debian/control @@ -0,0 +1,32 @@ +Source: inkscape +Section: graphics +Priority: optional +Maintainer: Wolfram Quester +Build-Depends: debhelper (>= 4.0.0), dpatch, intltool, libart-2.0-dev (>= 2.3.10), libboost-dev, libgc-dev (>= 1:6.8), libglib2.0-dev, libgnomevfs2-dev, libgtk2.0-dev (>= 2.10.0), libgtkmm-2.4-dev, libgtkspell-dev, liblcms1-dev, libmagick++9-dev, libpango1.0-dev, libpng12-dev, libpoppler-glib-dev, libpopt-dev, libsigc++-2.0-dev (>= 2.0.16-2), libssl-dev, libtool, libwpg-dev, libxml-parser-perl, libxml2-dev (>= 2-2.4.24), libxslt1-dev, pkg-config, python-dev, zlib1g-dev +Standards-Version: 3.7.3 + +Package: inkscape +Architecture: any +Depends: ${shlibs:Depends} +Suggests: dia | dia-gnome, ruby, libgnomevfs2-extra, libsvg-perl, libxml-xql-perl, python, python-numpy, python-lxml, python-uniconverter, skencil, ttf-bitstream-vera +Recommends: libwmf-bin, pstoedit, imagemagick, perlmagick +Description: vector-based drawing program + Inkscape loads and saves a subset of the SVG (Scalable Vector Graphics) + format, a standard maintained by the WWW consortium. + . + Inkscape user interface should be familiar from CorelDraw and similar + drawing programs. There are rectangles, ellipses, text items, bitmap + images and freehand curves. + As an added bonus, both vector and bitmap objects can have alpha + transparency and can be arbitrarily transformed. + . + Inkscape supports multiple opened files and multiple views per file. + Graphics can be printed and exported to png bitmaps. + . + Some of the import and export features are provided using the packages + dia, libwmf-bin, pstoedit, skencil, imagemagick, and perlmagick. + . + Other extensions use ruby, libxml-xql-perl, python-numpy, and python-lxml. + You must have these packages to make full use of all extensions and effects. + . + Homepage: http://www.inkscape.org/ --- inkscape-0.46.orig/debian/inkscape.applications +++ inkscape-0.46/debian/inkscape.applications @@ -0,0 +1,7 @@ +inkscape + command=inkscape + name=inkscape + can_open_multiple_files=true + expects_uris=false + requires_terminal=false + mime_types=image/svg,image/svg+xml --- inkscape-0.46.orig/debian/rules +++ inkscape-0.46/debian/rules @@ -0,0 +1,170 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# debian/rules for inkscape derived from a sample +# provided by Joey Hess via dh_make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# use dpatch: +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +CFLAGS = -Wall -g +CXXFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + CXXFLAGS += -O0 +else + CFLAGS += -O2 + CXXFLAGS += -O2 +endif +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(findstring $(DEB_HOST_ARCH),alpha)) + ALPHA_CXXFLAGS=-mieee + ALPHA_CFLAGS=-mieee +endif + +config.status: configure patch + dh_testdir + + CXXFLAGS="$(CXXFLAGS) $(MIPS_CXXFLAGS) $(ALPHA_CXXFLAGS)" \ + CFLAGS="$(CFLAGS) $(MIPS_CFLAGS) $(ALPHA_CFLAGS)" \ + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --datadir=\$${prefix}/share \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-gnome-vfs \ + --enable-lcms \ + --enable-inkboard + + +build: config.status + dh_testdir + + # compile the package... +# $(MAKE) -C src extension/plugin/libgimpgrad.la + $(MAKE) CXXFLAGS="$(CXXFLAGS) $(MIPS_CXXFLAGS) $(ALPHA_CXXFLAGS)" \ + CFLAGS="$(CFLAGS) $(MIPS_CFLAGS) $(ALPHA_CFLAGS)" + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + + # cleaning up... + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + rm -f po/.intltool-merge-cache + + -rm -f po/*.gmo po/messages + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/inkscape. + $(MAKE) install DESTDIR=$(CURDIR)/debian/inkscape + install -o root -g root -m 644 $(CURDIR)/debian/inkscape.xpm $(CURDIR)/debian/inkscape/usr/share/pixmaps/inkscape.xpm + install -o root -g root -m 644 $(CURDIR)/debian/inkscape.applications $(CURDIR)/debian/inkscape/usr/share/application-registry/inkscape.applications + install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape + chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/ + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/ps2pdf.cmd + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_randomcase.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_lesssaturation.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/__init__.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/spirograph.inx + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_desaturate.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/Base.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/Code128.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_randomize.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_custom.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/Code93.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_lowercase.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/Code39.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_removeblue.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/Code39Ext.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_removered.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/EAN8.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_morelight.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_uppercase.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_replace.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_brighter.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_lesshue.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/UPCA.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/RM4CC.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_rgbbarrel.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/UPCE.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_replace.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/Barcode/EAN13.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_removegreen.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_morehue.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_grayscale.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_lesslight.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_sentencecase.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/render_barcode.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_darker.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_flipcase.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_moresaturation.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/color_negative.py + chmod -x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/text_titlecase.py + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs +# dh_installexamples +# dh_install + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam + dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo +# dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install --- inkscape-0.46.orig/debian/watch +++ inkscape-0.46/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/inkscape/inkscape-(.*).tar.gz --- inkscape-0.46.orig/debian/changelog +++ inkscape-0.46/debian/changelog @@ -0,0 +1,684 @@ +inkscape (0.46-5.1) unstable; urgency=low + + * Non-maintainer upload. + * 03-gtk-includes.dpatch: patch from Ubuntu to fix FTBFS caused by + wrong GTK+ includes. Closes: #518633. + + -- Josselin Mouette Mon, 23 Mar 2009 20:35:51 +0100 + +inkscape (0.46-5) unstable; urgency=low + + * Fix error in bash completion file introduced in the last upload. + Thanks to Salvatore Bonaccorso for spotting this. + * Include patch by Thomas Viehmann, which fixes a crash with pdf import in + some cases (Closes: #510234). + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 30 Dec 2008 23:40:25 +0100 + +inkscape (0.46-4) unstable; urgency=low + + * Fix lintian warning: menu-item-uses-apps-section (Closes: #508692). + * Add debian/watch file (Closes: #508690). + * Add support in bash completion file for jpeg, svgz, and pdf + (Closes: #428226). + * Add patch to give back LaTeX formula rendering option + (Closes: #464154, #506285). + * Thanks Salvatore Bonaccorso for his patches :-) + * Add patch by Martin Michlmayr to make inkscape compile + with gcc 4.4 (Closes: #505660) + * Suggest python-uniconvertor and add patch by Andreas Wenning to use it in + the .cdr input plugin instead of the old uniconv (Closes: #471109, #506217). + * Suggest libgnomevfs2-extra which is needed to make + "Import From Open Clip Art Library" work (Closes: #496785). + * Suggest libsvg-perl , as the txt2svg extension needs it (Closes: #504469). + * upload sponsored by Guido Guenther + + -- Wolfram Quester Sun, 28 Dec 2008 17:35:10 +0100 + +inkscape (0.46-3) unstable; urgency=low + + * suggest ttf-bitstream-vera (Closes: #496784) + * add a patch by Thomas Viehmann to only use valid font + families in the text tool. Many thanks to him and Charles Plessy + for debugging this stuff. + * Acknowledge NMU by Thomas Viehmann + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 28 Oct 2008 19:46:24 +0100 + +inkscape (0.46-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add upstream patch fixing a crash in the open dialog + in the zh_CN.utf8 locale. Closes: #487623. + Thanks to Luca Bruno for the patch. + + -- Thomas Viehmann Tue, 09 Sep 2008 23:29:02 +0200 + +inkscape (0.46-2) unstable; urgency=low + + * chmod a+x inkscape/extensions/xaml2svg/ during install in debian/rules + * change my email address in debian/control + * upload sponsored by Guido Guenther + * add patch from gentoo to make inkscape build with libpoppler 0.8.3 + http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch?view=markup + (closes: #488170, #489083) + + + -- Wolfram Quester Tue, 22 Jul 2008 17:48:18 +0200 + +inkscape (0.46-1) unstable; urgency=low + + * acknowledge NMU by Aurelien Jarno, many thanks to him for making inkscape + build again + * new upstream release (Closes: #470832) + Improvements and new features include: + - speed and interactivity improvements + - better SVG compliance + - Open Clip Art Library integration + - Native PDF and AI import + - Dockable dialogs + For a more detailed description see /usr/share/doc/inkscape/NEWS.gz + The following bugs are fixed by this release: + - FTBFS: Global symbol "@INTLTOOL_ICONV" requires + explicit package name at ./intltool-merge line 94. (Closes: #436333) + - FTBFS: attributes.cpp:400: error: 'g_assert' was not declared in this + scope (Closes: #471622) + - Inkscape build requirements not met (Closes: #475071) + - translator credits in the about dialog is empty (Closes: #415940) + * remove 02_fix_ps2pdf_bashism.dpatch and + 03_measure-add-english-units.dpatch since they are applied upstream + * add libboost-dev, libgtkspell-dev, libmagick++9-dev, libpoppler-glib-dev, + and libwpg-dev to build-deps in debian/control + * remove build-dependency on libperl-dev (Closes: #463130) + * change version dependencies to match those in configure script + * replace python-xml by python-lxml in Suggests: (Closes: #468598), add + ruby + * add python-numpy to Suggests: + * adopt package description to reflect the changes in Suggests: and Depends: + * raise Standards-Version to 3.7.3 + * change executable bits on extension scripts as suggested by lintian + (quick'n'dirty fix) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 15 Apr 2008 19:32:15 +0200 + +inkscape (0.45.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix autotools issues (closes: #436333): + - Remove all autotools change from the .diff.gz + - debian/patches/04_maintainer-mode.dpatch: new patch to enable + AM_MAINTAINER_MODE. + - debian/patches/05_autotools.dpatch: new patch containing the result + of reconfigure/relibtoolize/reintltoolize. + * Fix build with gcc-4.3 (closes: #467187): + - debian/patches/06_gcc-4.3.dpatch: new patch. + + -- Aurelien Jarno Mon, 03 Mar 2008 16:58:31 +0100 + +inkscape (0.45.1-1) unstable; urgency=low + + * New upstream release, containing bugfixes + * fix bashism in ps2pdf.sh. (closes: #417245) + Thanks to Jérémy Bobbio + * add libssl-dev to enable SSL support in inkboard and + remove libloudmouth-dev since it is no longer used for inkboard, raise + required version of libgtk2.0-dev to >= 2.8.0-1 (closes: #410358) + Thanks to Kees Cook for pointing this out. + * add foot and yard units to inkscape's "measure path" extension + Thanks Daniel Kahn Gillmor + for the patch (closes: #417959) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Wed, 25 Apr 2007 18:57:50 +0200 + +inkscape (0.45-1) unstable; urgency=low + + * new upstream version. + Improvements and new features include: + - Gaussian blur + - History dialog + - Several important tool features are added + - new extension effects + - Display speed and interactivity improved + - better bitmap tracing + - improved outline mode + - more commands in Help menu + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 5 Feb 2007 17:00:44 +0100 + +inkscape (0.45~pre1-1) unstable; urgency=low + + * new upstream version. + Debian bugs fixed by this version are: + - No tight-fitting bounding box in EPS output (closes: #396393) + - Effects->Render->LaTeX formula is unusable (closes: #376558) + * adopt 02_mips.dpatch to this new version (move to 01_mips.dpatch) + * remove 01_nb.po since applied upstream + * remove no longer needed --datarootdir option from configure call + in debian/rules + * upload sponsored by Guido Guenther + + -- Wolfram Quester Thu, 11 Jan 2007 11:36:22 +0100 + +inkscape (0.44.1-1) unstable; urgency=low + + * new upstream version. New features include: + - inkscape now compiles with gcc-4.2.x (Closes: #377013) + - added missing German version of the advanced tutorial and made + corrections to the calligraphy one; added missing Czech, German, and + Brazil-Portuguese tutorials to tarball; added missing German keytable to + tarball (Closes: #386616) + - applied changes to the German and Spanish translations of Inkscape + strings + For more changes and bug fixes not related to entries in debian's BTS see + the file /usr/share/doc/inkscape/NEWS.gz + * enable inkboard collaborative editing features (Closes: #343852) + added libloudmouth1-dev to Depends: + * update norwegian bookmål translation. (Thanks to Steinar H. Gunderson + for the update, closes: #387436) + * get rid of the xgot hack on mips (Thanks to Thiemo Seufer + for the patch, closes: #377082) + * move dia | dia-gnome and skencil from Recommends: to Suggests: + (Closes: #386360) + * Add --datarootdir=\$${prefix}/share --datadir=\$${prefix}/share + to configure options to repair datarootdir in config.h + * change debian/mime as suggested by James R. Van Zandt + Thanks for the patch. (Closes: #375249) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 18 Sep 2006 18:05:08 +0200 + +inkscape (0.44-1) unstable; urgency=low + + * new upstream version (closes: #375497) + See /usr/share/doc/inkscape/NEWS.gz for new features, bugfixes and known + problems. + * add liblcms1-dev to build-depends and configure with --enable-lcms to + enable LittleCms color management. + * remove gcc-4.1.diff.dpatch and no-freetype-internals.diff since they are + applied upstream + * remove --with-perl and --with-python from configure options since they are + only stubs ATM. + * recommend skencil instead of sketch (closes: #370437) + * bump Standards-Version up to 3.7.2 (no changes) + * remove executable-bit from ps2pdf.cmd during install + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 13 Jun 2006 16:30:28 +0200 + +inkscape (0.43-5) unstable; urgency=low + + * move handling of debian-specific patches to dpatch (and build-depend on + it), little cleanup of debian/rules. + * remove "g++ (>= 4:4.0.2-2) [arm m68k hppa]" from build-dependencies + * added no-freetype-internals.diff submitted upstream by David Turner to + clean up inkscape's dealing with freetype. This patch also allows to build + inkscape using freetype 2.2.1. Thanks David! + * added gcc-4.1.diff submitted by Martin Michlmayr and Brian M. Carlson to fix + compilation with gcc-4.1. Thanks Martin and Brian! + (closes: #357112) + * upload sponsored by Martin Michlmayr + + -- Wolfram Quester Mon, 29 May 2006 11:47:43 +0200 + +inkscape (0.43-4) unstable; urgency=low + + * In the last upload I removed gcc-3.4 in the build-depends but forgot to + adapt debian/rules. (Closes: #347682) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Thu, 12 Jan 2006 11:40:19 +0100 + +inkscape (0.43-3) unstable; urgency=low + + * Acknowledge NMU, which in fact was an upload of my sponsor with my + knowledge (Closes: #341909, #342194, #342367) + * Build-Depend on g++ (>= 4:4.0.2-2) on arm/hppa/m68k to get rid of g++-3.4 + on etch + * upload sponsored by Guido Guenther + + -- Wolfram Quester Sat, 24 Dec 2005 11:32:35 +0100 + +inkscape (0.43-2) unstable; urgency=low + + * Rebuild against newer libsigc++ (>= 2.0.16-2) to help the C++ transistion + (Closes: #341909) + + -- Guido Guenther Fri, 9 Dec 2005 10:21:39 +0100 + +inkscape (0.43-1) unstable; urgency=high + + * New upstream version, new features include: + - Connectors: Objects can be connected using auto-routing lines + - calligraphy tool may now use a tablet pen with pressure and tilt + support + - better editing of Bezier curves + - new extensions, improved SVG compatibility + * Correct website for dia in extensions (Closes: #337353) + * urgency=high since this version fixes the buffer overflow discovered by + Joxean Koret (see CVE-2005-3737, debian bug 330894). + * upload sponsored by Guido Guenther + + -- Wolfram Quester Thu, 24 Nov 2005 11:54:49 +0100 + +inkscape (0.42.2+0.43pre2-1) unstable; urgency=low + + * New upstream version. + * Build with gcc-3.4 on arm m68k hppa (Closes: #336324). + Use the workaround provided in + http://lists.debian.org/debian-devel/2005/09/msg00020.html to escape from + Bug #323133. + * Just for the record: inkscape version 0.42+0.43pre1 and newer is not vulnerable to + the security bug mentioned in Bug #330894. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 7 Nov 2005 17:27:35 +0100 + +inkscape (0.42.2+0.43pre1-1) unstable; urgency=low + + * New upstream version. + * Recommend dia | dia-gnome instead of dia only. Thanks to Olleg Samoylov + for spotting this (Closes: #328419). + * configure with python/perl extensions (Closes: #332825). + For that, build-depend on python-dev and libperl-dev. + * compile with -mieee on alpha to work around bug 330826 (closes: #330604). + * Bump Standards-Version up to 3.6.2 (no changes) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 25 Oct 2005 14:18:56 +0200 + +inkscape (0.42.2-1) unstable; urgency=low + + * New upstream version. + * Just for the record: inkscape version 0.42 and newer is not vulnerable to + the security bug mentioned in Bug #321501. + * enable --with-gnome-vfs in debian/rules, add libgnomevfs2-dev to + Build-Depends + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 22 Aug 2005 12:06:23 +0200 + +inkscape (0.42-1) unstable; urgency=low + + * New upstream version. + New features include better flow text handling and text selection, + better PS/EPS Export and SVG/CSS Compliance, Colored Clones, new, powerful + ways to arrange objects. For more information please have a look into the + release notes. + This fixes the following bugs: + - Simple and reproducible crash sequence with color tool (Closes: #302159) + - inkscape: got frozen with 2 buttons (Closes: #296126) + - Cannot export _really_ large drawings (more than 10000px) (Closes: #310864) + - updated german translation (Closes: #314041) + - fails to install (wrong dependencies) (Closes: #319958) + - new upstream version 0.42 available (Closes: #321015) + * Remove all patches from the debian package, since they were applied + upstream or backports. + * added Suggests: libxml-xql-perl, python-xml which are used by some + extensions in the new effect menu + * Fix typos in package description and add some info to copyright (thanks to Peter Moulder) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Wed, 29 Jun 2005 11:13:02 +0200 + +inkscape (0.41-5) unstable; urgency=low + + * Backport Patch from upstream to allow correct handling of empty lines in + svg files when exporting to eps in certain cases (closes: #301984) + * Added note to debian/copyright that some code in inkscape is public domain + + -- Wolfram Quester Fri, 13 May 2005 12:04:30 +0200 + +inkscape (0.41-4) unstable; urgency=high + + * include a fix the segfault at startup on alpha. Since this makes inkscape + usable on alpha set urgency to high, to allow this fix to reach sarge. + (Closes: #261848) + Many thanks to Florian Hars for the fix. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 5 Apr 2005 14:01:10 +0200 + +inkscape (0.41-3) unstable; urgency=low + + * fix typo in package description (Closes: #297525) + + -- Wolfram Quester Wed, 2 Mar 2005 14:34:19 +0100 + +inkscape (0.41-2) unstable; urgency=low + + * grab patch from upstream to fix segfault on cmd-line export to png + (Closes: #295341) + * include file for bash-completion contributed by Julien Allali + . Many thanks to him! + * Move dia, libwmf-bin, pstoedit, sketch, imagemagick, and perlmagick + to Recommends: instead of Suggests: to avoid the warning about not + initialized extensions and get the functionality they provide into + a default install. Explain that these packages are needed in the package + description (Closes: #294930) + * Fix wording in the german translation of the "Could not load extensions" + dialogue (I really should use dpatch). + * add an additional hunk to inkscape-0.41_amd64.diff. This was sent in by + Andreas Jochens. Again thanks to him. I hope this is really fixed now. + (Closes: #288946) + + -- Wolfram Quester Thu, 24 Feb 2005 19:58:32 +0100 + +inkscape (0.41-1) unstable; urgency=low + + * New upstream version. changes to v. 0.40 include: + + Color tracing, as well as multi-level grayscale tracing, is now possible + with the built-in tracer. + + Clone tiler is an exciting new way to create patterns, tesselations, + scatterings, or just about any regular or chaotic arrangements with clones + of an original tile. + + Managing length units is cleaned up, extended, and centralized in the + document units preference stored with a document. The user unit (px) of + SVG is fully supported and made the default. + + It is possible to invert selections via the !-key. + + Icon theming is now possible. + + Revised translations, new translations of some tutorials. + + This upstream version closes: #293746, #292552 + * remove export-orientation.diff since it was taken from upstream + * adopt the amd64 patch by Andreas Jochens to the new version + * set build-depends libgc >= 1:6.4-1, since inkscape will not build with + older versions. Some bugs inkscape suffered from had their reason in the + old libgc. + * added patch to fix lintian warnings executable-not-elf-or-script. + * suggest perlmagick to enable import files from Adobe Illustrator and + imagemagick since the blured shadows-script needs convert. + * add libxslt1-dev to build-depends + * upload sponsored by Guido Guenther + * Guido Günther: fix typo in Build-Depends: that made the list look empty + + -- Wolfram Quester Thu, 10 Feb 2005 14:06:32 +0100 + +inkscape (0.40-3) unstable; urgency=low + + * Fixed typos and added link to wiki in man-page of inkview. Closes: #286310. + * Add patch by Andreas Jochens to allow compile on amd86/gcc-4.0. + Closes: #288946. + * Add patch by Philipp Hartmann as a workaround for people who want to + export as eps instead of printing. Closes: #292166. + * let the package synopsis start wit v instead of V to make lintian happy + + -- Wolfram Quester Sat, 29 Jan 2005 14:59:07 +0100 + +inkscape (0.40-2) unstable; urgency=high + + * High-urgency upload for sarge targetted RC bugfix. + * Build inkscape with -Wa,-xgot on mips, mipsel so that the linker can + handle the symbol tables correctly. Closes: #283476. + This patch is from Steve Langasek. Many thanks to him. + * upload sponsored by Guido Guenther + * GG: really set urgency to high + + -- Wolfram Quester Wed, 8 Dec 2004 18:54:45 +0100 + +inkscape (0.40-1) unstable; urgency=low + + * New upstream version. changes to v. 0.39 include: + + First version that supports layers. + + Text on path. + + Improved calligraphy pen, freehand pencil and star tool. + + Three new tutorials. + + More detail at http://www.inkscape.org/cgi-bin/wiki.pl?ReleaseNotes + * added hints="Vector" to debian/inkscape.menu + * cleanup debian/rules: remove comments remaining from dh_make, fix + intendation to meet the script from upstream + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 29 Nov 2004 15:06:27 +0100 + +inkscape (0.39+0.40pre4-1) unstable; urgency=low + + * This is upstream version 0.40pre4. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Thu, 25 Nov 2004 13:42:32 +0100 + +inkscape (0.39+0.40pre3-1) unstable; urgency=low + + * This is upstream version 0.40pre3. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 16 Nov 2004 10:59:39 +0100 + +inkscape (0.39+0.40pre2-1) unstable; urgency=low + + * This is upstream version 0.40pre2. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Wed, 10 Nov 2004 17:42:40 +0100 + +inkscape (0.39+0.40pre1-1) unstable; urgency=low + + * new upstream version + New features include "Make bitmap copy", "Blurred shadows", "Randomized + Shapes", "Select Under/Drag Selected", better and easier handling of + default gradients, master opacity, node editing and the star tool as well + as a new tutorial on shapes. + * This is upstream version 0.40pre1. The versioning of debian is to make + sure the final version 0.40 is greater than this pre-Version + * remove PS-patch since it is applied upstream + * Adopt upstreams Depends: in control file + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 2 Nov 2004 15:21:06 +0100 + +inkscape (0.39-7) unstable; urgency=low + + * use %F instead of %U in inkscape.desktop.in (closes: #276785) + * rebuild against libpango1.0-0 from unstable (closes: #277063) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 18 Oct 2004 15:50:01 +0200 + +inkscape (0.39-6) unstable; urgency=medium + + * urgency=medium to get proper printing into sarge. + * Thanks to Ross Burton for uncovering the hopefully last bug in my PS-patch + (closes: #270119). + * upload sponsored by Guido Guenther + + -- Wolfram Quester Wed, 13 Oct 2004 11:18:48 +0200 + +inkscape (0.39-5) unstable; urgency=low + + * change ADSC-patch so that printing in landscape mode is properly supported + when we print using PS-operators and as bitmap. Now ADSC-compliant PS is + generated in all cases. Thanks to Ross Burton for all his testing. + This finally closes: #270119. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 14 Sep 2004 08:57:35 +0200 + +inkscape (0.39-4) unstable; urgency=low + + * change ADSC-patch to create ADSC-compliant PostScript even when using + "Print as bitmap". + * upload sponsored by Guido Guenther + + -- Wolfram Quester Mon, 13 Sep 2004 17:44:05 +0200 + +inkscape (0.39-3) unstable; urgency=low + + * create and apply patch to create ADSC-compliant PostScript and fix printing + in landscape mode when printing via "using postscript operators". The + landscape part of this patch is already applied upstream. + (closes: #270119) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Thu, 9 Sep 2004 13:33:34 +0200 + +inkscape (0.39-2) unstable; urgency=low + + * sort and clean build-dependencies in control according to pjrm. + * removed libxml-parser-perl from build-debs and added intltool instead. + This means that we don't use the intltool included in orig.tar.gz anymore. + * Added dia, pstoedit, and libwmf-bin to suggests in order to get proper + ps/eps and wmf import. + * set CXXFLAGS="$(CFLAGS)" for configure. Thanks to Thimo Neubauer and Peter + Moulder for pointing this out (closes: #266014). + * don't use build-stamp anymore. + * trim some whitespace at the end of lines in this changelog. + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 17 Aug 2004 11:49:54 +0200 + +inkscape (0.39-1) unstable; urgency=low + + * New upstream version + * upload sponsored by Guido Guenther + + -- Wolfram Quester Fri, 16 Jul 2004 12:45:42 +0200 + +inkscape (0.38.1+0.39pre4-1) unstable; urgency=low + + * New upstream version + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 13 Jul 2004 17:32:39 +0200 + +inkscape (0.38.1+0.39pre3-1) unstable; urgency=low + + * New upstream version + * This is upstream version 0.39pre3. The versioning of debian is to make + sure the final version 0.39 is greater than this pre-Versions + * removed "Conflicts: inkscape-cvs" and "Provides: inkscape" from debian/control + because the regular inkscape package should be installable parallel to + inkscape-cvs (if I ever have time to create this one) + * added "Suggests: sketch" to debian/control because inkscape can use sketch + to export eps. + + -- Wolfram Quester Fri, 9 Jul 2004 00:24:02 +0200 + +inkscape (0.38.1-4) unstable; urgency=low + + * added link to the inkscape homepage to debian/control + * added "Conflicts: inkscape-cvs" and "Provides: inkscape" to debian/control + to ensure proper handling of the new inkscape-cvs package + * upload sponsored by Guido Guenther + + -- Wolfram Quester Thu, 10 Jun 2004 16:13:35 +0200 + +inkscape (0.38.1-3) unstable; urgency=low + + * move debian/menu to debian/inkscape.menu. This was needed because upstream + includes a slightly diffent inkscape.menu file. Thanks to Karsten Merker. + * upload sponsored by Karsten Merker + + -- Wolfram Quester Tue, 20 Apr 2004 18:44:45 +0200 + +inkscape (0.38.1-2) unstable; urgency=low + + * fixed wording of package description in debian/control + (thanks to Karsten Merker) + * upload sponsored by Karsten Merker + + -- Wolfram Quester Mon, 19 Apr 2004 15:50:48 +0200 + +inkscape (0.38.1-1) unstable; urgency=low + + * New upstream release to fix two bugs itroduced in the flurry of last-day + activity. + * added my fix to the KEYBINDINGS-section in inkscape.1.in again + * upload sponsored by Guido Guenther and + Karsten Merker + + + -- Wolfram Quester Mon, 12 Apr 2004 21:11:01 +0200 + +inkscape (0.38-1) unstable; urgency=low + + * New upstream release: + Main goal for this release was to fix as many bugs as possible. Apart from + that, some new features and usability enhancements were included. Have a + look at /usr/share/doc/inkscape/NEWS for more information. + * remove debian/inkview.1 since it was included upstream. + * added my fix to the KEYBINDINGS-section in inkscape.1.in again + * don't remove po/*.gmo in debian/rules any longer + * remove debian/examples and dh_installexamples + * upload sponsored by Guido Guenther and + Karsten Merker + + -- Wolfram Quester Thu, 8 Apr 2004 12:24:13 +0200 + +inkscape (0.37-5) unstable; urgency=low + + * remove Guido Guenther from Uploaders + * insert a pair of #ifdef DEBUG_MARKERS ... #endif in + src/dialogs/stroke-style.cpp, sp_stroke_style_set_marker_buttons() + as suggested by + http://cvs.sourceforge.net/viewcvs.py/inkscape/inkscape/src/dialogs/stroke-style.cpp?r1=1.23&r2=1.24&hideattic=0 + (closes: #241668) + * upload sponsored by Guido Guenther + + -- Wolfram Quester Fri, 2 Apr 2004 19:09:03 +0200 + +inkscape (0.37-4) unstable; urgency=low + + * took updated po/es.po from upstream + * remove po/*.gmo in debian/rules + * added mime-type image/svg to debian/mime + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 30 Mar 2004 11:20:18 +0200 + +inkscape (0.37-3) unstable; urgency=low + + * converted inkscape.png to debian/inkscape.xpm and use this icon in the + menus (Trying to avoid lintians menu-icon-not-in-xpm-format) + * use dh_installexamples correctly. inkscape can display them even if + they are gzipped. (Closes: #232254) + * upload sponsored by Guido Guenther + * added manpage for inkview + * fixed KEYBINDINGS-section in inkscape.1 + * added inkscape.applications to have an entry in nautilus' "open with + another application" menu. I still don't know how I get an entry in "open + with" + + -- Wolfram Quester Fri, 13 Feb 2004 01:15:37 +0100 + +inkscape (0.37-2) unstable; urgency=low + + * the ./intltool-* scripts need libxml-parser-perl. + + -- Guido Guenther Wed, 11 Feb 2004 15:36:31 +0100 + +inkscape (0.37-1) unstable; urgency=low + + * new upstream version + * added libsigc++-1.2-dev to Build-Depends + * removed no more existing TODO from debian/docs + * upload sponsored by Guido Guenther + + -- Wolfram Quester Tue, 10 Feb 2004 14:02:10 +0100 + +inkscape (0.36-3) unstable; urgency=low + + * enable installation of debian menus + * install examples to /usr/share/doc/inkscape/ + * added mime-support + + -- Wolfram Quester Tue, 13 Jan 2004 11:36:43 +0100 + +inkscape (0.36-2) unstable; urgency=low + + * fix versioning in debian/changelog + * remove CVS/ subdirs + * remove sodipodi changelog from debian/ directory + * add myself to uploaders + + -- Guido Guenther Fri, 26 Dec 2003 23:01:02 +0100 + +inkscape (0.36-1) unstable; urgency=low + + * Initial Release. closes: #220795. + * adopted package description from Nathan Hurst + + -- Wolfram Quester Thu, 18 Dec 2003 12:36:30 +0100 --- inkscape-0.46.orig/debian/inkscape.xpm +++ inkscape-0.46/debian/inkscape.xpm @@ -0,0 +1,95 @@ +/* XPM */ +static char * inkscape_xpm[] = { +"32 32 60 1", +" c None", +". c #000000", +"+ c #050505", +"@ c #646464", +"# c #404040", +"$ c #232323", +"% c #C9C9C9", +"& c #FFFFFF", +"* c #FEFEFE", +"= c #939393", +"- c #070707", +"; c #5F5F5F", +"> c #F2F2F2", +", c #CECECE", +"' c #252525", +") c #030303", +"! c #9E9E9E", +"~ c #5A5A5A", +"{ c #9C9C9C", +"] c #FBFBFB", +"^ c #9B9B9B", +"/ c #0D0D0D", +"( c #707070", +"_ c #D1D1D1", +": c #ADADAD", +"< c #565656", +"[ c #929292", +"} c #C7C7C7", +"| c #272727", +"1 c #1B1B1B", +"2 c #F8F8F8", +"3 c #656565", +"4 c #636363", +"5 c #DADADA", +"6 c #181818", +"7 c #171717", +"8 c #454545", +"9 c #3A3A3A", +"0 c #EDEDED", +"a c #0A0A0A", +"b c #1A1A1A", +"c c #BBBBBB", +"d c #1F1F1F", +"e c #020202", +"f c #525252", +"g c #010101", +"h c #3D3D3D", +"i c #1C1C1C", +"j c #505050", +"k c #0B0B0B", +"l c #060606", +"m c #080808", +"n c #878888", +"o c #999A9A", +"p c #7A7C7C", +"q c #484949", +"r c #282828", +"s c #202020", +"t c #555656", +"u c #808282", +" ", +" .... ", +" .+@#.. ", +" .$%&*=-. ", +" .;>&&&&,'. ", +" )!&&&&&&&>~. ", +" .{&&&]&&&&&&^/ ", +" .(&&&_:&&&&&<[}| ", +" .12&&&34&&>5&6.78. ", +" ..9&&&0ab*cdefg..... ", +" ...d( on +Wed, 12 Nov 2003 10:39:40 +0100. + +It was downloaded from http://inkscape.sourceforge.net/ + +Upstream Authors: + Josh Andler; John Bintz; Arpad Biro; Daniel Borgmann; Hans Breuer; + Nicu Buculei; Bulia Byak; Chema Celorio; Johan Ceuppens; Zbigniew Chyla; + Alexander Clausen; John Cliff; Kees Cook; Ben Cromwell; Robert Crosbie; + Jon Cruz; Daniel Díaz; Larry Doolittle; Maxim V. Dziumanenko; Danilo Egan; + Frank Felfe; Andrew Fitzsimon; Edward Flick; Fred; Ben Fowler; + Ted Gould; Bryce Harrington; Carl Hetherington; Karl Ove Hufthammer; + Richard Hughes; Nathan Hurst; Thomas Ingham; Bob Jamison; Lauris Kaplinski; + Lynn Kerby; Petr Kovar; Raph Levien; Vitaly Lipatov; Colin Marquardt; + Dmitry G. Mastrukov; Matiphas; Michael Meeks; Federico Mena; MenTaLguY; + Aubanel Monnier; Derek P. Moore; Peter Moulder; Jörg Müller; Yukihiro Nakai; + Christian Neumair; Andreas Nilsson; Mitsuru Oka; Jon Phillips; + Zdenko Podobny; Alexandre Prokoudine; Alexey Remizov; Frederic Rodrigo; + Juarez Rudsatz; Xavier Conde Rueda; Christian Schaller; Tom von Schwerdtner; + Shivaken; Boštjan Špetič; Aaron Spike; Kaushik Sridharan; Dariusz Stojek; + Pat Suwalski; Adib Taraben; David Turner; Aleksandar Urosevic; Lucas Vieites; + Michael Wybrow; Daniel Yacob; Masatake Yamato. + + See http://www.inkscape.org/discussion.php for Jabber/IRC discussion details, + and http://www.inkscape.org/mailing_lists.php for Inkscape-related mailing lists. + +License: GNU GPL; some portions public domain. + + On Debian systems, the text of the GNU GPL can be found in + /usr/share/common-licenses/GPL. + + Some parts of the inkscape source code are released into the Public Domain; + this is stated in the files and functions concerned. + Please consult the individual source files for more information. --- inkscape-0.46.orig/debian/inkscape.bash +++ inkscape-0.46/debian/inkscape.bash @@ -0,0 +1,25 @@ +# inkscape(1) completion +# put this file in /etc/bash_completion.d/ +# allali@univ-mlv.fr + +have inkscape && +_inkscape() +{ + local cur + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '-? --help --usage -V --version \ + -z --without-gui -g --with-gui -f --file= -p --print= \ + -e --export-png= -d --export-dpi= -a --export-area= \ + -w --export-width= -h --export-height= -i --export-id= \ + -j --export-id-only -t --export-use-hints -b --export-background= \ + -y --export-background-opacity= -l --export-plain-svg= -s --slideshow' -- $cur ) ) + else + _filedir '@(ai|ani|bmp|cur|dia|eps|gif|ggr|ico|jpe|jpeg|jpg|pbm|pcx|pdf|pgm|png|ppm|pnm|ps|ras|sk|svg|svgz|targa|tga|tif|tiff|txt|wbmp|wmf|xbm|xpm)' + fi + +} +[ "${have:-}" ] && complete -F _inkscape $filenames inkscape --- inkscape-0.46.orig/debian/inkscape.menu +++ inkscape-0.46/debian/inkscape.menu @@ -0,0 +1,5 @@ +?package(inkscape): needs="X11" section="Applications/Graphics"\ + hints="Vector"\ + title="Inkscape" command="/usr/bin/inkscape"\ + icon="/usr/share/pixmaps/inkscape.xpm"\ + longtitle="Vector based drawing program" --- inkscape-0.46.orig/debian/patches/04-only-use-valid-font-families-in-text-tool.dpatch +++ inkscape-0.46/debian/patches/04-only-use-valid-font-families-in-text-tool.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-only-use-valid-font-families-in-text-tool.dpatch by Thomas Viehmann +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to check font family against existing fonts in text tool. +## DP: (closes: #496784) + +@DPATCH@ + +--- inkscape-0.46.orig/src/style.cpp ++++ inkscape-0.46/src/style.cpp +@@ -50,6 +50,8 @@ + #include + #include + ++#include "libnrtype/font-lister.h" ++ + using Inkscape::CSSOStringStream; + using std::vector; + +@@ -2666,9 +2668,10 @@ + ts->refcount = 1; + sp_text_style_clear(ts); + +- ts->font_specification.value = g_strdup("Bitstream Vera Sans"); +- ts->font.value = g_strdup("Bitstream Vera Sans"); +- ts->font_family.value = g_strdup("Bitstream Vera Sans"); ++ Glib::ustring family = Inkscape::FontLister::get_instance()->get_family_name_or_any("Bitstream Vera Sans"); ++ ts->font_specification.value = g_strdup(family.c_str()); ++ ts->font.value = g_strdup(family.c_str()); ++ ts->font_family.value = g_strdup(family.c_str()); + + return ts; + } +--- inkscape-0.46.orig/src/libnrtype/font-lister.h ++++ inkscape-0.46/src/libnrtype/font-lister.h +@@ -86,6 +86,15 @@ + return (*iter).second; + } + ++ Glib:: ustring ++ get_family_name_or_any(Glib::ustring family) ++ { ++ IterMapType::iterator iter = font_list_store_iter_map.find(family); ++ if (iter == font_list_store_iter_map.end ()) iter = font_list_store_iter_map.begin(); ++ if (iter == font_list_store_iter_map.end ()) throw FAMILY_NOT_FOUND; ++ return (*iter).first; ++ } ++ + const NRNameList + get_name_list () const + { +--- inkscape-0.46.orig/src/widgets/toolbox.cpp ++++ inkscape-0.46/src/widgets/toolbox.cpp +@@ -4012,6 +4012,7 @@ + font_instance * font = font_factory::Default()->FaceFromStyle(query); + if (font) { + familyName = font_factory::Default()->GetUIFamilyString(font->descr); ++ familyName = Inkscape::FontLister::get_instance()->get_family_name_or_any(familyName); + font->Unref(); + font = NULL; + } --- inkscape-0.46.orig/debian/patches/07_cdr2svg.dpatch +++ inkscape-0.46/debian/patches/07_cdr2svg.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_cdr2svg.dpatch by Andreas Wenning +## +## DP: Patch to use uniconvertor instead of uniconv. +## DP: Makes the .cdr input work again, closes bugs #506217, #471109 + +@DPATCH@ +diff -urNad inkscape-0.46~/share/extensions/cdr2svg.sh inkscape-0.46/share/extensions/cdr2svg.sh +--- inkscape-0.46~/share/extensions/cdr2svg.sh 2008-03-11 05:21:10.000000000 +0100 ++++ inkscape-0.46/share/extensions/cdr2svg.sh 2008-05-12 17:13:50.000000000 +0200 +@@ -4,7 +4,7 @@ + TEMPFILENAME=`mktemp 2>/dev/null || echo "$TMPDIR/$$"` + TEMPFILENAME=${TEMPFILENAME}.svg + +-uniconv "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1 ++/usr/bin/uniconvertor "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1 + + cat < "${TEMPFILENAME}" || rc=1 + rm -f "${TEMPFILENAME}" +diff -urNad inkscape-0.46~/share/extensions/cdr_input.inx inkscape-0.46/share/extensions/cdr_input.inx +--- inkscape-0.46~/share/extensions/cdr_input.inx 2008-03-11 05:21:07.000000000 +0100 ++++ inkscape-0.46/share/extensions/cdr_input.inx 2008-05-12 17:13:35.000000000 +0200 +@@ -1,7 +1,7 @@ + + <_name>Corel DRAW Input + org.inkscape.input.cdr +- uniconv ++ uniconvertor + cdr2svg.sh + + .cdr +diff -urNad inkscape-0.46~/share/extensions/wmf_input.inx inkscape-0.46/share/extensions/wmf_input.inx +--- inkscape-0.46~/share/extensions/wmf_input.inx 2008-03-11 05:21:10.000000000 +0100 ++++ inkscape-0.46/share/extensions/wmf_input.inx 2008-05-12 17:13:22.000000000 +0200 +@@ -1,7 +1,7 @@ + + <_name>Windows Metafile Input + org.inkscape.input.wmf +- uniconv ++ uniconvertor + cdr2svg.sh + + .wmf --- inkscape-0.46.orig/debian/patches/06_gcc-4.4.dpatch +++ inkscape-0.46/debian/patches/06_gcc-4.4.dpatch @@ -0,0 +1,179 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_gcc-4.4.dpatch by Wolfram Quester +## +## DP: Patch by Martin Michlmayr to make inkscape compile with +## DP: gcc 4.4. His bug report and description: +## DP: Your package fails to build with the upcoming GCC 4.4. Version 4.4 +## DP: has not been released yet but I'm building with a snapshot in order +## DP: to find errors and give people an advance warning. +## DP: +## DP: GCC 4.4 cleaned up some more C++ headers. You always have to #include +## DP: headers directly and cannot rely for things to be included indirectly. +## DP: +## DP: You can reproduce this problem with gcc-snapshot from unstable. +## DP: +## DP: > Automatic build of inkscape_0.46-3 on em64t by sbuild/amd64 0.53 +## DP: ... +## DP: > x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include/freetype2 -pthread -DORBIT2=1 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DRELAYTOOL_CRYPTO='static const int libcrypto_is_present = 1; static int __attribute__((unused)) libcrypto_symbol_is_present(char *m) { return 1; }' -DRELAYTOOL_SSL='static const int libssl_is_present = 1; static int __attribute__((unused)) libssl_symbol_is_present(char *m) { return 1; }' -DHAVE_SSL -I/usr/include/libwpg-0.1 -I/usr/include/libwpd-0.8 -I/usr/include/freetype2 -I/usr/include/poppler -D_REENTRANT -I/usr/include/poppler/glib -I/usr/include/poppler -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -DPOTRACE=\"potrace\" -D_REENTRANT -pthread -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/atkmm-1.6 -I/usr/include/atk-1.0 -I/usr/include/libxml2 -I/usr/include/gtkspell-2.0 -I../cxxtest -Wall -g -O2 -MT conn-avoid-ref.o -MD -MP -MF $depbase.Tpo -c -o conn-avoid-ref.o conn-avoid-ref.cpp &&\ +## DP: > mv -f $depbase.Tpo $depbase.Po +## DP: > In file included from ./libavoid/graph.h:30, +## DP: > from libavoid/router.h:30, +## DP: > from conn-avoid-ref.cpp:20: +## DP: > ./libavoid/vertices.h:60: error: 'stdout' was not declared in this scope +## DP: > ./libavoid/vertices.h: In member function 'void Avoid::VertInfList::stats()': +## DP: > ./libavoid/vertices.h:103: error: 'printf' was not declared in this scope +## DP: > make[3]: *** [conn-avoid-ref.o] Error 1 +## DP: > make[3]: Leaving directory `/build/tbm/inkscape-0.46/src' + +@DPATCH@ + +--- src/xml/event.cpp~ 2008-11-14 08:27:20.000000000 +0000 ++++ inkscape-0.46/src/xml/event.cpp 2008-11-14 08:27:26.000000000 +0000 +@@ -14,6 +14,7 @@ + */ + + #include // g_assert() ++#include + + #include "event.h" + #include "event-fns.h" +--- src/io/inkscapestream.h~ 2008-11-14 08:02:53.000000000 +0000 ++++ inkscape-0.46/src/io/inkscapestream.h 2008-11-14 08:03:00.000000000 +0000 +@@ -12,6 +12,7 @@ + */ + + ++#include + #include + + namespace Inkscape +--- src/io/sys.cpp~ 2008-11-14 08:04:54.000000000 +0000 ++++ inkscape-0.46/src/io/sys.cpp 2008-11-14 08:05:11.000000000 +0000 +@@ -22,6 +22,8 @@ + #include + #include + ++#include ++ + #include "prefs-utils.h" + #include "sys.h" + +--- src/dom/io/domstream.h~ 2008-11-14 07:51:18.000000000 +0000 ++++ inkscape-0.46/src/dom/io/domstream.h 2008-11-14 07:51:28.000000000 +0000 +@@ -33,6 +33,8 @@ + + #include + ++#include ++ + namespace org + { + namespace w3c +--- src/dom/svg/svgtypes.h~ 2008-11-14 07:53:23.000000000 +0000 ++++ inkscape-0.46/src/dom/svg/svgtypes.h 2008-11-14 07:53:32.000000000 +0000 +@@ -47,6 +47,7 @@ + #include "dom/smil.h" + + ++#include + #include + + +--- src/dom/domimpl.cpp~ 2008-11-14 07:49:10.000000000 +0000 ++++ inkscape-0.46/src/dom/domimpl.cpp 2008-11-14 07:49:18.000000000 +0000 +@@ -30,6 +30,8 @@ + + #include "domimpl.h" + ++#include ++ + namespace org + { + namespace w3c +--- src/dom/xpathtoken.h~ 2008-11-14 07:52:27.000000000 +0000 ++++ inkscape-0.46/src/dom/xpathtoken.h 2008-11-14 07:52:36.000000000 +0000 +@@ -35,6 +35,7 @@ + + #include + ++#include + #include + + namespace org +--- src/libavoid/vertices.h~ 2008-11-14 07:14:36.000000000 +0000 ++++ inkscape-0.46/src/libavoid/vertices.h 2008-11-14 07:14:41.000000000 +0000 +@@ -23,6 +23,7 @@ + #ifndef AVOID_VERTICES_H + #define AVOID_VERTICES_H + ++#include + #include + #include + #include +--- src/libnr/nr-matrix-fns.cpp~ 2008-11-14 08:16:43.000000000 +0000 ++++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp 2008-11-14 08:16:48.000000000 +0000 +@@ -1,5 +1,7 @@ + #include + ++#include ++ + namespace NR { + + Matrix elliptic_quadratic_form(Matrix const &m) { +--- src/libnr/nr-matrix.cpp~ 2008-11-14 08:19:20.000000000 +0000 ++++ inkscape-0.46/src/libnr/nr-matrix.cpp 2008-11-14 08:19:26.000000000 +0000 +@@ -11,6 +11,7 @@ + * This code is in public domain + */ + ++#include + #include + #include "nr-matrix.h" + +--- src/2geom/svg-path-parser.h~ 2008-11-14 08:06:45.000000000 +0000 ++++ inkscape-0.46/src/2geom/svg-path-parser.h 2008-11-14 08:06:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #ifndef SEEN_SVG_PATH_PARSER_H + #define SEEN_SVG_PATH_PARSER_H + ++#include + #include + #include + #include +--- src/2geom/sbasis-math.cpp~ 2008-11-14 08:29:42.000000000 +0000 ++++ inkscape-0.46/src/2geom/sbasis-math.cpp 2008-11-14 08:31:32.000000000 +0000 +@@ -38,11 +38,11 @@ + //#define ZERO 1e-3 + + +-namespace Geom { ++#include ++#include + ++namespace Geom { + +-#include +-#include + + //-|x|----------------------------------------------------------------------- + Piecewise abs(SBasis const &f){ +--- src/streams-handles.cpp~ 2008-11-14 07:41:07.000000000 +0000 ++++ inkscape-0.46/src/streams-handles.cpp 2008-11-14 07:41:14.000000000 +0000 +@@ -12,6 +12,7 @@ + #include "streams-handles.h" + #include "uri.h" + ++#include + #include + + namespace Inkscape { +--- src/streams-zlib.cpp~ 2008-11-14 07:41:24.000000000 +0000 ++++ inkscape-0.46/src/streams-zlib.cpp 2008-11-14 07:41:30.000000000 +0000 +@@ -9,6 +9,7 @@ + * Released under GNU LGPL, read the file 'COPYING.LIB' for more information + */ + ++#include + #include + #include + #include --- inkscape-0.46.orig/debian/patches/00list +++ inkscape-0.46/debian/patches/00list @@ -0,0 +1,9 @@ +01_mips +02-poppler-0.8.3 +03-chinese-inkscape +03-gtk-includes.dpatch +04-only-use-valid-font-families-in-text-tool +05_fix_latex_patch +06_gcc-4.4 +07_cdr2svg +08_skip-bad-utf-on-pdf-import --- inkscape-0.46.orig/debian/patches/08_skip-bad-utf-on-pdf-import.dpatch +++ inkscape-0.46/debian/patches/08_skip-bad-utf-on-pdf-import.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08-skip-bad-utf-on-pdf-import.dpatch by Thomas Viehmann +## +## DP: This patch closes bug #510234. +## DP: Thomas' report and description of the patch: +## DP: When converting the attached testcase.pdf (generated by latex testcase ; +## DP: dvips testcase ; ps2pdf testcase.ps (*not* pdflatex) from the tex), +## DP: inkscape currently fails and with the patch works. +## DP: There seem to be several exceptions to catch here, I observed +## DP: std:length_error (because string::append was passed length +## DP: string::n_pos) and possibly Glib::ConvertError. + +@DPATCH@ + +--- inkscape-0.46/src/extension/internal/pdfinput/svg-builder.cpp~ ++++ inkscape-0.46/src/extension/internal/pdfinput/svg-builder.cpp +@@ -1208,11 +1208,16 @@ + os_y << delta_pos[1]; + y_coords.append(os_y.str()); + last_delta_pos = delta_pos; +- +- // Append the character to the text buffer +- text_buffer.append((char *)&glyph.code, 1); +- +- glyphs_in_a_row++; ++ ++ try { ++ // Append the character to the text buffer ++ text_buffer.append((char *)&glyph.code, 1); ++ glyphs_in_a_row++; ++ } ++ catch (std::exception& e) { ++ std::cerr << "Error converting glyphs in PDF: " << e.what()<< std::endl; ++ } ++ + i++; + } + _container->appendChild(text_node); --- inkscape-0.46.orig/debian/patches/02-poppler-0.8.3.dpatch +++ inkscape-0.46/debian/patches/02-poppler-0.8.3.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-poppler-0.8.3.dpatch by Wolfram Quester +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch is taken from gentoo to fix a FTBFS with new libpoppler 0.8.3 +## DP: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch?view=markup +## DP: (closes: #488170, #489083) + +@DPATCH@ + +diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:26:20.000000000 +0200 ++++ ./src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:51:47.000000000 +0200 +@@ -2194,11 +2194,11 @@ + void PdfParser::doShowText(GooString *s) { + GfxFont *font; + 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]; + double *mat; + Object charProc; +@@ -2242,11 +2242,11 @@ + oldParser = parser; + p = s->getCString(); + 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 == ' ') { + dx += state->getWordSpace(); + } +@@ -2291,11 +2291,11 @@ + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); + p = s->getCString(); + 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) { + dx *= state->getFontSize(); + dy = dy * state->getFontSize() + state->getCharSpace(); --- inkscape-0.46.orig/debian/patches/05_fix_latex_patch.dpatch +++ inkscape-0.46/debian/patches/05_fix_latex_patch.dpatch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_fix_latex_patch.dpatch by Salvatore Bonaccorso +## +## DP: Fix LaTeX formula rendering +## DP: Patch is taken from: https://bugs.launchpad.net/inkscape/+bug/55273 + +@DPATCH@ + +--- inkscape-0.46.orig/share/extensions/eqtexsvg.py 2008-11-20 21:45:36.339896646 +0100 ++++ inkscape-0.46/share/extensions/eqtexsvg.py 2008-11-20 21:46:11.067896917 +0100 +@@ -49,16 +49,18 @@ + doc_sizeW = max(doc_width,doc_height) + + def clone_and_rewrite(self, node_in): +- if node_in.tag != 'svg': +- node_out = inkex.etree.Element(inkex.addNS(node_in.tag,'svg')) ++ in_tag = node_in.tag.rsplit('}',1)[-1] ++ if in_tag != 'svg': ++ node_out = inkex.etree.Element(inkex.addNS(in_tag,'svg')) + for name in node_in.attrib: + node_out.set(name, node_in.attrib[name]) + else: + node_out = inkex.etree.Element(inkex.addNS('g','svg')) + for c in node_in.iterchildren(): +- if c.tag in ('g', 'path', 'polyline', 'polygon'): ++ c_tag = c.tag.rsplit('}',1)[-1] ++ if c_tag in ('g', 'path', 'polyline', 'polygon'): + child = clone_and_rewrite(self, c) +- if c.tag == 'g': ++ if c_tag == 'g': + child.set('transform','matrix('+str(doc_sizeH/700.)+',0,0,'+str(-doc_sizeH/700.)+','+str(-doc_sizeH*0.25)+','+str(doc_sizeW*0.75)+')') + node_out.append(child) + +@@ -86,6 +88,7 @@ + dvi_file = os.path.join(base_dir, "eq.dvi") + svg_file = os.path.join(base_dir, "eq.svg") + out_file = os.path.join(base_dir, "eq.out") ++ err_file = os.path.join(base_dir, "eq.err") + + def clean(): + os.remove(latex_file) +@@ -95,6 +98,8 @@ + os.remove(dvi_file) + os.remove(svg_file) + os.remove(out_file) ++ if os.path.exists(err_file): ++ os.remove(err_file) + os.rmdir(base_dir) + + create_equation_tex(latex_file, self.options.formula) +@@ -109,10 +114,20 @@ + sys.exit(1) + + os.system('dvips -q -f -E -D 600 -y 5000 -o ' + ps_file + ' ' + dvi_file) +- #os.system('cd ' + base_dir) +- os.system('pstoedit -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + '> ' + out_file) +- svg_open(self, svg_file) ++ # cd to base_dir is necessary, because pstoedit ++ # writes temporary files to cwd and needs write ++ # permissions ++ os.system('cd ' + base_dir + ' ; pstoedit -f plot-svg -dt -ssp ' + ps_file + ' ' + svg_file + ' > ' + out_file + ' 2> ' + err_file) ++ ++ # forward errors to stderr but skip pstoedit header ++ if os.path.exists(err_file): ++ err_stream = open(err_file, 'r') ++ for line in err_stream: ++ if not line.startswith('pstoedit: version'): ++ sys.stderr.write(line + '\n') ++ err_stream.close() + ++ svg_open(self, svg_file) + clean() + + e = EQTEXSVG() --- inkscape-0.46.orig/debian/patches/01_mips.dpatch +++ inkscape-0.46/debian/patches/01_mips.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_mips.dpatch by Wolfram Quester +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch by Thiemo Seufer to get rid of xgot. His +## DP: description: +## DP: Fixing bug #274738 for binutils allows to build inkscape without the +## DP: xgot hack on mips/mipsel. Since this may also break the existing xgot +## DP: support, a rebuild with the appended patch is needed. +## DP: +## DP: +## DP: Thiemo + +@DPATCH@ + +diff -ur ./configure.orig ./configure +--- ./configure.orig 2008-01-31 18:55:20.000000000 +0100 ++++ ./configure 2008-01-31 18:56:25.000000000 +0100 +@@ -14714,12 +14714,6 @@ + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + +- case "$host_cpu" in +- mips|mipsel) +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" +- CFLAGS="$CFLAGS -Wa,-xgot" +- ;; +- esac + fi + done + +diff -ur ./configure.ac.orig ./configure.ac +--- ./configure.ac.orig 2007-04-26 11:34:41.000000000 +0200 ++++ ./configure.ac 2007-04-26 11:36:27.000000000 +0200 +@@ -757,15 +757,6 @@ + + CXXFLAGS="-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS" + +- dnl Test for arch-specific situations. +- case "$host_cpu" in +- mips|mipsel) +- dnl Symbol tables can get too large: this uses alternate tables +- dnl See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=283476 +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" +- CFLAGS="$CFLAGS -Wa,-xgot" +- ;; +- esac + fi + + AC_DEFINE(WITH_MODULES, 1, [Use experimental module support]) --- inkscape-0.46.orig/debian/patches/03-gtk-includes.dpatch +++ inkscape-0.46/debian/patches/03-gtk-includes.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-gtk-includes.dpatch by +## +## DP: Work around https://launchpad.net/bugs/247909 FTBFS + +@DPATCH@ +diff -urNad inkscape-0.46~/src/widgets/sp-xmlview-attr-list.h inkscape-0.46/src/widgets/sp-xmlview-attr-list.h +--- inkscape-0.46~/src/widgets/sp-xmlview-attr-list.h 2008-03-11 05:20:13.000000000 +0100 ++++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h 2008-08-11 12:31:37.000000000 +0200 +@@ -13,7 +13,7 @@ + */ + + #include +-#include ++#include + #include "../xml/repr.h" + + #include --- inkscape-0.46.orig/debian/patches/03-chinese-inkscape.dpatch +++ inkscape-0.46/debian/patches/03-chinese-inkscape.dpatch @@ -0,0 +1,105 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-chinese-inkscape.dpatch by Wolfram Quester +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This is a patch by Luca Bruno to fix a segfault which +## DP: occurs in file handling wit locales like zh_CN. +## DP: (closes: #487623) + +@DPATCH@ + +Index: src/libnrtype/FontFactory.cpp +=================================================================== +--- src/libnrtype/FontFactory.cpp (revisione 19753) ++++ ./src/libnrtype/FontFactory.cpp (copia locale) +@@ -821,7 +821,8 @@ + res->Ref(); + AddInCache(res); + } +- res->InitTheFace(); ++ if(res) ++ res->InitTheFace(); + return res; + } + +Index: src/libnrtype/Layout-TNG-Output.cpp +=================================================================== +--- src/libnrtype/Layout-TNG-Output.cpp (revisione 19753) ++++ ./src/libnrtype/Layout-TNG-Output.cpp (copia locale) +@@ -116,22 +116,24 @@ + _getGlyphTransformMatrix(glyph_index, &glyph_matrix); + NR::Matrix total_transform = glyph_matrix; + total_transform *= transform; +- NR::Maybe glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph); +- if (glyph_rect) { +- NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max(); +- NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]); +- tlp *= total_transform; +- trp *= total_transform; +- blp *= total_transform; +- brp *= total_transform; +- *glyph_rect = NR::Rect(tlp,trp); +- glyph_rect->expandTo(blp); +- glyph_rect->expandTo(brp); +- if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0]; +- if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0]; +- if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1]; +- if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1]; +- } ++ if(_glyphs[glyph_index].span(this).font) { ++ NR::Maybe glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph); ++ if (glyph_rect) { ++ NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max(); ++ NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]); ++ tlp *= total_transform; ++ trp *= total_transform; ++ blp *= total_transform; ++ brp *= total_transform; ++ *glyph_rect = NR::Rect(tlp,trp); ++ glyph_rect->expandTo(blp); ++ glyph_rect->expandTo(brp); ++ if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0]; ++ if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0]; ++ if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1]; ++ if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1]; ++ } ++ } + } + } + +Index: src/libnrtype/Layout-TNG-Compute.cpp +=================================================================== +--- src/libnrtype/Layout-TNG-Compute.cpp (revisione 19753) ++++ ./src/libnrtype/Layout-TNG-Compute.cpp (copia locale) +@@ -478,9 +478,9 @@ + new_span.in_input_stream_item = unbroken_span.input_index; + new_span.baseline_shift = _y_offset; + new_span.block_progression = _block_progression; +- if (_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) { +- new_span.font = para.pango_items[unbroken_span.pango_item_index].font; +- new_span.font->Ref(); ++ if ((_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) && (new_span.font = para.pango_items[unbroken_span.pango_item_index].font)) ++ { ++ new_span.font->Ref(); + new_span.font_size = unbroken_span.font_size; + new_span.direction = para.pango_items[unbroken_span.pango_item_index].item->analysis.level & 1 ? RIGHT_TO_LEFT : LEFT_TO_RIGHT; + new_span.input_stream_first_character = Glib::ustring::const_iterator(unbroken_span.input_stream_first_character.base() + it_span->start.char_byte); +@@ -565,7 +565,7 @@ + new_glyph.x = x + unbroken_span.glyph_string->glyphs[glyph_index].geometry.x_offset * font_size_multiplier; + new_glyph.y = _y_offset + unbroken_span.glyph_string->glyphs[glyph_index].geometry.y_offset * font_size_multiplier; + new_glyph.width = unbroken_span.glyph_string->glyphs[glyph_index].geometry.width * font_size_multiplier; +- if (new_glyph.width == 0) ++ if ((new_glyph.width == 0) && (para.pango_items[unbroken_span.pango_item_index].font)) + new_glyph.width = new_span.font_size * para.pango_items[unbroken_span.pango_item_index].font->Advance(unbroken_span.glyph_string->glyphs[glyph_index].glyph, false); + // for some reason pango returns zero width for invalid glyph characters (those empty boxes), so go to freetype for the info + } +@@ -906,7 +906,8 @@ + line_height->setZero(); + *line_height_multiplier = 1.0; + } +- font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading); ++ else ++ font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading); + *line_height *= font_size; + + // yet another borked SPStyle member that we're going to have to fix ourselves