[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e169720d26f0d9614c08e8630a304a9f28a95325)

Vlad Glagolev scm at sourcemage.org
Sat Nov 21 11:18:22 EST 2009


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

 graphics/inkscape/DEPENDS             |   16 +++++----
 graphics/inkscape/DETAILS             |    6 +--
 graphics/inkscape/HISTORY             |    7 ++++
 graphics/inkscape/PRE_BUILD           |   10 -----
 graphics/inkscape/gcc43.patch         |   10 -----
 graphics/inkscape/gtk-clist.patch     |   12 -------
 graphics/inkscape/libpng-setjmp.patch |   58 ----------------------------------
 graphics/inkscape/poppler.patch       |   41 ------------------------
 8 files changed, 19 insertions(+), 141 deletions(-)

New commits:
commit e169720d26f0d9614c08e8630a304a9f28a95325
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    inkscape: => 0.47

diff --git a/graphics/inkscape/DEPENDS b/graphics/inkscape/DEPENDS
index 370a61b..d0229da 100755
--- a/graphics/inkscape/DEPENDS
+++ b/graphics/inkscape/DEPENDS
@@ -1,4 +1,5 @@
 depends g++ &&
+depends gsl &&
 depends boost &&
 depends gtkmm2 &&
 depends libxml2 &&
@@ -8,6 +9,7 @@ depends libsigc++3 &&
 depends libgc &&
 depends popt &&
 depends xml-parser-expat &&
+depends libgnomeprintui &&
 
 optional_depends gtkspell "" "" "for GtkSpell support" &&
 
@@ -16,8 +18,8 @@ suggest_depends numpy "" "" "to enable Perspective extension" &&
 
 if is_depends_enabled poppler cairo; then
   optional_depends poppler \
-                   "--with-poppler-cairo" \
-                   "--without-poppler-cairo" \
+                   "--enable-poppler-cairo" \
+                   "--disable-poppler-cairo" \
                    "for rendering PDF preview"
 fi &&
 
@@ -26,16 +28,16 @@ optional_depends gnome-vfs2 \
                  "--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 perl \
+                 "--with-perl" \
+                 "--without-perl" \
+                 "use Perl for embedded scripting?" &&
+
 optional_depends python \
                  "--with-python" \
                  "--without-python" \
diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index d0b6947..18ef49b 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,10 +1,10 @@
            SPELL=inkscape
-         VERSION=0.46
+         VERSION=0.47
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.sig
+         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.sig
+  SOURCE2_URL[0]=$SOURCE_URL.asc
       SOURCE_GPG=Ted_Gould.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
         WEB_SITE=http://www.inkscape.org/
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 93c2b18..a7d8f5a 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,10 @@
+2009-11-21 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.47; fixed sig url
+	* DEPENDS: added perl opt dep, gsl req dep; corrected poppler flags;
+	  libgnomeprintui (opt -> req)
+	* PRE_BUILD, poppler.patch, libpng-setjmp.patch, gtk-clist.patch,
+	  gcc43.patch: removed
+
 2009-10-19 Bor Kraljič <pyrobor at ver.si>
 	* libpng-setjmp.patch: added, needed to compile
 	  (see http://thread.gmane.org/gmane.linux.distributions.nixos/1501)
diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
deleted file mode 100755
index f723557..0000000
--- a/graphics/inkscape/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if is_depends_enabled $SPELL poppler; then
-  patch -p0 < "$SPELL_DIRECTORY/poppler.patch"
-fi &&
-
-patch -p1 < "$SPELL_DIRECTORY/libpng-setjmp.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/gtk-clist.patch"
diff --git a/graphics/inkscape/gcc43.patch b/graphics/inkscape/gcc43.patch
deleted file mode 100644
index 0d3e6f2..0000000
--- a/graphics/inkscape/gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dom/dom.h.orig
-+++ src/dom/dom.h
-@@ -30,6 +30,7 @@
-  */
- 
- #include <vector>
-+#include <cstring>
- 
- //# include this before the #ifdefs below
- #include "domconfig.h"
diff --git a/graphics/inkscape/gtk-clist.patch b/graphics/inkscape/gtk-clist.patch
deleted file mode 100644
index 4728466..0000000
--- a/graphics/inkscape/gtk-clist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/widgets/sp-xmlview-attr-list.h	2008/06/07 22:06:52	1.1
-+++ src/widgets/sp-xmlview-attr-list.h	2008/06/07 22:09:22
-@@ -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/graphics/inkscape/libpng-setjmp.patch b/graphics/inkscape/libpng-setjmp.patch
deleted file mode 100644
index c985f9f..0000000
--- a/graphics/inkscape/libpng-setjmp.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- inkscape-0.46/src/sp-image.cpp      2008-03-11 05:19:56.000000000 +0100
-+++ inkscape-0.46/src/sp-image.cpp      2009-01-26 15:34:33.000000000 +0100
-@@ -17,6 +17,8 @@
- # include "config.h"
- #endif
- 
-+#include <png.h>
-+
- #include <cstring>
- #include <string>
- #include <libnr/nr-matrix-fns.h>
-@@ -41,7 +43,6 @@
- #include "libnr/nr-matrix-fns.h"
- 
- #include "io/sys.h"
--#include <png.h>
- #if ENABLE_LCMS
- #include "color-profile-fns.h"
- #include "color-profile.h"
-
---- inkscape-0.46/src/dialogs/export.cpp        2008-03-11 05:19:54.000000000 +0100
-+++ inkscape-0.46/src/dialogs/export.cpp        2009-01-26 17:01:13.000000000 +0100
-@@ -20,6 +20,7 @@
- # include "config.h"
- #endif
- 
-+#include <png.h>
- #include <gtk/gtk.h>
- #include <gtkmm/box.h>
- #include <gtkmm/buttonbox.h>
-@@ -60,7 +61,6 @@
- #include "io/sys.h"
- 
- #include "helper/png-write.h"
--#include <png.h>
- 
- 
- #define SP_EXPORT_MIN_SIZE 1.0
-
---- inkscape-0.46/src/main.cpp  2008-03-11 05:20:50.000000000 +0100
-+++ inkscape-0.46/src/main.cpp  2009-01-26 17:57:12.000000000 +0100
-@@ -26,6 +26,7 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
-+#include <png.h>
- #include "path-prefix.h"
- 
- #include <gtk/gtkmessagedialog.h>
-@@ -111,7 +112,6 @@ using Inkscape::Extension::Internal::Pri
- 
- #include "main-cmdlineact.h"
- 
--#include <png.h>
- #include <errno.h>
- 
- enum {
-
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();



More information about the SM-Commit mailing list