[arch-commits] Commit in inkscape/repos (3 files)

[Eric Belanger]

    Date: Wednesday, April 23, 2008 @ 00:21:33
  Author: eric
Revision: 805

poppler 0.8.0 rebuild

Added:
  inkscape/repos/extra-i686/perl-5.10.patch
Modified:
  inkscape/repos/extra-i686/	(properties)
  inkscape/repos/extra-i686/PKGBUILD

-----------------+
 PKGBUILD        |   25 +++++++++++++++----------
 perl-5.10.patch |   25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 10 deletions(-)


Property changes on: inkscape/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /inkscape/trunk:1
   + /inkscape/trunk:1-804

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-23 04:19:04 UTC (rev 804)
+++ extra-i686/PKGBUILD	2008-04-23 04:21:33 UTC (rev 805)
@@ -4,30 +4,35 @@
 
 pkgname=inkscape
 pkgver=0.46
-pkgrel=1
+pkgrel=4
 pkgdesc="A vector-based drawing program - svg compliant"
 url="http://inkscape.sourceforge.net/"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('gtkmm>=2.12.3' 'gc>=7.0' 'desktop-file-utils' 'libxslt>=1.1.22' \
-         'perl' 'pyxml' 'openssl>=0.9.8d' 'lcms' 'gtkspell' 'poppler-glib' \
-         'imagemagick' 'popt')
-makedepends=('perlxml' 'pkgconfig')
+depends=('gtkmm>=2.12.6' 'gc>=7.0' 'desktop-file-utils' 'libxslt>=1.1.22' \
+         'perl>=5.10.0' 'pyxml' 'openssl>=0.9.8d' 'lcms' 'gtkspell' 'poppler-glib>=0.8.0' \
+         'imagemagick>=6.4.0.2' 'popt')
+makedepends=('perlxml' 'pkgconfig' 'boost')
 options=('!libtool')
 install=inkscape.install
-source=("http://heanet.dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3bae9034047379012127e52f9b138d32')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        perl-5.10.patch)
+md5sums=('3bae9034047379012127e52f9b138d32'
+         'da1009efea12f6512e69cc3ec8604f4f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
+  patch -Np1 -i ../perl-5.10.patch || return 1
+  CFLAGS="${CFLAGS} -I/usr/include/ImageMagick" \
+  CXXFLAGS="${CXXFLAGS} -I/usr/include/ImageMagick" \
+   ./configure --prefix=/usr \
     --enable-inkboard \
     --enable-lcms \
     --with-gnome-print \
     --with-xft \
     --with-python \
     --with-perl \
-    --without-gnome-vfs
+    --without-gnome-vfs || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 }

Added: extra-i686/perl-5.10.patch
===================================================================
--- extra-i686/perl-5.10.patch	                        (rev 0)
+++ extra-i686/perl-5.10.patch	2008-04-23 04:21:33 UTC (rev 805)
@@ -0,0 +1,25 @@
+diff -Naur inkscape-0.46/src/Makefile.am inkscape-0.46-p/src/Makefile.am
+--- inkscape-0.46/src/Makefile.am	2008-03-11 05:44:31.000000000 +0100
++++ inkscape-0.46-p/src/Makefile.am	2008-03-14 22:21:53.000000000 +0100
+@@ -25,7 +25,8 @@
+ 	$(POPPLER_GLIB_CFLAGS)	\
+ 	-DPOTRACE=\"potrace\"	\
+ 	$(INKSCAPE_CFLAGS) \
+-	-I$(top_srcdir)/cxxtest
++	-I$(top_srcdir)/cxxtest \
++	-I$(top_srcdir)/src/extension/script
+
+ include Makefile_insert
+ include application/Makefile_insert
+diff -Naur inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp
+--- inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp	2008-03-11 05:20:25.000000000 +0100
++++ inkscape-0.46-p/src/extension/script/inkscape_perl_wrap.cpp	2008-03-14 22:36:24.000000000 +0100
+@@ -724,7 +724,7 @@
+ /* #define SWIG_croakf(x...) { SWIG_SetErrorf(x); goto fail; } */
+
+
+-typedef XS(SwigPerlWrapper);
++typedef XSPROTO(SwigPerlWrapper);
+ typedef SwigPerlWrapper *SwigPerlWrapperPtr;
+
+ /* Structure for command table */