| 1 |
radhermit 11/04/29 09:30:59 |
| 2 |
|
| 3 |
Added: inkscape-0.48.0-libwpd.patch |
| 4 |
inkscape-0.48.1-gcc-4.6.patch |
| 5 |
Log: |
| 6 |
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). |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: inkscape-0.48.0-libwpd.patch |
| 17 |
=================================================================== |
| 18 |
--- inkscape-0.48.0/configure.ac |
| 19 |
+++ inkscape-0.48.0/configure.ac |
| 20 |
@@ -678,7 +678,7 @@ |
| 21 |
dnl Check for libwpg for extension |
| 22 |
dnl ****************************** |
| 23 |
|
| 24 |
-PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no) |
| 25 |
+PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no) |
| 26 |
if test "x$with_libwpg" = "xyes"; then |
| 27 |
AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) |
| 28 |
fi |
| 29 |
--- inkscape-0.48.0/src/extension/internal/wpg-input.cpp |
| 30 |
+++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp |
| 31 |
@@ -49,7 +49,7 @@ |
| 32 |
#include "document.h" |
| 33 |
|
| 34 |
#include "libwpg/libwpg.h" |
| 35 |
-#include "libwpg/WPGStreamImplementation.h" |
| 36 |
+#include "libwpd-stream/libwpd-stream.h" |
| 37 |
|
| 38 |
|
| 39 |
using namespace libwpg; |
| 40 |
@@ -61,9 +61,9 @@ |
| 41 |
|
| 42 |
SPDocument * |
| 43 |
WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) { |
| 44 |
- WPXInputStream* input = new libwpg::WPGFileStream(uri); |
| 45 |
+ WPXInputStream* input = new WPXFileStream(uri); |
| 46 |
if (input->isOLEStream()) { |
| 47 |
- WPXInputStream* olestream = input->getDocumentOLEStream(); |
| 48 |
+ WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); |
| 49 |
if (olestream) { |
| 50 |
delete input; |
| 51 |
input = olestream; |
| 52 |
@@ -78,7 +78,7 @@ |
| 53 |
return NULL; |
| 54 |
} |
| 55 |
|
| 56 |
- libwpg::WPGString output; |
| 57 |
+ WPXString output; |
| 58 |
if (!libwpg::WPGraphics::generateSVG(input, output)) { |
| 59 |
delete input; |
| 60 |
return NULL; |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.1 media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch?rev=1.1&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch?rev=1.1&content-type=text/plain |
| 70 |
|
| 71 |
Index: inkscape-0.48.1-gcc-4.6.patch |
| 72 |
=================================================================== |
| 73 |
--- inkscape-0.48.1/src/2geom/utils.h |
| 74 |
+++ inkscape-0.48.1-r1/src/2geom/utils.h |
| 75 |
@@ -35,6 +35,7 @@ |
| 76 |
|
| 77 |
#include <cmath> |
| 78 |
#include <vector> |
| 79 |
+#include <cstddef> |
| 80 |
|
| 81 |
namespace Geom { |
| 82 |
|
| 83 |
--- inkscape-0.48.1/src/libavoid/geomtypes.h |
| 84 |
+++ inkscape-0.48.1-r1/src/libavoid/geomtypes.h |
| 85 |
@@ -31,6 +31,7 @@ |
| 86 |
|
| 87 |
#include <vector> |
| 88 |
#include <utility> |
| 89 |
+#include <cstddef> |
| 90 |
|
| 91 |
|
| 92 |
namespace Avoid |
| 93 |
--- inkscape-0.48.1/src/Makefile.am |
| 94 |
+++ inkscape-0.48.1-r1/src/Makefile.am |
| 95 |
@@ -205,7 +205,7 @@ |
| 96 |
|
| 97 |
inkscape_SOURCES += main.cpp $(win32_sources) |
| 98 |
inkscape_LDADD = $(all_libs) |
| 99 |
-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) |
| 100 |
+inkscape_LDFLAGS = $(kdeldflags) $(mwindows) |
| 101 |
|
| 102 |
inkview_SOURCES += inkview.cpp $(win32_sources) |
| 103 |
inkview_LDADD = $(all_libs) |
Archives