Date: Saturday, November 30, 2013 @ 09:44:48 Author: andyrtr Revision: 200624
archrelease: copy trunk to staging-i686, staging-x86_64 Added: inkscape/repos/staging-i686/ inkscape/repos/staging-i686/PKGBUILD (from rev 200623, inkscape/trunk/PKGBUILD) inkscape/repos/staging-i686/build_fix.diff (from rev 200623, inkscape/trunk/build_fix.diff) inkscape/repos/staging-i686/install (from rev 200623, inkscape/trunk/install) inkscape/repos/staging-i686/spuriouscomma.patch (from rev 200623, inkscape/trunk/spuriouscomma.patch) inkscape/repos/staging-x86_64/ inkscape/repos/staging-x86_64/PKGBUILD (from rev 200623, inkscape/trunk/PKGBUILD) inkscape/repos/staging-x86_64/build_fix.diff (from rev 200623, inkscape/trunk/build_fix.diff) inkscape/repos/staging-x86_64/install (from rev 200623, inkscape/trunk/install) inkscape/repos/staging-x86_64/spuriouscomma.patch (from rev 200623, inkscape/trunk/spuriouscomma.patch) ------------------------------------+ staging-i686/PKGBUILD | 58 +++++++++++++++++++++++++++++++++++ staging-i686/build_fix.diff | 15 +++++++++ staging-i686/install | 13 +++++++ staging-i686/spuriouscomma.patch | 11 ++++++ staging-x86_64/PKGBUILD | 58 +++++++++++++++++++++++++++++++++++ staging-x86_64/build_fix.diff | 15 +++++++++ staging-x86_64/install | 13 +++++++ staging-x86_64/spuriouscomma.patch | 11 ++++++ 8 files changed, 194 insertions(+) Copied: inkscape/repos/staging-i686/PKGBUILD (from rev 200623, inkscape/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-11-30 08:44:48 UTC (rev 200624) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Tobias Kieslich <tob...@justdreams.de> +# Contributor: tobias <tob...@archlinux.org> + +pkgname=inkscape +pkgver=0.48.4 +pkgrel=13 +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.24.4' 'popt' + 'python2' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python2-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + spuriouscomma.patch + build_fix.diff) +sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' + '7d1d5a6d1d2b0926721a994d5889c52890fc57c1' + 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf') + +install=install + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i ../spuriouscomma.patch + # fix build with freetype 2.5.1 + patch -Np0 -i ../build_fix.diff + 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 + sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} +} + +build() { + cd ${pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --with-python \ + --with-perl \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Copied: inkscape/repos/staging-i686/build_fix.diff (from rev 200623, inkscape/trunk/build_fix.diff) =================================================================== --- staging-i686/build_fix.diff (rev 0) +++ staging-i686/build_fix.diff 2013-11-30 08:44:48 UTC (rev 200624) @@ -0,0 +1,15 @@ +=== modified file 'src/libnrtype/FontFactory.h' +--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000 ++++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000 +@@ -31,7 +31,8 @@ + #include <pango/pangowin32.h> + #else + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #endif + + namespace Glib + + Copied: inkscape/repos/staging-i686/install (from rev 200623, inkscape/trunk/install) =================================================================== --- staging-i686/install (rev 0) +++ staging-i686/install 2013-11-30 08:44:48 UTC (rev 200624) @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} Copied: inkscape/repos/staging-i686/spuriouscomma.patch (from rev 200623, inkscape/trunk/spuriouscomma.patch) =================================================================== --- staging-i686/spuriouscomma.patch (rev 0) +++ staging-i686/spuriouscomma.patch 2013-11-30 08:44:48 UTC (rev 200624) @@ -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); Copied: inkscape/repos/staging-x86_64/PKGBUILD (from rev 200623, inkscape/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2013-11-30 08:44:48 UTC (rev 200624) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Tobias Kieslich <tob...@justdreams.de> +# Contributor: tobias <tob...@archlinux.org> + +pkgname=inkscape +pkgver=0.48.4 +pkgrel=13 +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.24.4' 'popt' + 'python2' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python2-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + spuriouscomma.patch + build_fix.diff) +sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' + '7d1d5a6d1d2b0926721a994d5889c52890fc57c1' + 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf') + +install=install + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i ../spuriouscomma.patch + # fix build with freetype 2.5.1 + patch -Np0 -i ../build_fix.diff + 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 + sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} +} + +build() { + cd ${pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --with-python \ + --with-perl \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Copied: inkscape/repos/staging-x86_64/build_fix.diff (from rev 200623, inkscape/trunk/build_fix.diff) =================================================================== --- staging-x86_64/build_fix.diff (rev 0) +++ staging-x86_64/build_fix.diff 2013-11-30 08:44:48 UTC (rev 200624) @@ -0,0 +1,15 @@ +=== modified file 'src/libnrtype/FontFactory.h' +--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000 ++++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000 +@@ -31,7 +31,8 @@ + #include <pango/pangowin32.h> + #else + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #endif + + namespace Glib + + Copied: inkscape/repos/staging-x86_64/install (from rev 200623, inkscape/trunk/install) =================================================================== --- staging-x86_64/install (rev 0) +++ staging-x86_64/install 2013-11-30 08:44:48 UTC (rev 200624) @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} Copied: inkscape/repos/staging-x86_64/spuriouscomma.patch (from rev 200623, inkscape/trunk/spuriouscomma.patch) =================================================================== --- staging-x86_64/spuriouscomma.patch (rev 0) +++ staging-x86_64/spuriouscomma.patch 2013-11-30 08:44:48 UTC (rev 200624) @@ -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);