Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=python26.git;a=commitdiff;h=2d7d47d06a333f9e5daeaeb2d7f970b347351398
commit 2d7d47d06a333f9e5daeaeb2d7f970b347351398 Author: Miklos Vajna <[email protected]> Date: Sat Dec 27 20:55:47 2008 +0100 inkscape-0.46-2-i686 - rebuilt with python-2.6 - fix build breakage caused by gtk+2>=2.13 - fix build breakage caused by poppler>=0.8.3 diff --git a/source/xapps-extra/inkscape/FrugalBuild b/source/xapps-extra/inkscape/FrugalBuild index 63e40ef..a492e04 100644 --- a/source/xapps-extra/inkscape/FrugalBuild +++ b/source/xapps-extra/inkscape/FrugalBuild @@ -4,10 +4,10 @@ pkgname=inkscape pkgver=0.46 -pkgrel=1 +pkgrel=2 pkgdesc="A vector illustrator program" depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm' 'freetype2' 'libxcb' \ - 'pango>=1.14.3' 'libgc>=7.0' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.5' 'perl' \ + 'pango>=1.14.3' 'libgc>=7.0' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7' 'python>=2.6' 'perl' \ 'poppler-glib' 'imagemagick') makedepends=('boost>=1.34.1' 'intltool' 'perl-xml-parser') rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt' 'lxml') @@ -16,9 +16,12 @@ archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge url="http://www.inkscape.org/"; -source=($source perl5.10.patch) +source=($source perl5.10.patch inkscape-0.46-poppler-0.8.3.patch \ + gtk-2.13.patch) sha1sums=('b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27' \ - '4c36b0e825771ffdfe3c548cb6037ac80c10a60c') + '4c36b0e825771ffdfe3c548cb6037ac80c10a60c' \ + '16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412' \ + 'd0257245079880c2aef0ffc609598924df999672') # TODO: java ?! diff --git a/source/xapps-extra/inkscape/gtk-2.13.patch b/source/xapps-extra/inkscape/gtk-2.13.patch new file mode 100644 index 0000000..f916b70 --- /dev/null +++ b/source/xapps-extra/inkscape/gtk-2.13.patch @@ -0,0 +1,13 @@ +diff --git a/src/widgets/sp-xmlview-attr-list.h b/src/widgets/sp-xmlview-attr-list.h +index 7c6f00b..bded318 100644 +--- a/src/widgets/sp-xmlview-attr-list.h ++++ b/src/widgets/sp-xmlview-attr-list.h +@@ -13,7 +13,7 @@ + */ + + #include <stdio.h> +-#include <gtk/gtkclist.h> ++#include <gtk/gtk.h> + #include "../xml/repr.h" + + #include <glib.h> diff --git a/source/xapps-extra/inkscape/inkscape-0.46-poppler-0.8.3.patch b/source/xapps-extra/inkscape/inkscape-0.46-poppler-0.8.3.patch new file mode 100644 index 0000000..70f9a16 --- /dev/null +++ b/source/xapps-extra/inkscape/inkscape-0.46-poppler-0.8.3.patch @@ -0,0 +1,42 @@ +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 ++++ inkscape-0.46/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(); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
