Revision bump. Apply patch to work with the latest libwpd/libwpg (bug #363703 by Pacho Ramos, patch by Fedora) and fix compile with gcc-4.6 (bug #362639 by emil karlson).

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

2 files changed, 76 insertions, 0 deletions

diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch b/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch
new file mode 100644
index 000000000000..94b317f57ae1
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch
@@ -0,0 +1,45 @@
+--- inkscape-0.48.0/configure.ac
++++ inkscape-0.48.0/configure.ac
+@@ -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
+--- inkscape-0.48.0/src/extension/internal/wpg-input.cpp
++++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp
+@@ -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;
+
+
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch b/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch
new file mode 100644
index 000000000000..feff68b6b67e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch
@@ -0,0 +1,31 @@
+--- inkscape-0.48.1/src/2geom/utils.h
++++ inkscape-0.48.1-r1/src/2geom/utils.h
+@@ -35,6 +35,7 @@
+ 
+ #include <cmath>
+ #include <vector>
++#include <cstddef>
+ 
+ namespace Geom {
+ 
+--- inkscape-0.48.1/src/libavoid/geomtypes.h
++++ inkscape-0.48.1-r1/src/libavoid/geomtypes.h
+@@ -31,6 +31,7 @@
+ 
+ #include <vector>
+ #include <utility>
++#include <cstddef>
+ 
+ 
+ namespace Avoid
+--- inkscape-0.48.1/src/Makefile.am
++++ inkscape-0.48.1-r1/src/Makefile.am
+@@ -205,7 +205,7 @@
+ 
+ inkscape_SOURCES += main.cpp $(win32_sources)
+ inkscape_LDADD = $(all_libs)
+-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
++inkscape_LDFLAGS = $(kdeldflags) $(mwindows)
+ 
+ inkview_SOURCES += inkview.cpp $(win32_sources)
+ inkview_LDADD = $(all_libs)