Package: inkscape
Version: 0.48.0-1
Severity: wishlist
Tags: experimental patch
Hi,
libwpg 0.2.0 was released and is alreay in experimental. You get this
report because your package (build-)depends on it. There's API and ABI
changed there so it needs a transition. To make it the least painful
many packages should migrate quickly at least in experimental so they
can be uploaded to sid together (or at least in short delays) when it's due
time.
libwp* upstream today /query'd me with the following:
15:14 -!- Irssi: Starting query in freenode with Fridrich
15:14 <Fridrich> btw, if you need a patch for inkscape to be built against the
new libwpg: http://pastebin.ca/2000958 I IIII I I I I I I
II I
15:14 -!- Fridrich [[email protected]]
15:14 -!- ircname : Fridrich Štrba
15:14 -!- channels : #oooreleases #documentfoundation @#libreoffice
15:14 -!- server : zelazny.freenode.net [Corvallis, OR, USA]
15:14 -!- account : Fridrich
15:14 -!- End of WHOIS
15:41 <_rene_> wow, thanks
15:41 <_rene_> will give to the inkscape maintainer
15:42 <Fridrich> I am building my windows repo with the new stuff, so patching
easy things as they come
so we even have a patch right now.
I turned this into a complete debdiff, here it is (nevermind the NMU,
I did a testbuild here). Unfortunately patching the autotools result in
a automake call....
If you want me to NMU I can, too.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages inkscape depends on:
ii libaspell15 0.60.6-4 GNU Aspell spell-checker runtime l
ii libatk1.0-0 1.30.0-1 The ATK accessibility toolkit
ii libc6 2.11.2-7 Embedded GNU C Library: Shared lib
ii libcairo2 1.8.10-6 The Cairo 2D vector graphics libra
ii libcairomm-1.0-1 1.8.4-3 C++ wrappers for Cairo (shared lib
ii libfontconfig1 2.8.0-2.1 generic font configuration library
ii libfreetype6 2.4.2-2.1 FreeType 2 font engine, shared lib
ii libgc1c2 1:6.8-1.2 conservative garbage collector for
ii libgcc1 1:4.4.5-8 GCC support library
ii libgconf2-4 2.28.1-6 GNOME configuration database syste
ii libglib2.0-0 2.24.2-1 The GLib library of C routines
ii libglibmm-2.4-1c2a 2.24.2-1 C++ wrapper for the GLib toolkit (
ii libgnomevfs2-0 1:2.24.3-1 GNOME Virtual File System (runtime
ii libgomp1 4.4.5-8 GCC OpenMP (GOMP) support library
ii libgsl0ldbl 1.14+dfsg-1 GNU Scientific Library (GSL) -- li
ii libgtk2.0-0 2.20.1-2 The GTK+ graphical user interface
ii libgtkmm-2.4-1c2a 1:2.20.3-1 C++ wrappers for GTK+ (shared libr
ii libgtkspell0 2.0.16-1 a spell-checking addon for GTK's T
ii liblcms1 1.18.dfsg-1.2+b3 Color management library
ii libmagick++3 8:6.6.0.4-3 object-oriented C++ interface to I
ii libmagickcore3 8:6.6.0.4-3 low-level image manipulation libra
ii libpango1.0-0 1.28.3-1 Layout and rendering of internatio
ii libpangomm-1.4-1 2.26.2-1 C++ Wrapper for pango (shared libr
ii libpng12-0 1.2.44-1 PNG library - runtime
ii libpoppler-glib4 0.12.4-1.2 PDF rendering library (GLib-based
ii libpoppler5 0.12.4-1.2 PDF rendering library
ii libpopt0 1.16-1 lib for parsing cmdline parameters
ii libsigc++-2.0-0c2a 2.2.4.2-1 type-safe Signal Framework for C++
ii libstdc++6 4.4.5-8 The GNU Standard C++ Library v3
ii libwpd8c2a 0.8.14-1 Library for handling WordPerfect d
ii libwpg-0.1-1 0.1.3-1 WordPerfect graphics import/conver
ii libx11-6 2:1.3.3-4 X11 client-side library
ii libxml2 2.7.8.dfsg-1 GNOME XML library
ii libxslt1.1 1.1.26-6 XSLT 1.0 processing library - runt
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages inkscape recommends:
ii aspell 0.60.6-4 GNU Aspell spell-checker
ii imagemagick 8:6.6.0.4-3 image manipulation programs
ii libwmf-bin 0.2.8.4-6.1+b1 Windows metafile conversion tools
pn perlmagick <none> (no description available)
pn pstoedit <none> (no description available)
Versions of packages inkscape suggests:
ii dia-gnome 0.97.1-7 Diagram editor (GNOME version)
ii libgnomevfs2-extra 1:2.24.3-1 GNOME Virtual File System (extra m
pn libsvg-perl <none> (no description available)
pn libxml-xql-perl <none> (no description available)
ii python 2.6.6-3+squeeze1 interactive high-level object-orie
ii python-lxml 2.2.8-2 pythonic binding for the libxml2 a
ii python-numpy 1:1.4.1-5 Numerical Python adds a fast array
pn python-uniconvertor <none> (no description available)
ii ruby 4.5 An interpreter of object-oriented
pn skencil <none> (no description available)
pn ttf-bitstream-vera <none> (no description available)
-- no debconf information
Grüße/Regards,
Rene
diff -u inkscape-0.48.0/debian/control inkscape-0.48.0/debian/control
--- inkscape-0.48.0/debian/control
+++ inkscape-0.48.0/debian/control
@@ -5,7 +5,9 @@
Vcs-Browser: http://git.debian.org/?p=git/collab-maint/inkscape.git
Homepage: http://www.inkscape.org/
Maintainer: Wolfram Quester <[email protected]>
-Build-Depends: debhelper (>= 7.0.0),
+Build-Depends: autoconf,
+ automake,
+ debhelper (>= 7.0.0),,
dpatch,
intltool,
libart-2.0-dev (>= 2.3.10),
@@ -26,7 +28,8 @@
libpopt-dev,
libsigc++-2.0-dev (>= 2.0.16-2),
libtool,
- libwpg-dev,
+ libwpd-dev (>= 0.9.0),
+ libwpg-dev (>= 0.2.0),
libxml-parser-perl,
libxml2-dev (>= 2-2.4.24),
libxslt1-dev,
diff -u inkscape-0.48.0/debian/changelog inkscape-0.48.0/debian/changelog
--- inkscape-0.48.0/debian/changelog
+++ inkscape-0.48.0/debian/changelog
@@ -1,3 +1,10 @@
+inkscape (0.48.0-1.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * build against libwpg 0.2.0
+
+ -- Rene Engelhard <[email protected]> Wed, 24 Nov 2010 16:02:56 +0100
+
inkscape (0.48.0-1) experimental; urgency=low
* [cae07a3] New Upstream version 0.48.0
diff -u inkscape-0.48.0/debian/patches/00list inkscape-0.48.0/debian/patches/00list
--- inkscape-0.48.0/debian/patches/00list
+++ inkscape-0.48.0/debian/patches/00list
@@ -2 +2 @@
-
+02-libwpg0.2
only in patch2:
unchanged:
--- inkscape-0.48.0.orig/debian/patches/02-libwpg0.2.dpatch
+++ inkscape-0.48.0/debian/patches/02-libwpg0.2.dpatch
@@ -0,0 +1,99 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_libwpd0_9.dpatch by <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.0~/configure.ac inkscape-0.48.0/configure.ac
+--- inkscape-0.48.0~/configure.ac 2010-08-04 18:45:00.000000000 +0200
++++ inkscape-0.48.0/configure.ac 2010-11-24 15:57:38.000000000 +0100
+@@ -678,7 +678,7 @@
+ dnl Check for libwpg for extension
+ dnl ******************************
+
+-PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
++PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no)
+ if test "x$with_libwpg" = "xyes"; then
+ AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
+ fi
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.0~/configure inkscape-0.48.0/configure
+--- inkscape-0.48.0~/configure 2010-08-04 18:46:39.000000000 +0200
++++ inkscape-0.48.0/configure 2010-11-24 15:59:19.000000000 +0100
+@@ -10297,12 +10297,12 @@
+ pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
++ pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -10315,12 +10315,12 @@
+ pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
++ pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -10339,9 +10339,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpg-0.1 libwpg-stream-0.1"`
++ LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9"`
+ else
+- LIBWPG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpg-0.1 libwpg-stream-0.1"`
++ LIBWPG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBWPG_PKG_ERRORS" >&5
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.0~/src/extension/internal/wpg-input.cpp inkscape-0.48.0/src/extension/internal/wpg-input.cpp
+--- inkscape-0.48.0~/src/extension/internal/wpg-input.cpp 2010-07-13 05:48:40.000000000 +0200
++++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp 2010-11-24 15:57:38.000000000 +0100
+@@ -49,7 +49,7 @@
+ #include "document.h"
+
+ #include "libwpg/libwpg.h"
+-#include "libwpg/WPGStreamImplementation.h"
++#include "libwpd-stream/libwpd-stream.h"
+
+
+ using namespace libwpg;
+@@ -61,9 +61,9 @@
+
+ SPDocument *
+ WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
+- WPXInputStream* input = new libwpg::WPGFileStream(uri);
++ WPXInputStream* input = new WPXFileStream(uri);
+ if (input->isOLEStream()) {
+- WPXInputStream* olestream = input->getDocumentOLEStream();
++ WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
+ if (olestream) {
+ delete input;
+ input = olestream;
+@@ -78,7 +78,7 @@
+ return NULL;
+ }
+
+- libwpg::WPGString output;
++ WPXString output;
+ if (!libwpg::WPGraphics::generateSVG(input, output)) {
+ delete input;
+ return NULL;
