From 1c2000ecbaac82ebd7d62d379a47259bdf20bd45 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 16 Jan 2010 16:05:45 +0100
Subject: Maj de inkscape#0.47-1, et de ses dépendances
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/inkscape/.md5sum |  1 +
 extra/inkscape/Pkgfile | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/extra/inkscape/.md5sum b/extra/inkscape/.md5sum
index 72df1e89d..4a1daf080 100644
--- a/extra/inkscape/.md5sum
+++ b/extra/inkscape/.md5sum
@@ -1 +1,2 @@
 7b497c8f673e40b05295a29f6e2111f4  inkscape-0.47.tar.bz2
+4b4867ad0aac2f9683e4dd7c9fd9a0e9  inkscape-poppler-0.12.2.patch
diff --git a/extra/inkscape/Pkgfile b/extra/inkscape/Pkgfile
index 3ebd7df7b..8fe593d28 100644
--- a/extra/inkscape/Pkgfile
+++ b/extra/inkscape/Pkgfile
@@ -2,16 +2,19 @@
 # URL: http://inkscape.org
 # Maintainer: NuTyX core team
 # Packager: skingrapher at legtux dot org
-# Depends on: pangomm, cairomm, gtkmm, boost, boehm-gc, imagemagick, gsl, gnome-vfs
+# Depends on: pangomm, cairomm, gtkmm, boost, boehm-gc, imagemagick, gsl, gnome-vfs, libwpg, poppler-glib, librsvg
 name=inkscape
 version=0.47
 release=1
-source=(http://downloads.sourceforge.net/$name/files/$name-$version.tar.bz2)
+source=(http://downloads.sourceforge.net/$name/files/$name-$version.tar.bz2\
+	http://launchpadlibrarian.net/36057611/inkscape-poppler-0.12.2.patch)
 
 build() {
-cd $name-*
+	sed -i "s|(Gf\x\*)this| NULL|g" inkscape-poppler-0.12.2.patch
+	cd $name-*
         CFLAGS="${CFLAGS} -I/usr/include/ImageMagick" \
 	CXXFLAGS="${CXXFLAGS} -I/usr/include/ImageMagick" \
+	patch -Np1 -i ../inkscape-poppler-0.12.2.patch
 	./configure --prefix=/usr \
 	--enable-lcms \
 	--with-xft \
@@ -19,6 +22,6 @@ cd $name-*
 	--with-perl \
 	--with-gnome-vfs
         
-	make -j3
+	make
         make DESTDIR=$PKG install
 }
-- 
cgit v1.2.3-70-g09d2