Skip to Content.
Sympa Menu

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

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 (3e5bedd11bc57f0a60df5622b1de79a261dd73e1)
  • Date: Thu, 5 Mar 2009 06:31:21 -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, 8 insertions(+), 44 deletions(-)

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

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

diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 2a51cae..feaf03f 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,8 @@
+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 24211c7..aecd813 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
deleted file mode 100644
index 6e385a3..0000000
--- a/graphics/inkscape/poppler.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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 (3e5bedd11bc57f0a60df5622b1de79a261dd73e1), Ethan Grammatikidis, 03/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page