[arch-commits] Commit in inkscape/trunk (PKGBUILD inkscape-0.48.4-spuriouscomma.patch)

[Andreas Radke]

    Date: Saturday, April 13, 2013 @ 11:53:03
  Author: andyrtr
Revision: 182716

upgpkg: inkscape 0.48.4-6

poppler rebuild

Added:
  inkscape/trunk/inkscape-0.48.4-spuriouscomma.patch
Modified:
  inkscape/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   13 +++++++++----
 inkscape-0.48.4-spuriouscomma.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-13 09:21:57 UTC (rev 182715)
+++ PKGBUILD	2013-04-13 09:53:03 UTC (rev 182716)
@@ -5,13 +5,13 @@
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=5
+pkgrel=6
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64')
 makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt'
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt'
          'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
@@ -20,13 +20,18 @@
             'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+        inkscape-0.48.4-spuriouscomma.patch)
+sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
+          '7d1d5a6d1d2b0926721a994d5889c52890fc57c1')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	
+	# fix FTBS, patch taken from FC
+	patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch
 
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
 	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py

Added: inkscape-0.48.4-spuriouscomma.patch
===================================================================
--- inkscape-0.48.4-spuriouscomma.patch	                        (rev 0)
+++ inkscape-0.48.4-spuriouscomma.patch	2013-04-13 09:53:03 UTC (rev 182716)
@@ -0,0 +1,11 @@
+--- src/widgets/desktop-widget.h~	2011-07-08 13:25:09.000000000 -0500
++++ src/widgets/desktop-widget.h	2013-02-15 16:04:45.806910365 -0600
+@@ -239,7 +239,7 @@
+ private:
+     GtkWidget *tool_toolbox;
+     GtkWidget *aux_toolbox;
+-    GtkWidget *commands_toolbox,;
++    GtkWidget *commands_toolbox;
+     GtkWidget *snap_toolbox;
+ 
+     static void init(SPDesktopWidget *widget);