Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (c479fad0c702ce38c83b6a7f35fc43729899ee4e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ethan Grammatikidis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (c479fad0c702ce38c83b6a7f35fc43729899ee4e)
  • Date: Thu, 5 Mar 2009 07:34:16 -0600

GIT changes to master grimoire by Ethan Grammatikidis <eekee57 AT fastmail.fm>:

graphics/inkscape/HISTORY | 5 ----
graphics/inkscape/PRE_BUILD | 6 ++---
graphics/inkscape/poppler.patch | 41
++++++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 8 deletions(-)

New commits:
commit c479fad0c702ce38c83b6a7f35fc43729899ee4e
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

Revert "inkscape: poppler.patch now breaks poppler compatibility;
removed."

This reverts commit 3f21216619a1ab6b7db5f88925eac06d66ad3c21.
Another thing for me to remmeber: Update all relevant spells before
comitting.

diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index feaf03f..2a51cae 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,8 +1,3 @@
-2009-03-05 Ethan Grammatikidis <eekee57 AT fastmail.fm>
- * PRE_BUILD: poppler.patch removed, it now breaks compile if poppler
- depend is enabled.
- * poppler.patch: removed
-
2008-10-11 Vlad Glagolev <stealth AT sourcemage.org>
* TRIGGERS: added, for poppler

diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
index aecd813..24211c7 100755
--- a/graphics/inkscape/PRE_BUILD
+++ b/graphics/inkscape/PRE_BUILD
@@ -1,9 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-#if is_depends_enabled $SPELL poppler; then
-# patch -p0 < "$SPELL_DIRECTORY/poppler.patch"
-#fi &&
+if is_depends_enabled $SPELL poppler; then
+ patch -p0 < "$SPELL_DIRECTORY/poppler.patch"
+fi &&

patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
patch -p0 < "$SPELL_DIRECTORY/gtk-clist.patch"
diff --git a/graphics/inkscape/poppler.patch b/graphics/inkscape/poppler.patch
new file mode 100644
index 0000000..6e385a3
--- /dev/null
+++ b/graphics/inkscape/poppler.patch
@@ -0,0 +1,41 @@
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 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();



  • [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (c479fad0c702ce38c83b6a7f35fc43729899ee4e), Ethan Grammatikidis, 03/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page