Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (131a8da0c542d08c7c5e7941ccadc5b1ac938460)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (131a8da0c542d08c7c5e7941ccadc5b1ac938460)
  • Date: Tue, 12 Aug 2008 15:01:22 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

graphics/inkscape/DEPENDS | 76
++++++++++++++++++++++++----------------
graphics/inkscape/DETAILS | 21 +++++------
graphics/inkscape/HISTORY | 6 +++
graphics/inkscape/PRE_BUILD | 8 +++-
graphics/inkscape/poppler.patch | 41 +++++++++++++++++++++
5 files changed, 109 insertions(+), 43 deletions(-)

New commits:
commit 131a8da0c542d08c7c5e7941ccadc5b1ac938460
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

inkscape: added missing deps + cleaned up

diff --git a/graphics/inkscape/DEPENDS b/graphics/inkscape/DEPENDS
index df46ccd..370a61b 100755
--- a/graphics/inkscape/DEPENDS
+++ b/graphics/inkscape/DEPENDS
@@ -1,30 +1,46 @@
-depends g++ &&
-depends boost &&
-depends gtkmm2 &&
-depends libxml2 &&
-depends libxslt &&
-depends libart_lgpl &&
-depends libsigc++3 &&
-depends libgc &&
-depends xml-parser-expat &&
-depends popt &&
-
-optional_depends pyxml \
- "" \
- "" \
- "to enable several effects" &&
-
-optional_depends numpy \
- "" \
- "" \
- "to enable several effects" &&
-
-optional_depends libgnomeprintui \
- "--with-gnome-print" \
- "--without-gnome-print" \
- "for GNOME printing support" &&
-
-optional_depends lcms \
- "--enable-lcms" \
- "--disable-lcms" \
- "for optimized color management engine"
+depends g++ &&
+depends boost &&
+depends gtkmm2 &&
+depends libxml2 &&
+depends libxslt &&
+depends libart_lgpl &&
+depends libsigc++3 &&
+depends libgc &&
+depends popt &&
+depends xml-parser-expat &&
+
+optional_depends gtkspell "" "" "for GtkSpell support" &&
+
+suggest_depends pyxml "" "" "to enable Export GIMP palette extension" &&
+suggest_depends numpy "" "" "to enable Perspective extension" &&
+
+if is_depends_enabled poppler cairo; then
+ optional_depends poppler \
+ "--with-poppler-cairo" \
+ "--without-poppler-cairo" \
+ "for rendering PDF preview"
+fi &&
+
+optional_depends gnome-vfs2 \
+ "--with-gnome-vfs" \
+ "--without-gnome-vfs" \
+ "use gnome vfs for loading files?" &&
+
+optional_depends libgnomeprintui \
+ "--with-gnome-print" \
+ "--without-gnome-print" \
+ "for GNOME printing support" &&
+
+optional_depends lcms \
+ "--enable-lcms" \
+ "--disable-lcms" \
+ "for optimized color management engine" &&
+
+optional_depends python \
+ "--with-python" \
+ "--without-python" \
+ "use Python for embedded scripting?" &&
+
+if is_depends_enabled $SPELL python; then
+ runtime_depends lxml
+fi
diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index cc19003..d0b6947 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,8 +1,8 @@
SPELL=inkscape
VERSION=0.46
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_GPG=Ted_Gould.gpg:$SOURCE2:UPSTREAM_KEY
@@ -12,16 +12,15 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SECURITY_PATCH=1
LICENSE[0]=GPL
KEYWORDS="graphics"
- SHORT="General purpose vector drawing application"
+ SHORT="general purpose vector drawing application"
cat << EOF
-Inkscape is a vector based drawing program, like CorelDraw or Adobe
-Illustrator from the proprietary software world, and Sketch or
-KIllustrator from the free software world.
+Inkscape is a vector based drawing program, like CorelDraw or Adobe
Illustrator
+from the proprietary software world, and Sketch or KIllustrator from the free
+software world.

-Inkscape uses W3C SVG as native file format, being thus very useful tool
-for web designers.
+Inkscape uses W3C SVG as native file format, being thus very useful tool for
web
+designers.

-It has relatively modern display engine, giving you fine antialiased
-display, alpha transparencies, vector fonts and so on. Inkscape is
-a sodipodi fork.
+It has relatively modern display engine, giving you fine antialiased display,
+alpha transparencies, vector fonts and so on. Inkscape is a sodipodi fork.
EOF
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 7439844..a36bf6a 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,9 @@
+2008-08-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added poppler.patch to fix compilation problems if
+ poppler depend is enabled, quoting the paths!
+ * DETAILS: fixed descs, quoting paths, cleaned up
+ * DEPENDS: rewritten mostly: added missing deps, cleaned up
+
2008-04-28 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: fixed compilation with gcc 4.3

diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
index 8c9201b..51c82c3 100755
--- a/graphics/inkscape/PRE_BUILD
+++ b/graphics/inkscape/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&

-patch -p0 < $SPELL_DIRECTORY/gcc43.patch
+if is_depends_enabled $SPELL poppler; then
+ patch -p0 < "$SPELL_DIRECTORY/poppler.patch"
+fi &&
+
+patch -p0 < "$SPELL_DIRECTORY/gcc43.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 Vlad Glagolev (131a8da0c542d08c7c5e7941ccadc5b1ac938460), Vlad Glagolev, 08/12/2008

Archive powered by MHonArc 2.6.24.

Top of Page