Date: Sunday, April 14, 2013 @ 09:04:27 Author: bisson Revision: 182748
clean up a bit; never use patch -N or we never know when patches are obsolote Added: inkscape/trunk/spuriouscomma.patch (from rev 182747, inkscape/trunk/inkscape-0.48.4-spuriouscomma.patch) Modified: inkscape/trunk/PKGBUILD Deleted: inkscape/trunk/inkscape-0.48.4-spuriouscomma.patch -------------------------------------+ PKGBUILD | 18 ++++++++---------- inkscape-0.48.4-spuriouscomma.patch | 11 ----------- spuriouscomma.patch | 11 +++++++++++ 3 files changed, 19 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-14 04:48:16 UTC (rev 182747) +++ PKGBUILD 2013-04-14 07:04:27 UTC (rev 182748) @@ -20,38 +20,36 @@ '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 - inkscape-0.48.4-spuriouscomma.patch) +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'spuriouscomma.patch') sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - # fix FTBS, patch taken from FC - patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch - + patch -p0 -i ../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 sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --with-python \ --with-perl \ --enable-lcms \ --enable-poppler-cairo \ - --disable-dependency-tracking \ - + --disable-dependency-tracking make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } Deleted: inkscape-0.48.4-spuriouscomma.patch =================================================================== --- inkscape-0.48.4-spuriouscomma.patch 2013-04-14 04:48:16 UTC (rev 182747) +++ inkscape-0.48.4-spuriouscomma.patch 2013-04-14 07:04:27 UTC (rev 182748) @@ -1,11 +0,0 @@ ---- 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); Copied: inkscape/trunk/spuriouscomma.patch (from rev 182747, inkscape/trunk/inkscape-0.48.4-spuriouscomma.patch) =================================================================== --- spuriouscomma.patch (rev 0) +++ spuriouscomma.patch 2013-04-14 07:04:27 UTC (rev 182748) @@ -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);